Skip to content

bpo-45873: Get rid of bootstrap_python #29717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 12 commits into from
Nov 23, 2021
Merged

bpo-45873: Get rid of bootstrap_python #29717

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df1901e
bpo-45873: Get rid of bootstrap_python
gvanrossum Nov 22, 2021
4463a96
Get rid of the MANIFEST file
gvanrossum Nov 22, 2021
b7469b8
Make deepfreeze.py palatable to Python 3.7 and up
gvanrossum Nov 23, 2021
0821457
Restore Python 3.8 and 3.9 as Windows host Python again
gvanrossum Nov 23, 2021
0e6dcf2
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 23, 2021
f923580
bpo-45873: Get rid of bootstrap_python
gvanrossum Nov 22, 2021
1912356
Get rid of the MANIFEST file
gvanrossum Nov 22, 2021
2b1f844
Make deepfreeze.py palatable to Python 3.7 and up
gvanrossum Nov 23, 2021
eb1b3ca
Restore Python 3.8 and 3.9 as Windows host Python again
gvanrossum Nov 23, 2021
e15331e
Added blurb
gvanrossum Nov 23, 2021
34a623a
Annotate removesuffix()
gvanrossum Nov 23, 2021
5197758
Make out-of-tree builds pass
gvanrossum Nov 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore Python 3.8 and 3.9 as Windows host Python again
  • Loading branch information
@gvanrossum
gvanrossum committed Nov 23, 2021
commit 0821457c0e3803191803aa1024ee8edf857b86a7
6 changes: 3 additions & 3 deletions PCbuild/find_python.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
@if "%_Py_EXTERNALS_DIR%"=="" (set _Py_EXTERNALS_DIR=%~dp0\..\externals)

@rem If we have Python in externals, use that one
@if exist "%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" ("%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" -Ec "import sys; assert sys.version_info[:2] >= (3, 10)" >nul 2>nul) && (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") && (set _Py_Python_Source=found in externals directory) && goto :found || rmdir /Q /S "%_Py_EXTERNALS_DIR%\pythonx86"
@if exist "%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" ("%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe" -Ec "import sys; assert sys.version_info[:2] >= (3, 8)" >nul 2>nul) && (set PYTHON="%_Py_EXTERNALS_DIR%\pythonx86\tools\python.exe") && (set _Py_Python_Source=found in externals directory) && goto :found || rmdir /Q /S "%_Py_EXTERNALS_DIR%\pythonx86"

@rem If HOST_PYTHON is recent enough, use that
@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 10)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found
@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 8)" >nul 2>nul && (set PYTHON="%HOST_PYTHON%") && (set _Py_Python_Source=found as HOST_PYTHON) && goto :found

@rem If py.exe finds a recent enough version, use that one
@for %%p in (3.10) do @py -%%p -EV >nul 2>&1 && (set PYTHON=py -%%p) && (set _Py_Python_Source=found %%p with py.exe) && goto :found
@for %%p in (3.10 3.9 3.8) do @py -%%p -EV >nul 2>&1 && (set PYTHON=py -%%p) && (set _Py_Python_Source=found %%p with py.exe) && goto :found
Copy link
Copy Markdown
Member

@zware zware Nov 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Considering how at least one (my :( ) buildbot happily used 3.1 for py -3.10, we might want to put 3.10 at the end of the list here.

Copy link
Copy Markdown
Member Author

@gvanrossum gvanrossum Nov 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm... Before 1037ca5 this said (3.9 3.8) so I assume the intention was to try the latest first. Maybe @zooba can help out? (Steve, why would an older py -3.10 on Windows 8.1 find 3.1? (Yes, 3.1 was installed there; and 3.10 wasn't. But it feels like an argument parsing issue in launcher.c.)


@if NOT exist "%_Py_EXTERNALS_DIR%" mkdir "%_Py_EXTERNALS_DIR%"
@set _Py_NUGET=%NUGET%
Expand Down