Skip to content
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.

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

bpo-34267: Update find_python.bat to use 3.7 if available #8552

Merged
merged 1 commit into from
Sep 17, 2018

Conversation

zooba
Copy link
Member

@zooba zooba commented Jul 29, 2018

@@ -34,7 +34,10 @@
@if NOT "%HOST_PYTHON%"=="" @%HOST_PYTHON% -Ec "import sys; assert sys.version_info[:2] >= (3, 6)" >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
@py -3.6 -EV >nul 2>&1 && (set PYTHON=py -3.6) && (set _Py_Python_Source=found with py.exe) && goto :found
@py -3.7 -EV >nul 2>&1 && (set PYTHON=py -3.7) && (set _Py_Python_Source=found 3.7 with py.exe) && goto :found
Copy link
Contributor

Choose a reason for hiding this comment

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

How about:

for %%i in (3.7 3.6) do (
    @py -%%i -EV >nul 2>&1 && (set PYTHON=py -%%i) && (set _Py_Python_Source=found %%i with py.exe) && goto :found
)

@zooba zooba merged commit 6750922 into python:master Sep 17, 2018
@miss-islington
Copy link
Contributor

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@zooba zooba deleted the bpo-34267 branch September 17, 2018 21:41
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 17, 2018
)

(cherry picked from commit 6750922)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
@bedevere-bot
Copy link

GH-9373 is a backport of this pull request to the 3.7 branch.

miss-islington added a commit that referenced this pull request Sep 17, 2018
(cherry picked from commit 6750922)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants