Browse Source

Merge pull request #2764 from xaocon/pip-fix

use -I with ensurepip
pull/2778/head
native-api 2 years ago
committed by GitHub
parent
commit
9100243866
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
  1. +1
    -0
      plugins/.gitignore
  2. +1
    -1
      plugins/python-build/bin/python-build
  3. +2
    -2
      plugins/python-build/test/pyenv_ext.bats

+ 1
- 0
plugins/.gitignore View File

@ -2,3 +2,4 @@
!/.gitignore
!/version-ext-compat
!/python-build
/python-build/test/build

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

@ -2025,7 +2025,7 @@ build_package_ensurepip() {
ensurepip_opts="--altinstall"
fi
# FIXME: `--altinstall` with `get-pip.py`
"$PYTHON_BIN" -s -m ensurepip ${ensurepip_opts} 1>/dev/null 2>&1 || build_package_get_pip "$@" || return 1
"$PYTHON_BIN" -I -m ensurepip ${ensurepip_opts} 1>/dev/null 2>&1 || build_package_get_pip "$@" || return 1
build_package_symlink_version_suffix
}

+ 2
- 2
plugins/python-build/test/pyenv_ext.bats View File

@ -200,7 +200,7 @@ OUT
assert_success
assert_build_log <<OUT
python -s -m ensurepip
python -I -m ensurepip
OUT
}
@ -218,7 +218,7 @@ OUT
assert_success
assert_build_log <<OUT
python -s -m ensurepip --altinstall
python -I -m ensurepip --altinstall
OUT
}

Loading…
Cancel
Save