zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py-build: python+ensurepip not required (#28562)

Browse Source 
* py-build: python+ensurepip not required

* Add patch to fix issue when pip is in PYTHONPATH
This commit is contained in:
Adam J. Stewart 2022-02-16 08:53:22 -06:00 committed by GitHub
parent 5272e72344
commit 5c1edbe00a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/py-build/isolation.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/src/build/env.py 2021-09-16 16:20:01.000000000 -0500
+++ b/src/build/env.py 2022-01-23 15:08:26.000000000 -0600
@@ -254,6 +254,7 @@
"""
import venv
+ os.environ.pop('PYTHONPATH', None)
venv.EnvBuilder(with_pip=True, symlinks=_fs_supports_symlink()).create(path)
executable, script_dir, purelib = _find_executable_and_scripts(path)

6
var/spack/repos/builtin/packages/py-build/package.py
View File

@ -16,7 +16,7 @@ class PyBuild(PythonPackage):
variant('virtualenv', default=False, description='Install optional virtualenv dependency') variant('virtualenv', default=False, description='Install optional virtualenv dependency')
depends_on('python@3.6:+ensurepip', type=('build', 'run')) depends_on('python@3.6:', type=('build', 'run'))
depends_on('py-setuptools', type='build') depends_on('py-setuptools', type='build')
depends_on('py-packaging@19:', type=('build', 'run')) depends_on('py-packaging@19:', type=('build', 'run'))
depends_on('py-pep517@0.9.1:', type=('build', 'run')) depends_on('py-pep517@0.9.1:', type=('build', 'run'))
@ -24,3 +24,7 @@ class PyBuild(PythonPackage):
depends_on('py-colorama', when='platform=windows', type=('build', 'run')) depends_on('py-colorama', when='platform=windows', type=('build', 'run'))
depends_on('py-importlib-metadata@0.22:', when='^python@:3.7', type=('build', 'run')) depends_on('py-importlib-metadata@0.22:', when='^python@:3.7', type=('build', 'run'))
depends_on('py-virtualenv@20.0.35:', when='+virtualenv', type=('build', 'run')) depends_on('py-virtualenv@20.0.35:', when='+virtualenv', type=('build', 'run'))
# https://github.com/pypa/build/issues/266
# https://github.com/pypa/build/issues/406
patch('isolation.patch', when='@0.7.0')