diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-06-13 07:04:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-13 16:04:13 +0200 |
| commit | f6e6403fd192e555744d18e496fb7c4c51e977d7 (patch) | |
| tree | c10b249558db76200d0037bfed3119e1cd65a1e6 | |
| parent | 5550271eadbf3e33c2dcbe0a0bac3aafc95e09a6 (diff) | |
| download | spack-f6e6403fd192e555744d18e496fb7c4c51e977d7.tar.gz spack-f6e6403fd192e555744d18e496fb7c4c51e977d7.tar.bz2 spack-f6e6403fd192e555744d18e496fb7c4c51e977d7.tar.xz spack-f6e6403fd192e555744d18e496fb7c4c51e977d7.zip | |
Fix packages that will break with PIL 10 (#31071)
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torchgeo/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torchvision/package.py | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-torchgeo/package.py b/var/spack/repos/builtin/packages/py-torchgeo/package.py index 1802f1218b..661bc0679f 100644 --- a/var/spack/repos/builtin/packages/py-torchgeo/package.py +++ b/var/spack/repos/builtin/packages/py-torchgeo/package.py @@ -40,7 +40,8 @@ class PyTorchgeo(PythonPackage): depends_on('py-matplotlib', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-omegaconf@2.1:', type=('build', 'run')) - depends_on('pil@2.9:', type=('build', 'run')) + depends_on('pil@2.9:', when='@0.3:', type=('build', 'run')) + depends_on('pil@2.9:9', when='@:0.2', type=('build', 'run')) depends_on('py-pyproj@2.2:', type=('build', 'run')) depends_on('py-pytorch-lightning@1.3:', type=('build', 'run')) depends_on('py-rasterio@1.0.16:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-torchvision/package.py b/var/spack/repos/builtin/packages/py-torchvision/package.py index 509ae1a23c..6848c72f9b 100644 --- a/var/spack/repos/builtin/packages/py-torchvision/package.py +++ b/var/spack/repos/builtin/packages/py-torchvision/package.py @@ -86,9 +86,12 @@ class PyTorchvision(PythonPackage): # https://github.com/pytorch/vision/issues/1712 depends_on('pil@4.1.1:6', when='@:0.4 backend=pil', type=('build', 'run')) - depends_on('pil@4.1.1:', when='@0.5: backend=pil', type=('build', 'run')) + depends_on('pil@4.1.1:9', when='@0.5: backend=pil', type=('build', 'run')) # https://github.com/pytorch/vision/issues/4146 - depends_on('pil@5.3:8.2,8.4:', when='@0.10: backend=pil', type=('build', 'run')) + # https://github.com/pytorch/vision/issues/4934 + depends_on('pil@5.3:8.2,8.4:9', when='@0.10:0.12 backend=pil', type=('build', 'run')) + # https://github.com/pytorch/vision/pull/5898 + depends_on('pil@5.3:8.2,8.4:', when='@0.13: backend=pil', type=('build', 'run')) depends_on('py-accimage', when='backend=accimage', type=('build', 'run')) depends_on('libpng@1.6.0:', when='backend=png') depends_on('jpeg') |