diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2021-08-27 12:58:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 10:58:20 -0700 |
| commit | 32210b06588671a736b1744db90f9c27dce2804c (patch) | |
| tree | d39f95ddf46e1b34e05bec8b1ad5ee41ad7cab86 /var | |
| parent | 98e6e4a3a5caeadbed542cb92cea8746f7492b88 (diff) | |
| download | spack-32210b06588671a736b1744db90f9c27dce2804c.tar.gz spack-32210b06588671a736b1744db90f9c27dce2804c.tar.bz2 spack-32210b06588671a736b1744db90f9c27dce2804c.tar.xz spack-32210b06588671a736b1744db90f9c27dce2804c.zip | |
py-pathlib: prevent conflicts with standard library (#25631)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-geeup/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-nbmake/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-pathlib/package.py | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-geeup/package.py b/var/spack/repos/builtin/packages/py-geeup/package.py index e0b2f3975f..a1128d4b4d 100644 --- a/var/spack/repos/builtin/packages/py-geeup/package.py +++ b/var/spack/repos/builtin/packages/py-geeup/package.py @@ -29,6 +29,6 @@ class PyGeeup(PythonPackage): depends_on('py-pysmartdl', type=('build', 'run')) depends_on('py-pysmartdl@1.2.5', type=('build', 'run'), when='^python@:3.3') depends_on('py-pysmartdl@1.3.1:', type=('build', 'run'), when='^python@3.4:') - depends_on('py-pathlib@1.0.1:', type=('build', 'run')) + depends_on('py-pathlib@1.0.1:', when='^python@:3.3', type=('build', 'run')) depends_on('py-lxml@4.1.1:', type=('build', 'run')) depends_on('py-oauth2client@4.1.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-nbmake/package.py b/var/spack/repos/builtin/packages/py-nbmake/package.py index 69f5287dda..77166847c2 100644 --- a/var/spack/repos/builtin/packages/py-nbmake/package.py +++ b/var/spack/repos/builtin/packages/py-nbmake/package.py @@ -20,6 +20,6 @@ class PyNbmake(PythonPackage): depends_on('py-ipykernel@5.4.0:5.999', type=('build', 'run')) depends_on('py-nbclient@0.3:0.999', type=('build', 'run')) depends_on('py-nbformat@5.0.8:5.999', type=('build', 'run')) - depends_on('py-pathlib@1.0.1:1.999', type=('build', 'run')) + depends_on('py-pathlib@1.0.1:1.999', when='^python@:3.3', type=('build', 'run')) depends_on('py-pydantic@1.7.2:1.999', type=('build', 'run')) depends_on('py-pytest@6.1.2:6.999', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pathlib/package.py b/var/spack/repos/builtin/packages/py-pathlib/package.py index e9579aa4b9..5c05c4e82c 100644 --- a/var/spack/repos/builtin/packages/py-pathlib/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib/package.py @@ -17,3 +17,11 @@ class PyPathlib(PythonPackage): pypi = "pathlib/pathlib-1.0.1.tar.gz" version('1.0.1', sha256='6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f') + + # This is a backport of the pathlib module from Python 3.4. Since pathlib is now + # part of the standard library, this module isn't needed in Python 3.4+. Although it + # can be installed, differences between this implementation and the standard library + # implementation can cause other packages to fail. If it is installed, it ends up + # masking the standard library and doesn't have the same features that the standard + # library has in newer versions of Python. + conflicts('^python@3.4:') |