Branch: refs/heads/master
Revision: 6468acd
Author: mppf
Log Message:
Merge pull request #16616 from mppf/check-pip-python-major-version
Fall back on pip3 if CHPL_PIP doesn’t match major Python vers
We are having problems in certain testing configurations that set
CHPL_PIP
to a Python 2 version of pip. We plan to adjust these testing
configurations to not do that but that is taking some time. In the
meantime, this PR adjusts the Makefile logic setting the PIP
variable
from CHPL_PIP
to run a Python script to check the provided value of
CHPL_PIP
. If the provided CHPL_PIP
is for a different major version
of Python, fall back on pip3
.
- [x]
python3 third-party/chpl-venv/find-pip.py pip3
behaves as
expected (returns pip3) - [x]
python3 third-party/chpl-venv/find-pip.py pip2
behaves as
expected (returns pip3) - [x]
make docs
works in a weirdCHPL_PIP
setup - [x]
make docs
works on a linux system
Reviewed by @lydia-duncan - thanks!
Modified Files:
A third-party/chpl-venv/find-pip.py
M third-party/chpl-venv/Makefile
M third-party/chpl-venv/Makefile.include
Compare: https://github.com/chapel-lang/chapel/compare/6dfa331f1e9e...6468acdcbcb8