github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove no-longer-needed PyPy prerequisites

Browse source
This commit is contained in:
Ivan Pozdeev 2022-12-10 16:05:29 +03:00
parent 49cc88094a
commit 18f62f266d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/modified_scripts_build.yml vendored
View file

@ -41,7 +41,8 @@ jobs:
brew install openssl openssl@1.1 readline sqlite3 xz zlib brew install openssl openssl@1.1 readline sqlite3 xz zlib
if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then
pyenv install 2.7.18 pyenv install 2.7.18
PYENV_VERSION=2.7.18 pip install curses genc pycparser PYENV_VERSION=2.7.18 pip install pycparser
# brew install expat
fi fi
- run: | - run: |
#build #build
@ -103,7 +104,8 @@ jobs:
xz-utils tk-dev libffi-dev liblzma-dev xz-utils tk-dev libffi-dev liblzma-dev
if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then
pyenv install 2.7.18 pyenv install 2.7.18
PYENV_VERSION=2.7.18 pip install curses genc pycparser PYENV_VERSION=2.7.18 pip install pycparser
# sudo apt install -yq libexpat1-dev
fi fi
- run: | - run: |
#build #build

2
plugins/python-build/bin/pyenv-install
View file

@ -219,7 +219,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
done done
fi fi
if [ -n "$PYENV_BOOTSTRAP_VERSION" ]; then if [ -n "$PYENV_BOOTSTRAP_VERSION" ]; then
for dep in curses genc pycparser; do for dep in pycparser; do
if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c "import ${dep}" 1>/dev/null 2>&1; then if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c "import ${dep}" 1>/dev/null 2>&1; then
echo "pyenv-install: $VERSION_NAME: PyPy requires \`${dep}' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2 echo "pyenv-install: $VERSION_NAME: PyPy requires \`${dep}' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2
exit 1 exit 1