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.

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

fix(makefile): support python 3.10 #18857

Merged
merged 1 commit into from
Dec 15, 2021
Merged

fix(makefile): support python 3.10 #18857

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 4 additions & 28 deletions third-party/chpl-venv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,10 @@ OLD_PYTHON_ERROR="python3 version 3.5 or later is required to install chpldoc an
# (to allow for a different path to the system python3 in the future)
$(CHPL_VENV_VIRTUALENV_DIR_OK):
@# First check the python version is OK
@case `$(PYTHON) --version` in \
*"Python 3.0"*) \
echo $(OLD_PYTHON_ERROR) ; \
exit 1 ; \
;; \
*"Python 3.1"*) \
echo $(OLD_PYTHON_ERROR) ; \
exit 1 ; \
;; \
*"Python 3.2"*) \
echo $(OLD_PYTHON_ERROR) ; \
exit 1 ; \
;; \
*"Python 3.3"*) \
echo $(OLD_PYTHON_ERROR) ; \
exit 1 ; \
;; \
*"Python 3.4"*) \
echo $(OLD_PYTHON_ERROR) ; \
exit 1 ; \
;; \
*"Python 3"*) \
;; \
*) \
echo $(OLD_PYTHON_ERROR) ; \
exit 1 ; \
;; \
esac
@if $(PYTHON) -c 'import sys; sys.exit(int(sys.version_info[:2] >= (3, 5)))'; then \
echo $(OLD_PYTHON_ERROR); \
exit 1; \
fi

@# Now create the venv to use to get the dependencies
$(PYTHON) -m venv $(CHPL_VENV_VIRTUALENV_DIR)
Expand Down