From 6d25eb7a9087fd2a79ec4746ca9fb432292aa1f5 Mon Sep 17 00:00:00 2001 From: abdnafees Date: Wed, 16 Nov 2022 00:24:36 +0500 Subject: [PATCH 1/5] Update steps for 'Getting the source code' and link 'Git Bootcamp' --- .DS_Store | Bin 0 -> 10244 bytes .github/.DS_Store | Bin 0 -> 6148 bytes getting-started/git-boot-camp.rst | 2 ++ getting-started/setup-building.rst | 15 ++++++--------- 4 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 .DS_Store create mode 100644 .github/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cd0f5baccf7a56f0de19656d302037f8ec6d1ff1 GIT binary patch literal 10244 zcmeHMO>7%Q6n>MsvEBS_erW*-LqLKyDQ<`=Aymb6jUXVAC=P8xf84dbah9xito7P% zi6Z3$QV|G&#Gxm|36+8n;?NrisDN9AL=Rlxgj5L$gv8&C_jcFo89R2&0hGgzwfn|1 z@6G$ZxAVq3V*p^uO8yu?3;-f{kyQHewnL$Qx>`z)*D{Bap*L}0H(0DrToMEYDA+=B=N5eOpSM}XFc7+xe3p4@h&vvlCi*#e*pVY5@P zu22PK%##UEZo3kDurSvYrEAK(Ee3PVu|4MLB|N$9O4l5ixA|b6XXfotnByJCk2&hV z60QvHK?H&bv_^pT?jbk|1<=8k_V4%obideFo-2KSLhl6i^c~b7rckC~% z3ugllzJsO^uKR^`s6bZo4r4F2YKRy{=9j8b7emuHMczQtUQ5CQ+k~eVGLS_iIv9}8 z*2*Q1?~QE9(93o_ew+2|3+?X>hoj-X@cHyQucd9(u9TCib(X#@b8ckobv1ih*J>GM z>=ZX`RW~)uG0^iGs+>Ecn|WSK@`{-+JGN=JBN~lFGs?lu&6)VjRP3>t_|{Zx^YNMZ zRBZP6?ABH^GCuj}6HA#5qiFIg1R9q*Z%Kp!_q%_86>AbFJy-QOvCr$Aeoz#TRU~?# zuYX{0NEsd(9UdDVA0MB%Yy9A$L-%Bq(X5)=C|HE{6gRk)G%DJPp5ta(e@R=hwM#Zt zGRjDk-jbHT&}dq|Ttc0(MuRifQYgQR$i~Y)~YFVmT(2|$W8){ZF7R)5KZC)fz8V!jo zS{jYycuJSloNg8-=YDlVIhk0jR~~jN3QW2cOop*~&68}|REt_PI+=LZYl*-SI0?@{ z8s~WpUWco29d5u)_#S?SKUj!Oum{)?Hp@=1IrcQ0XD_e}yU0}6x~Kkh@0I;9$`9%3 zO8Il)@Mv?tm_7Yx{=VjAur!94JMDC&%qcjbk;bT|Ez{s;0sRy9KFlf&E`g1A6Uvxf zoTP*n4otMy6mkFc)t`0TZN?QD?5-_wff$0oRVjlgZBX&jAt&R^z16BA;tPKvtV+^2 zBChsYGM>)}&mbbnLly5PSLm_}qAKSpyD-~Dvshxsj(*x%TjX@} zcb`*-@kJ)xS;+WHgntO%Z8Stp*=%Bc+RJVWTQHks4kL$mw-9+;JHFhQcOCtRT)MZC z`79Eju)`yV^Q%HLP{I$PRI7%Fcj`GGZ__v;zV=!Y9(TQrI(R6S7RFa?S(R9ca(M?W z5!cEqKCT@#8*g--H6?uPBR5`zjaGE$`OES8n0}+f&P?z%L|iAn^KrFkH88c;lJLNf zgr^t1S%^iYc`2iL`?cnN5zE%#^YytVjUhg{b~-YSTZALztiUEzMGT>Dfr94uiT*!% z`Gc$eTR*MdXe;{OsbBQF|NS?}Z%~2=1QFN^5!mN~h|&4~lkNZi-wRL!3_%2f2>eG8 zV4+kxmBhj8M-9z>=&U`4*G0UjklwZ{9TU7c$MGng<9Pf+$MMc#3AV+t?i8#isDg6a wl~}{_zyBHFpF)W5Coace|4+Lj@r*%y#|!rVG+mtu-PK-Pe76SJOZ)$S0GBhE=l}o! literal 0 HcmV?d00001 diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..48c5e5ad6b7315df619ef8dd188dea381cd6c4b5 GIT binary patch literal 6148 zcmeHK!AiqG5Pe%KvgKMBlxaGimSg&LJ`OKmyKnD<%`uZ- z$IKp9^YWYmUCdG936HqLl)X8g>)E@{^~adD^Rd~kJ9^ub`k#G&{;vnw zoiShx{3`}rJI&J}Un$ns#>+{q_0$`xi1<~Cix74~DW/cpython.git -9. Verify that your setup is correct:: +7. Verify that your setup is correct:: $ git remote -v origin git@github.com:/cpython.git (fetch) @@ -100,6 +95,8 @@ You will only need to execute these steps once per machine: $ git config branch.main.remote upstream +For more information about these commands see :ref:`Git Bootcamp and Cheat Sheat `. + If you did everything correctly, you should now have a copy of the code in the ``cpython`` directory and two remotes that refer to your own GitHub fork (``origin``) and the official CPython repository (``upstream``). From a3591d807df299bf49e72e11ad3b41b879bbc308 Mon Sep 17 00:00:00 2001 From: abdnafees Date: Wed, 16 Nov 2022 01:29:43 +0500 Subject: [PATCH 2/5] Removed .DS_Store --- .DS_Store | Bin 10244 -> 0 bytes .gitignore | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index cd0f5baccf7a56f0de19656d302037f8ec6d1ff1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMO>7%Q6n>MsvEBS_erW*-LqLKyDQ<`=Aymb6jUXVAC=P8xf84dbah9xito7P% zi6Z3$QV|G&#Gxm|36+8n;?NrisDN9AL=Rlxgj5L$gv8&C_jcFo89R2&0hGgzwfn|1 z@6G$ZxAVq3V*p^uO8yu?3;-f{kyQHewnL$Qx>`z)*D{Bap*L}0H(0DrToMEYDA+=B=N5eOpSM}XFc7+xe3p4@h&vvlCi*#e*pVY5@P zu22PK%##UEZo3kDurSvYrEAK(Ee3PVu|4MLB|N$9O4l5ixA|b6XXfotnByJCk2&hV z60QvHK?H&bv_^pT?jbk|1<=8k_V4%obideFo-2KSLhl6i^c~b7rckC~% z3ugllzJsO^uKR^`s6bZo4r4F2YKRy{=9j8b7emuHMczQtUQ5CQ+k~eVGLS_iIv9}8 z*2*Q1?~QE9(93o_ew+2|3+?X>hoj-X@cHyQucd9(u9TCib(X#@b8ckobv1ih*J>GM z>=ZX`RW~)uG0^iGs+>Ecn|WSK@`{-+JGN=JBN~lFGs?lu&6)VjRP3>t_|{Zx^YNMZ zRBZP6?ABH^GCuj}6HA#5qiFIg1R9q*Z%Kp!_q%_86>AbFJy-QOvCr$Aeoz#TRU~?# zuYX{0NEsd(9UdDVA0MB%Yy9A$L-%Bq(X5)=C|HE{6gRk)G%DJPp5ta(e@R=hwM#Zt zGRjDk-jbHT&}dq|Ttc0(MuRifQYgQR$i~Y)~YFVmT(2|$W8){ZF7R)5KZC)fz8V!jo zS{jYycuJSloNg8-=YDlVIhk0jR~~jN3QW2cOop*~&68}|REt_PI+=LZYl*-SI0?@{ z8s~WpUWco29d5u)_#S?SKUj!Oum{)?Hp@=1IrcQ0XD_e}yU0}6x~Kkh@0I;9$`9%3 zO8Il)@Mv?tm_7Yx{=VjAur!94JMDC&%qcjbk;bT|Ez{s;0sRy9KFlf&E`g1A6Uvxf zoTP*n4otMy6mkFc)t`0TZN?QD?5-_wff$0oRVjlgZBX&jAt&R^z16BA;tPKvtV+^2 zBChsYGM>)}&mbbnLly5PSLm_}qAKSpyD-~Dvshxsj(*x%TjX@} zcb`*-@kJ)xS;+WHgntO%Z8Stp*=%Bc+RJVWTQHks4kL$mw-9+;JHFhQcOCtRT)MZC z`79Eju)`yV^Q%HLP{I$PRI7%Fcj`GGZ__v;zV=!Y9(TQrI(R6S7RFa?S(R9ca(M?W z5!cEqKCT@#8*g--H6?uPBR5`zjaGE$`OES8n0}+f&P?z%L|iAn^KrFkH88c;lJLNf zgr^t1S%^iYc`2iL`?cnN5zE%#^YytVjUhg{b~-YSTZALztiUEzMGT>Dfr94uiT*!% z`Gc$eTR*MdXe;{OsbBQF|NS?}Z%~2=1QFN^5!mN~h|&4~lkNZi-wRL!3_%2f2>eG8 zV4+kxmBhj8M-9z>=&U`4*G0UjklwZ{9TU7c$MGng<9Pf+$MMc#3AV+t?i8#isDg6a wl~}{_zyBHFpF)W5Coace|4+Lj@r*%y#|!rVG+mtu-PK-Pe76SJOZ)$S0GBhE=l}o! diff --git a/.gitignore b/.gitignore index c74e78d0f..7eab15f91 100644 --- a/.gitignore +++ b/.gitignore @@ -89,4 +89,4 @@ venv/ .spyderproject # Rope project settings -.ropeproject +.ropeproject \ No newline at end of file From bdda4183791a64fa6d0226ee2fb489fe4ea2806d Mon Sep 17 00:00:00 2001 From: abdnafees Date: Wed, 16 Nov 2022 01:33:01 +0500 Subject: [PATCH 3/5] Removed .github/.DS_Store --- .github/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .github/.DS_Store diff --git a/.github/.DS_Store b/.github/.DS_Store deleted file mode 100644 index 48c5e5ad6b7315df619ef8dd188dea381cd6c4b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!AiqG5Pe%KvgKMBlxaGimSg&LJ`OKmyKnD<%`uZ- z$IKp9^YWYmUCdG936HqLl)X8g>)E@{^~adD^Rd~kJ9^ub`k#G&{;vnw zoiShx{3`}rJI&J}Un$ns#>+{q_0$`xi1<~Cix74~DW Date: Wed, 16 Nov 2022 01:53:49 +0500 Subject: [PATCH 4/5] Added new line in .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7eab15f91..c74e78d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -89,4 +89,4 @@ venv/ .spyderproject # Rope project settings -.ropeproject \ No newline at end of file +.ropeproject From dc23e74fb77c035795dbf1e63e67cceb001c8801 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Tue, 15 Nov 2022 22:02:30 +0100 Subject: [PATCH 5/5] Make long lines shorter --- getting-started/git-boot-camp.rst | 3 ++- getting-started/setup-building.rst | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 609dc61d7..c2ca538df 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -61,7 +61,8 @@ You can also use SSH-based or HTTPS-based URLs. Configure the Remotes --------------------- -.. These steps are duplicated in setup-building in step 6 and 7. Please update these there as well. +.. These steps are duplicated in setup-building in step 6 and 7. + Please update these there as well. Configure ``git`` to pull ``main`` from the ``upstream`` remote:: diff --git a/getting-started/setup-building.rst b/getting-started/setup-building.rst index 4a529b171..646495601 100644 --- a/getting-started/setup-building.rst +++ b/getting-started/setup-building.rst @@ -76,9 +76,11 @@ You will only need to execute these steps once per machine: (You can use both SSH-based or HTTPS-based URLs.) -.. Step 6 and 7 are are duplicated in bootcamp as well. Please update these steps in both places. +.. Step 6 and 7 are are duplicated in bootcamp as well. + Please update these steps in both places. -6. Add an ``upstream`` remote, then configure ``git`` to pull ``main`` from ``upstream`` and always push to ``origin``:: +6. Add an ``upstream`` remote, then configure ``git`` + to pull ``main`` from ``upstream`` and always push to ``origin``:: $ cd cpython $ git remote add upstream https://github.com/python/cpython @@ -95,7 +97,8 @@ You will only need to execute these steps once per machine: $ git config branch.main.remote upstream -For more information about these commands see :ref:`Git Bootcamp and Cheat Sheat `. +For more information about these commands see +:ref:`Git Bootcamp and Cheat Sheat `. If you did everything correctly, you should now have a copy of the code in the ``cpython`` directory and two remotes that refer to your own GitHub fork