hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix packages that will break with PIL 10 (#31071)

Browse source
This commit is contained in:
Adam J. Stewart 2022-06-13 07:04:13 -07:00 committed by GitHub
parent 5550271ead
commit f6e6403fd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/py-torchgeo/package.py
View file

@ -40,7 +40,8 @@ class PyTorchgeo(PythonPackage):
depends_on('py-matplotlib', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run'))
depends_on('py-omegaconf@2.1:', 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-pyproj@2.2:', type=('build', 'run'))
depends_on('py-pytorch-lightning@1.3:', type=('build', 'run')) depends_on('py-pytorch-lightning@1.3:', type=('build', 'run'))
depends_on('py-rasterio@1.0.16:', type=('build', 'run')) depends_on('py-rasterio@1.0.16:', type=('build', 'run'))

7
var/spack/repos/builtin/packages/py-torchvision/package.py
View file

@ -86,9 +86,12 @@ class PyTorchvision(PythonPackage):
# https://github.com/pytorch/vision/issues/1712 # 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: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 # 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('py-accimage', when='backend=accimage', type=('build', 'run'))
depends_on('libpng@1.6.0:', when='backend=png') depends_on('libpng@1.6.0:', when='backend=png')
depends_on('jpeg') depends_on('jpeg')