Browse Source

Remove no-longer-needed PyPy prerequisites

pull/2553/head
Ivan Pozdeev 1 year ago
parent
commit
18f62f266d
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      .github/workflows/modified_scripts_build.yml
  2. +1
    -1
      plugins/python-build/bin/pyenv-install

+ 4
- 2
.github/workflows/modified_scripts_build.yml View File

@ -41,7 +41,8 @@ jobs:
brew install openssl openssl@1.1 readline sqlite3 xz zlib
if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then
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
- run: |
#build
@ -103,7 +104,8 @@ jobs:
xz-utils tk-dev libffi-dev liblzma-dev
if [[ "${{ matrix.python-version }}" =~ pypy.*-(src|dev) ]]; then
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
- run: |
#build

+ 1
- 1
plugins/python-build/bin/pyenv-install View File

@ -219,7 +219,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
done
fi
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
echo "pyenv-install: $VERSION_NAME: PyPy requires \`${dep}' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2
exit 1

Loading…
Cancel
Save