summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/adlbx/package.py1
-rw-r--r--var/spack/repos/builtin/packages/alquimia/package.py1
-rw-r--r--var/spack/repos/builtin/packages/bazel/package.py3
-rw-r--r--var/spack/repos/builtin/packages/candle-benchmarks/package.py1
-rw-r--r--var/spack/repos/builtin/packages/cbtf-krell/package.py18
-rw-r--r--var/spack/repos/builtin/packages/cntk/package.py2
-rw-r--r--var/spack/repos/builtin/packages/cub/package.py1
-rw-r--r--var/spack/repos/builtin/packages/cuda/package.py2
-rw-r--r--var/spack/repos/builtin/packages/dmd/package.py1
-rw-r--r--var/spack/repos/builtin/packages/essl/package.py10
-rw-r--r--var/spack/repos/builtin/packages/fenics/hdf5~cxx-detection.patch11
-rw-r--r--var/spack/repos/builtin/packages/fenics/package.py7
-rw-r--r--var/spack/repos/builtin/packages/fenics/petsc-version-detection.patch39
-rw-r--r--var/spack/repos/builtin/packages/flecsi/package.py4
-rw-r--r--var/spack/repos/builtin/packages/fortrilinos/package.py4
-rw-r--r--var/spack/repos/builtin/packages/gaussian-view/package.py3
-rw-r--r--var/spack/repos/builtin/packages/gdal/package.py1
-rw-r--r--var/spack/repos/builtin/packages/graphviz/package.py1
-rw-r--r--var/spack/repos/builtin/packages/htslib/package.py1
-rw-r--r--var/spack/repos/builtin/packages/kokkos-legacy/package.py3
-rw-r--r--var/spack/repos/builtin/packages/latte/package.py1
-rw-r--r--var/spack/repos/builtin/packages/macsio/package.py1
-rw-r--r--var/spack/repos/builtin/packages/mpt/package.py27
-rw-r--r--var/spack/repos/builtin/packages/openspeedshop-utils/package.py14
-rw-r--r--var/spack/repos/builtin/packages/openspeedshop/package.py14
-rw-r--r--var/spack/repos/builtin/packages/petsc/package.py6
-rw-r--r--var/spack/repos/builtin/packages/pexsi/package.py3
-rw-r--r--var/spack/repos/builtin/packages/py-apache-beam/package.py54
-rw-r--r--var/spack/repos/builtin/packages/py-astroid/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-avro-python3/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-certifi/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-csvkit/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-cyordereddict/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-enum34/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-ftfy/package.py6
-rw-r--r--var/spack/repos/builtin/packages/py-google-auth/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-guidata/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-importlib/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-intervaltree/package.py4
-rw-r--r--var/spack/repos/builtin/packages/py-jedi/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-mechanize/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-mypy/package.py13
-rw-r--r--var/spack/repos/builtin/packages/py-neo/package.py4
-rw-r--r--var/spack/repos/builtin/packages/py-niworkflows/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-oauth2client/package.py4
-rw-r--r--var/spack/repos/builtin/packages/py-openpyxl/package.py7
-rw-r--r--var/spack/repos/builtin/packages/py-pyepsg/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-pymol/package.py4
-rw-r--r--var/spack/repos/builtin/packages/py-pysam/package.py14
-rw-r--r--var/spack/repos/builtin/packages/py-pyscf/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-pysolar/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-pyspark/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-python-dateutil/package.py3
-rw-r--r--var/spack/repos/builtin/packages/py-pyutilib/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-pyvcf/package.py9
-rw-r--r--var/spack/repos/builtin/packages/py-pyyaml/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-requests-futures/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-requests/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-simplejson/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-slepc4py/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-tabulate/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-tensorflow/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-tokenizers/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-tqdm/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-transformers/package.py27
-rw-r--r--var/spack/repos/builtin/packages/py-typed-ast/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-urllib3/package.py2
-rw-r--r--var/spack/repos/builtin/packages/py-yahmm/package.py1
-rw-r--r--var/spack/repos/builtin/packages/py-yarl/package.py7
-rw-r--r--var/spack/repos/builtin/packages/qt-creator/package.py2
-rw-r--r--var/spack/repos/builtin/packages/rust/package.py2
-rw-r--r--var/spack/repos/builtin/packages/seacas/package.py8
-rw-r--r--var/spack/repos/builtin/packages/spectrum-mpi/package.py8
-rw-r--r--var/spack/repos/builtin/packages/turbine/package.py10
74 files changed, 179 insertions, 245 deletions
diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py
index a930619aa5..65dee1d796 100644
--- a/var/spack/repos/builtin/packages/adlbx/package.py
+++ b/var/spack/repos/builtin/packages/adlbx/package.py
@@ -21,7 +21,6 @@ class Adlbx(AutotoolsPackage):
depends_on('exmcutils@master', when='@master')
depends_on('exmcutils@:0.5.7', when='@:0.9.2')
- depends_on('exmcutils@:0.5.3', when='@:0.8.0')
depends_on('exmcutils', when='@0.9.1:')
depends_on('autoconf', type='build', when='@master')
depends_on('automake', type='build', when='@master')
diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py
index 47f09be3d9..ff30662f2f 100644
--- a/var/spack/repos/builtin/packages/alquimia/package.py
+++ b/var/spack/repos/builtin/packages/alquimia/package.py
@@ -32,7 +32,6 @@ class Alquimia(CMakePackage):
depends_on('pflotran@xsdk-0.5.0', when='@xsdk-0.5.0')
depends_on('pflotran@xsdk-0.4.0', when='@xsdk-0.4.0')
depends_on('pflotran@xsdk-0.3.0', when='@xsdk-0.3.0')
- depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0')
depends_on('pflotran@develop', when='@develop')
depends_on('petsc@3.10.0:3.10', when='@xsdk-0.4.0')
depends_on('petsc@3.8.0:3.8', when='@xsdk-0.3.0')
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py
index 74e72a3623..e4cb1bd432 100644
--- a/var/spack/repos/builtin/packages/bazel/package.py
+++ b/var/spack/repos/builtin/packages/bazel/package.py
@@ -103,6 +103,9 @@ class Bazel(Package):
version('0.3.2', sha256='ca5caf7b2b48c7639f45d815b32e76d69650f3199eb8caa541d402722e3f6c10')
version('0.3.1', sha256='218d0e28b4d1ee34585f2ac6b18d169c81404d93958815e73e60cc0368efcbb7')
version('0.3.0', sha256='357fd8bdf86034b93902616f0844bd52e9304cccca22971ab7007588bf9d5fb3')
+ version('0.2.0', sha256='54669662f7751d9fc9959207e13d9a171bda15be9087703d3dbd3968fed12b27')
+ version('0.1.4', sha256='f3c395f5cd78cfef96f4008fe842f327bc8b03b77f46999387bc0ad223b5d970')
+ version('0.1.1', sha256='c6ae19610b936a0aa940b44a3626d6e660fc457a8187d295cdf0b21169453d20')
variant('nodepfail', default=True, description='Disable failing dependency checks due to injected absolute paths - required for most builds using bazel with spack')
diff --git a/var/spack/repos/builtin/packages/candle-benchmarks/package.py b/var/spack/repos/builtin/packages/candle-benchmarks/package.py
index db7164a2fa..4f4296d47f 100644
--- a/var/spack/repos/builtin/packages/candle-benchmarks/package.py
+++ b/var/spack/repos/builtin/packages/candle-benchmarks/package.py
@@ -15,6 +15,7 @@ class CandleBenchmarks(Package):
tags = ['proxy-app', 'ecp-proxy-app']
version('0.1', sha256='767f74f43ee3a5d4e0f26750f2a96b8433e25a9cd4f2d29938ac8acf263ab58d')
+ version('0.0', sha256='faa0d24355071de0e375d72ed1a39dcf30006602210cf8cf09db568b5d0b679f')
variant('mpi', default=True, description='Build with MPI support')
diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py
index 98ff820300..73251b3734 100644
--- a/var/spack/repos/builtin/packages/cbtf-krell/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py
@@ -29,12 +29,8 @@ class CbtfKrell(CMakePackage):
description="Build mpi experiment collector for SGI MPT MPI.")
variant('mvapich2', default=False,
description="Build mpi experiment collector for mvapich2 MPI.")
- variant('mvapich', default=False,
- description="Build mpi experiment collector for mvapich MPI.")
variant('mpich2', default=False,
description="Build mpi experiment collector for mpich2 MPI.")
- variant('mpich', default=False,
- description="Build mpi experiment collector for mpich MPI.")
variant('runtime', default=False,
description="build only the runtime libraries and collectors.")
variant('build_type', default='RelWithDebInfo',
@@ -90,10 +86,8 @@ class CbtfKrell(CMakePackage):
# MPI Installations
depends_on("openmpi", when='+openmpi')
- depends_on("mpich@:1", when='+mpich')
depends_on("mpich@2:", when='+mpich2')
depends_on("mvapich2@2:", when='+mvapich2')
- depends_on("mvapich2@:1", when='+mvapich')
depends_on("mpt", when='+mpt')
depends_on("python", when='@develop', type=('build', 'run'))
@@ -124,15 +118,9 @@ class CbtfKrell(CMakePackage):
# openmpi
if spec.satisfies('+openmpi'):
mpi_options.append('-DOPENMPI_DIR=%s' % spec['openmpi'].prefix)
- # mpich
- if spec.satisfies('+mpich'):
- mpi_options.append('-DMPICH_DIR=%s' % spec['mpich'].prefix)
# mpich2
if spec.satisfies('+mpich2'):
mpi_options.append('-DMPICH2_DIR=%s' % spec['mpich2'].prefix)
- # mvapich
- if spec.satisfies('+mvapich'):
- mpi_options.append('-DMVAPICH_DIR=%s' % spec['mvapich'].prefix)
# mvapich2
if spec.satisfies('+mvapich2'):
mpi_options.append('-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix)
@@ -245,12 +233,6 @@ class CbtfKrell(CMakePackage):
# Users may have to set the CBTF_MPI_IMPLEMENTATION variable
# manually if multiple mpi's are specified in the build
- if self.spec.satisfies('+mpich'):
- env.set('CBTF_MPI_IMPLEMENTATION', "mpich")
-
- if self.spec.satisfies('+mvapich'):
- env.set('CBTF_MPI_IMPLEMENTATION', "mvapich")
-
if self.spec.satisfies('+mvapich2'):
env.set('CBTF_MPI_IMPLEMENTATION', "mvapich2")
diff --git a/var/spack/repos/builtin/packages/cntk/package.py b/var/spack/repos/builtin/packages/cntk/package.py
index 64ebe95c02..36c06d3e12 100644
--- a/var/spack/repos/builtin/packages/cntk/package.py
+++ b/var/spack/repos/builtin/packages/cntk/package.py
@@ -32,7 +32,7 @@ class Cntk(Package):
depends_on('protobuf')
# CNTK depends on kaldi@c02e8.
# See https://github.com/Microsoft/CNTK/blob/master/Tools/docker/CNTK-CPUOnly-Image/Dockerfile#L105-L125
- depends_on('kaldi@c024e8', when='+kaldi')
+ depends_on('kaldi@2015-10-07', when='+kaldi')
depends_on('opencv', when='+opencv')
depends_on('cuda', when='+cuda')
depends_on('cub@1.4.1', when='+cuda')
diff --git a/var/spack/repos/builtin/packages/cub/package.py b/var/spack/repos/builtin/packages/cub/package.py
index 1b7fe570fb..8c76bdfb23 100644
--- a/var/spack/repos/builtin/packages/cub/package.py
+++ b/var/spack/repos/builtin/packages/cub/package.py
@@ -29,6 +29,7 @@ class Cub(Package):
version('1.7.3', sha256='b7ead9e291d34ffa8074243541c1380d63be63f88de23de8ee548db573b72ebe')
version('1.7.2', sha256='09b478d4df8e6c62f8425d23ade9e2a52bc279a20057c7d22ce2160f3923764a')
version('1.7.1', sha256='50b8777b83093fdfdab429a61fccdbfbbb991b3bbc08385118e5ad58e8f62e1d')
+ version('1.4.1', sha256='7c3784cf59f02d4a88099d6a11e357032bac9eac2b9c78aaec947d1270e21871')
def install(self, spec, prefix):
mkdirp(prefix.include)
diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py
index d11547f506..fb5656c690 100644
--- a/var/spack/repos/builtin/packages/cuda/package.py
+++ b/var/spack/repos/builtin/packages/cuda/package.py
@@ -103,6 +103,8 @@ _versions = {
'Linux-x86_64': ('08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec', 'https://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run')},
'6.5.14': {
'Linux-x86_64': ('f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48', 'https://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_64.run')},
+ '6.0.37': {
+ 'Linux-x86_64': ('991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40', '//developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run')},
}
diff --git a/var/spack/repos/builtin/packages/dmd/package.py b/var/spack/repos/builtin/packages/dmd/package.py
index 164fa74e34..c13c3509cc 100644
--- a/var/spack/repos/builtin/packages/dmd/package.py
+++ b/var/spack/repos/builtin/packages/dmd/package.py
@@ -15,6 +15,7 @@ class Dmd(MakefilePackage):
url = "https://github.com/dlang/dmd/archive/v2.081.1.tar.gz"
version('2.081.1', sha256='14f3aafe1c93c86646aaeb3ed7361a5fc5a24374cf25c8848c81942bfd9fae1a')
+ version('2.081.0', sha256='29b9882ed424b744df83ac73182d4ae952251029ebd16117d18f9cc1e83542e2')
depends_on('openssl')
depends_on('curl')
diff --git a/var/spack/repos/builtin/packages/essl/package.py b/var/spack/repos/builtin/packages/essl/package.py
index d0442ede00..054edf08f4 100644
--- a/var/spack/repos/builtin/packages/essl/package.py
+++ b/var/spack/repos/builtin/packages/essl/package.py
@@ -2,15 +2,17 @@
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
from spack import *
-class Essl(Package):
+class Essl(BundlePackage):
"""IBM's Engineering and Scientific Subroutine Library (ESSL)."""
homepage = "https://www.ibm.com/systems/power/software/essl/"
+ # https://www.ibm.com/docs/en/essl/6.2?topic=whats-new
+ version('6.2.1.1')
+
variant('ilp64', default=False, description='64 bit integers')
variant(
'threads', default='openmp',
@@ -59,7 +61,3 @@ class Essl(Package):
)
return essl_libs
-
- def install(self, spec, prefix):
- raise InstallError('IBM ESSL is not installable;'
- ' it is vendor supplied')
diff --git a/var/spack/repos/builtin/packages/fenics/hdf5~cxx-detection.patch b/var/spack/repos/builtin/packages/fenics/hdf5~cxx-detection.patch
deleted file mode 100644
index 52e36ab00b..0000000000
--- a/var/spack/repos/builtin/packages/fenics/hdf5~cxx-detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt 2016-08-16 02:30:13.466078087 +0200
-+++ b/CMakeLists.txt 2016-08-16 02:30:36.879586772 +0200
-@@ -553,7 +553,7 @@
- set(ENV{HDF5_ROOT} "$ENV{HDF5_DIR}")
- endif()
- set(HDF5_PREFER_PARALLEL TRUE)
-- find_package(HDF5)
-+ find_package(HDF5 COMPONENTS C)
- set_package_properties(HDF5 PROPERTIES TYPE OPTIONAL
- DESCRIPTION "Hierarchical Data Format 5 (HDF5)"
- URL "https://www.hdfgroup.org/HDF5")
diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py
index 72c1766ee9..e16e83410b 100644
--- a/var/spack/repos/builtin/packages/fenics/package.py
+++ b/var/spack/repos/builtin/packages/fenics/package.py
@@ -27,11 +27,8 @@ class Fenics(CMakePackage):
version('2016.2.0',
sha256='c6760996660a476f77889e11e4a0bc117cc774be0eec777b02a7f01d9ce7f43d',
deprecated=True)
- version('1.6.0',
- sha256='67f66c39983a8c5a1ba3c0787fa9b9082778bc7227b25c7cad80dc1299e0a201',
- deprecated=True)
- dolfin_versions = ['2019.1.0', '2018.1.0', '2017.2.0', '2016.2.0', '1.6.0']
+ dolfin_versions = ['2019.1.0', '2018.1.0', '2017.2.0', '2016.2.0']
variant('python', default=True, description='Compile with Python interface')
variant('hdf5', default=True, description='Compile with HDF5')
@@ -68,8 +65,6 @@ class Fenics(CMakePackage):
# Patches
# patch('petsc-3.7.patch', when='petsc@3.7:')
- patch('petsc-version-detection.patch', when='@1.6.0')
- patch('hdf5~cxx-detection.patch', when='@:1.6.0')
patch('header_fix.patch', when='@2019.1.0.post0')
# endian.hpp for byte order detection was removed with Boost 1.73,
diff --git a/var/spack/repos/builtin/packages/fenics/petsc-version-detection.patch b/var/spack/repos/builtin/packages/fenics/petsc-version-detection.patch
deleted file mode 100644
index 1429cd7bc6..0000000000
--- a/var/spack/repos/builtin/packages/fenics/petsc-version-detection.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- dolfin-1.6.0.orig/cmake/modules/FindPETSc.cmake 2015-07-28 17:05:55.000000000 +0200
-+++ dolfin-1.6.0/cmake/modules/FindPETSc.cmake 2016-06-27 17:16:02.484402705 +0200
-@@ -207,13 +207,7 @@
-
- endif()
-
--# Build PETSc test program
--if (DOLFIN_SKIP_BUILD_TESTS)
-- set(PETSC_TEST_RUNS TRUE)
-- set(PETSC_VERSION "UNKNOWN")
-- set(PETSC_VERSION_OK TRUE)
--elseif (FOUND_PETSC_CONF)
--
-+if (FOUND_PETSC_CONF)
- # Set flags for building test program
- set(CMAKE_REQUIRED_INCLUDES ${PETSC_INCLUDE_DIRS})
- set(CMAKE_REQUIRED_LIBRARIES ${PETSC_LIBRARIES})
-@@ -271,7 +265,10 @@
- set(PETSC_VERSION_OK TRUE)
- endif()
- mark_as_advanced(PETSC_VERSION_OK)
-+endif()
-
-+ # Build PETSc test program
-+if (NOT DOLFIN_SKIP_BUILD_TESTS AND FOUND_PETSC_CONF)
- # Run PETSc test program
- set(PETSC_TEST_LIB_CPP
- "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/petsc_test_lib.cpp")
-@@ -359,7 +356,9 @@
- else()
- message(STATUS "PETSc configured without Cusp support")
- endif()
--
-+else()
-+ set(PETSC_TEST_RUNS TRUE)
-+
- endif()
-
- # Check sizeof(PetscInt)
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py
index fba678f846..5c53dd5bd8 100644
--- a/var/spack/repos/builtin/packages/flecsi/package.py
+++ b/var/spack/repos/builtin/packages/flecsi/package.py
@@ -88,7 +88,7 @@ class Flecsi(CMakePackage, CudaPackage):
depends_on('legion+shared', when='backend=legion @:1.9')
depends_on('legion+hdf5', when='backend=legion +hdf5 @:1.9')
depends_on('legion build_type=Debug', when='backend=legion +debug_backend @:1.9')
- depends_on('legion@ctrl-rep-7', when='backend=legion @:1.9')
+ depends_on('legion@cr', when='backend=legion @:1.9')
depends_on('hpx@1.4.1 cxxstd=17 malloc=system max_cpu_count=128', when='backend=hpx @:1.9')
depends_on('hpx build_type=Debug', when='backend=hpx +debug_backend @:1.9')
depends_on('googletest@1.8.1+gmock', when='@:1.9')
@@ -102,7 +102,7 @@ class Flecsi(CMakePackage, CudaPackage):
depends_on('cmake@3.15:', when='@2.0:')
depends_on('boost +atomic +filesystem +regex +system', when='@2.0:')
depends_on('kokkos@3.2.00:', when='+kokkos @2.0:')
- depends_on('legion@ctrl-rep-9:ctrl-rep-99', when='backend=legion @2.0:')
+ depends_on('legion@cr', when='backend=legion @2.0:')
depends_on('legion+hdf5', when='backend=legion +hdf5 @2.0:')
depends_on('hdf5@1.10.7:', when='backend=legion +hdf5 @2.0:')
depends_on('hpx@1.3.0 cxxstd=17 malloc=system', when='backend=hpx @2.0:')
diff --git a/var/spack/repos/builtin/packages/fortrilinos/package.py b/var/spack/repos/builtin/packages/fortrilinos/package.py
index 61654e96ca..8633a7fe54 100644
--- a/var/spack/repos/builtin/packages/fortrilinos/package.py
+++ b/var/spack/repos/builtin/packages/fortrilinos/package.py
@@ -41,9 +41,6 @@ class Fortrilinos(CMakePackage):
version('2.0.dev2',
sha256='2a55c668b3fe986583658d272eab2dc076b291a5f2eb582a02602db86a32030b',
url="https://github.com/trilinos/ForTrilinos/archive/v2.0.0-dev2.tar.gz")
- version('2.0.dev1',
- sha256='ab664ce2d7fe75c524d7ff6b1efffa3e459ab5739a916e6ea810ae40f39ca4f4',
- url="https://github.com/trilinos/ForTrilinos/archive/v2.0.0-dev1.tar.gz")
version('master', branch='master')
variant('hl', default=True, description='Build high-level Trilinos wrappers')
@@ -53,7 +50,6 @@ class Fortrilinos(CMakePackage):
depends_on('trilinos@13.0.0:', when='@2.0.0:')
depends_on('trilinos@12.18.1', when='@2.0.dev3')
depends_on('trilinos@12.18.1', when='@2.0.dev2')
- depends_on('trilinos@12.17.1', when='@2.0.dev1')
# Baseline trilinos dependencies
depends_on('trilinos gotype=long_long')
diff --git a/var/spack/repos/builtin/packages/gaussian-view/package.py b/var/spack/repos/builtin/packages/gaussian-view/package.py
index caa3d71bf1..1dd50ee7b6 100644
--- a/var/spack/repos/builtin/packages/gaussian-view/package.py
+++ b/var/spack/repos/builtin/packages/gaussian-view/package.py
@@ -41,7 +41,8 @@ class GaussianView(Package):
)
depends_on('gaussian@16-B.01', type='run', when='@:6.0')
- depends_on('gaussian@16-C.01', type='run', when='~gaussian-src@6.1:')
+ # TODO: add the checksum for gaussian@16-C.01 before uncommenting
+ # depends_on('gaussian@16-C.01', type='run', when='~gaussian-src@6.1:')
depends_on('gaussian-src@16-C.01', type='run', when='+gaussian-src@6.1:')
conflicts('+gaussian-src', when='@:6.0')
diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py
index bea77acf20..5bd36073e3 100644
--- a/var/spack/repos/builtin/packages/gdal/package.py
+++ b/var/spack/repos/builtin/packages/gdal/package.py
@@ -54,6 +54,7 @@ class Gdal(AutotoolsPackage):
version('2.3.0', sha256='6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2')
version('2.1.2', sha256='b597f36bd29a2b4368998ddd32b28c8cdf3c8192237a81b99af83cc17d7fa374')
version('2.0.2', sha256='90f838853cc1c07e55893483faa7e923e4b4b1659c6bc9df3538366030a7e622')
+ version('1.11.5', sha256='d4fdc3e987b9926545f0a514b4328cd733f2208442f8d03bde630fe1f7eff042', deprecated=True)
variant('libtool', default=True, description='Use libtool to build the library')
variant('libz', default=True, description='Include libz support')
diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py
index 72d47e727e..bd0dd16d8d 100644
--- a/var/spack/repos/builtin/packages/graphviz/package.py
+++ b/var/spack/repos/builtin/packages/graphviz/package.py
@@ -24,6 +24,7 @@ class Graphviz(AutotoolsPackage):
version('2.46.0', sha256='1b11684fd5488940b45bf4624393140da6032abafae08f33dc3e986cffd55d71')
version('2.44.1', sha256='0f8f3fbeaddd474e0a270dc9bb0e247a1ae4284ae35125af4adceffae5c7ae9b')
version('2.42.4', sha256='a1ca0c4273d96bbf32fbfcbb784c8da2e38da13e7d2bbf9b24fe94ae45e79c4c')
+ version('2.40.1', sha256='581596aaeac5dae3f57da6ecde62ad7709a992df341e8f7c6177b41e8b1ae4f6')
version('2.38.0', sha256='c1b1e326b5d1f45b0ce91edd7acc68e80ff6be6b470008766e4d466aafc9801f', deprecated=True)
# Language bindings
diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py
index 8c998b1863..f96325c88a 100644
--- a/var/spack/repos/builtin/packages/htslib/package.py
+++ b/var/spack/repos/builtin/packages/htslib/package.py
@@ -15,6 +15,7 @@ class Htslib(AutotoolsPackage):
version('1.14', sha256='ed221b8f52f4812f810eebe0cc56cd8355a5c9d21c62d142ac05ad0da147935f')
version('1.13', sha256='f2407df9f97f0bb6b07656579e41a1ca5100464067b6b21bf962a2ea4b0efd65')
version('1.12', sha256='2280141b46e953ba4ae01b98335a84f8e6ccbdb6d5cdbab7f70ee4f7e3b6f4ca')
+ version('1.11', sha256='cffadd9baa6fce27b8fe0b01a462b489f06a5433dfe92121f667f40f632538d7')
version('1.10.2', sha256='e3b543de2f71723830a1e0472cf5489ec27d0fbeb46b1103e14a11b7177d1939')
version('1.9', sha256='e04b877057e8b3b8425d957f057b42f0e8509173621d3eccaedd0da607d9929a')
version('1.8', sha256='c0ef1eec954a98cc708e9f99f6037db85db45670b52b6ab37abcc89b6c057ca1')
diff --git a/var/spack/repos/builtin/packages/kokkos-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-legacy/package.py
index 48e70e4a99..7fd132e79c 100644
--- a/var/spack/repos/builtin/packages/kokkos-legacy/package.py
+++ b/var/spack/repos/builtin/packages/kokkos-legacy/package.py
@@ -17,7 +17,8 @@ class KokkosLegacy(Package):
version('2.9.00', sha256='e0621197791ed3a381b4f02c78fa529f3cff3abb74d52157b4add17e8aa04bc4', deprecated=True)
version('2.8.00', sha256='1c72661f2d770517bff98837001b42b9c677d1df29f7493a1d7c008549aff630', deprecated=True)
version('2.7.24', sha256='a308a80ea1488f4c18884b828ce7ae9f5210b9a6b2f61b208d875084d8da8cb0', deprecated=True)
- version('2.7.00', sha256='01595996e612ef7410aa42fa265a23101cfe1b6993fa9810ca844db5c89ad765', deprecated=True)
+ version('2.7.00', sha256='01595996e612ef7410aa42fa265a23101cfe1b6993fa9810ca844db5c89ad765', deprecated=True)
+ version('2.6.00', sha256='ab3c6b49cf0cfa2173eaf0c50acd2827fdc0ce260e9b46d5cb8be35261092486', deprecated=True)
version('2.5.00', sha256='ea232594bf746abb99ae2aafaeef5d07adc089968010a62a88aaa892106d9476', deprecated=True)
version('2.04.11', sha256='f2680aee0169f6cbbec38410f9c80bf8a160435f6a07769c1e9112da8b9349a0', deprecated=True)
version('2.04.04', sha256='5bac8ddc2fac9bc6e01dd40f92ca6cbbb346a25deca5be2fec71acf712d0d0c7', deprecated=True)
diff --git a/var/spack/repos/builtin/packages/latte/package.py b/var/spack/repos/builtin/packages/latte/package.py
index 6bda084045..b1201a56ef 100644
--- a/var/spack/repos/builtin/packages/latte/package.py
+++ b/var/spack/repos/builtin/packages/latte/package.py
@@ -19,6 +19,7 @@ class Latte(CMakePackage):
version('master', branch='master')
version('1.2.2', sha256='ab1346939dbd70ffd89c5e5bf8d24946cb3655dc25b203bec7fc59c6c63e4c79')
version('1.2.1', sha256='a21dda5ebdcefa56e9ff7296d74ef03f89c200d2e110a02af7a84612668bf702')
+ version('1.0.1', sha256='67b2957639ad8e36b69bc6ea9a13085183a881562af9ca6d2b90b412ff073789')
variant('mpi', default=True,
description='Build with mpi')
diff --git a/var/spack/repos/builtin/packages/macsio/package.py b/var/spack/repos/builtin/packages/macsio/package.py
index 427af43feb..af3142e103 100644
--- a/var/spack/repos/builtin/packages/macsio/package.py
+++ b/var/spack/repos/builtin/packages/macsio/package.py
@@ -18,6 +18,7 @@ class Macsio(CMakePackage):
version('develop', branch='master')
version('1.1', sha256='a86249b0f10647c0b631773db69568388094605ec1a0af149d9e61e95e6961ec')
+ version('1.0', sha256='1dd0df28f9f31510329d5874c1519c745b5c6bec12e102cea3e9f4b05e5d3072')
variant('mpi', default=True, description="Build MPI plugin")
variant('silo', default=True, description="Build with SILO plugin")
diff --git a/var/spack/repos/builtin/packages/mpt/package.py b/var/spack/repos/builtin/packages/mpt/package.py
index 9cef2ae05d..37dc0bdbee 100644
--- a/var/spack/repos/builtin/packages/mpt/package.py
+++ b/var/spack/repos/builtin/packages/mpt/package.py
@@ -6,7 +6,7 @@
from spack import *
-class Mpt(Package):
+class Mpt(BundlePackage):
"""HPE MPI is HPE's implementation of
the Message Passing Interface (MPI) standard.
@@ -17,15 +17,13 @@ class Mpt(Package):
homepage = "https://buy.hpe.com/us/en/software/high-performance-computing-software/hpe-message-passing-interface-mpi/p/1010144155"
+ # https://support.hpe.com/hpesc/public/swd/detail?swItemId=MTX-4b90e0f8e3224ce3bc3644d6ad
+ version('1.4')
+
provides('mpi')
provides('mpi@:3.1', when='@3:')
provides('mpi@:1.3', when='@1:')
- filter_compiler_wrappers(
- 'mpicc', 'mpicxx', 'mpif77', 'mpif90', 'mpif08',
- relative_root='bin'
- )
-
@property
def libs(self):
query_parameters = self.spec.last_query.extra_parameters
@@ -65,20 +63,3 @@ class Mpt(Package):
self.spec.mpicxx = self.prefix.bin.mpicxx
self.spec.mpifc = self.prefix.bin.mpif90
self.spec.mpif77 = self.prefix.bin.mpif77
-
- @property
- def fetcher(self):
- msg = """This package is a placeholder for HPE MPI, a
- system-provided, proprietary MPI implementation.
-
- Add to your packages.yaml (changing the /opt/ path to match
- where HPE MPI is actually installed):
-
- packages:
- mpt:
- buildable: False
- externals:
- - spec: mpt@2.20
- prefix: /opt
- """
- raise InstallError(msg)
diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
index 5f6dc6a859..bc6df87cc4 100644
--- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py
@@ -59,15 +59,9 @@ class OpenspeedshopUtils(CMakePackage):
variant('mvapich2', default=False,
description="Build mpi collector for mvapich2\
MPI when variant is enabled.")
- variant('mvapich', default=False,
- description="Build mpi collector for mvapich\
- MPI when variant is enabled.")
variant('mpich2', default=False,
description="Build mpi collector for mpich2\
MPI when variant is enabled.")
- variant('mpich', default=False,
- description="Build mpi collector for mpich\
- MPI when variant is enabled.")
depends_on("cmake@3.0.2:", type='build')
@@ -88,7 +82,7 @@ class OpenspeedshopUtils(CMakePackage):
# For boost
depends_on("boost@1.66.0:1.69.0")
- depends_on("dyninst@develop", when='@develop')
+ depends_on("dyninst@master", when='@develop')
depends_on("dyninst@10:", when='@2.4.0:9999')
depends_on("python@2.7.14:2.7", type=('build', 'run'))
@@ -105,18 +99,12 @@ class OpenspeedshopUtils(CMakePackage):
depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+crayfe', when='@2.4.0:9999+crayfe', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@develop+mpich', when='@develop+mpich', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@1.9.3:9999+mpich', when='@2.4.0:9999+mpich', type=('build', 'link', 'run'))
-
depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpich2', when='@2.4.0:9999+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpt', when='@develop+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpt', when='@2.4.0:9999+mpt', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@1.9.3:9999+mvapich', when='@2.4.0:9999+mvapich', type=('build', 'link', 'run'))
-
depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mvapich2', when='@2.4.0:9999+mvapich2', type=('build', 'link', 'run'))
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index a123bdfcd6..387840c60f 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -55,15 +55,9 @@ class Openspeedshop(CMakePackage):
variant('mvapich2', default=False,
description="Build mpi collector for mvapich2\
MPI when variant is enabled.")
- variant('mvapich', default=False,
- description="Build mpi collector for mvapich\
- MPI when variant is enabled.")
variant('mpich2', default=False,
description="Build mpi collector for mpich2\
MPI when variant is enabled.")
- variant('mpich', default=False,
- description="Build mpi collector for mpich\
- MPI when variant is enabled.")
depends_on("cmake@3.0.2:", type='build')
@@ -84,7 +78,7 @@ class Openspeedshop(CMakePackage):
# For boost
depends_on("boost@1.70.0:")
- depends_on("dyninst@develop", when='@develop')
+ depends_on("dyninst@master", when='@develop')
depends_on("dyninst@10:", when='@2.4.0:9999')
depends_on("python@2.7.14:2.7", type=('build', 'run'))
@@ -103,18 +97,12 @@ class Openspeedshop(CMakePackage):
depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+crayfe', when='@2.4.0:9999+crayfe', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@develop+mpich', when='@develop+mpich', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@1.9.3:9999+mpich', when='@2.4.0:9999+mpich', type=('build', 'link', 'run'))
-
depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpich2', when='@2.4.0:9999+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpt', when='@develop+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpt', when='@2.4.0:9999+mpt', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich', type=('build', 'link', 'run'))
- depends_on('cbtf-krell@1.9.3:9999+mvapich', when='@2.4.0:9999+mvapich', type=('build', 'link', 'run'))
-
depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mvapich2', when='@2.4.0:9999+mvapich2', type=('build', 'link', 'run'))
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 8c60a31675..fe0323de0e 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -210,7 +210,6 @@ class Petsc(Package, CudaPackage, ROCmPackage):
# Virtual dependencies
# Git repository needs sowing to build Fortran interface
depends_on('sowing', when='@main')
- depends_on('sowing@1.1.23-p1', when='@xsdk-0.2.0')
# PETSc, hypre, superlu_dist when built with int64 use 32 bit integers
# with BLAS/LAPACK
@@ -271,8 +270,6 @@ class Petsc(Package, CudaPackage, ROCmPackage):
depends_on('hypre@2.14:2.22.0+mpi~internal-superlu+int64', when='@3.14:3.15+hypre+mpi~complex+int64')
depends_on('hypre@2.14:+mpi~internal-superlu~int64', when='@3.16:+hypre+mpi~complex~int64')
depends_on('hypre@2.14:+mpi~internal-superlu+int64', when='@3.16:+hypre+mpi~complex+int64')
- depends_on('hypre@xsdk-0.2.0+mpi~internal-superlu+int64', when='@xsdk-0.2.0+hypre+mpi~complex+int64')
- depends_on('hypre@xsdk-0.2.0+mpi~internal-superlu~int64', when='@xsdk-0.2.0+hypre+mpi~complex~int64')
depends_on('hypre@develop+mpi~internal-superlu+int64', when='@main+hypre+mpi~complex+int64')
depends_on('hypre@develop+mpi~internal-superlu~int64', when='@main+hypre+mpi~complex~int64')
depends_on('superlu-dist@:4.3~int64', when='@3.4.4:3.6.4+superlu-dist+mpi~int64')
@@ -287,8 +284,6 @@ class Petsc(Package, CudaPackage, ROCmPackage):
depends_on('superlu-dist@6.1.0:6.1+int64', when='@3.10.3:3.12+superlu-dist+mpi+int64')
depends_on('superlu-dist@6.1:~int64', when='@3.13.0:+superlu-dist+mpi~int64')
depends_on('superlu-dist@6.1:+int64', when='@3.13.0:+superlu-dist+mpi+int64')
- depends_on('superlu-dist@xsdk-0.2.0~int64', when='@xsdk-0.2.0+superlu-dist+mpi~int64')
- depends_on('superlu-dist@xsdk-0.2.0+int64', when='@xsdk-0.2.0+superlu-dist+mpi+int64')
depends_on('superlu-dist@develop~int64', when='@main+superlu-dist+mpi~int64')
depends_on('superlu-dist@develop+int64', when='@main+superlu-dist+mpi+int64')
depends_on('strumpack', when='+strumpack')
@@ -301,7 +296,6 @@ class Petsc(Package, CudaPackage, ROCmPackage):
depends_on('mumps+mpi~int64+metis+parmetis+openmp', when='+mumps+metis+openmp')
depends_on('scalapack', when='+mumps')
depends_on('trilinos@12.6.2:+mpi', when='@3.7.0:+trilinos+mpi')
- depends_on('trilinos@xsdk-0.2.0+mpi', when='@xsdk-0.2.0+trilinos+mpi')
depends_on('trilinos@develop+mpi', when='@main+trilinos+mpi')
depends_on('mkl', when='+mkl-pardiso')
depends_on('fftw+mpi', when='+fftw+mpi')
diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py
index 37169ea232..ef941b0a43 100644
--- a/var/spack/repos/builtin/packages/pexsi/package.py
+++ b/var/spack/repos/builtin/packages/pexsi/package.py
@@ -28,12 +28,9 @@ class Pexsi(MakefilePackage):
# version('1.0', sha256='1574c66fd69ff2a37c6250d65c4df43b57c79822b49bd65662582a0cd5d82f54')
version('0.10.2', sha256='8714c71b76542e096211b537a9cb1ffb2c28f53eea4f5a92f94cc1ca1e7b499f')
- version('0.9.2', sha256='9dc0fb66fc52c2b68e8fe485bbf4354ab0d9a548a4eaf7211eb4174c51bcf1de')
version('0.9.0', sha256='e5efe0c129013392cdac3234e37f1f4fea641c139b1fbea47618b4b839d05029')
depends_on('parmetis')
- depends_on('superlu-dist@3.3:3', when='@:0.9.0')
- depends_on('superlu-dist@4.3:4', when='@0.9.2')
depends_on('superlu-dist@5.1.2:5.3', when='@0.10.2:')
variant(
diff --git a/var/spack/repos/builtin/packages/py-apache-beam/package.py b/var/spack/repos/builtin/packages/py-apache-beam/package.py
index 5878eeadec..072003bf50 100644
--- a/var/spack/repos/builtin/packages/py-apache-beam/package.py
+++ b/var/spack/repos/builtin/packages/py-apache-beam/package.py
@@ -14,30 +14,34 @@ class PyApacheBeam(PythonPackage):
version('2.24.0', sha256='55c50b1a964bacc840a5e4cc3b4a42c4ef09d12192d215ba3cad65d4d22e09dd')
- depends_on('python@3:', type=('build', 'run'))
+ depends_on('python@2.7,3.5:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
- depends_on('py-pip@7.0.0:', type=('build', 'run'))
- depends_on('py-cython@0.28.1:', type=('build', 'run'))
- depends_on('py-avro-python3@1.8.1:1.10.0', type=('build', 'run'), when='^python@3.0:')
- depends_on('py-crcmod@1.7:', type=('build', 'run'))
- depends_on('py-dill@0.3.1:0.3.2', type=('build', 'run'))
- depends_on('py-fastavro@0.21.4:0.24', type=('build', 'run'))
- depends_on('py-funcsigs@1.0.2:2', type=('build', 'run'), when='^python@:2.9')
- depends_on('py-future@0.18.2:1.0.0', type=('build', 'run'))
- depends_on('py-futures@3.2.0:4.0.0', type=('build', 'run'), when='^python@:2.9')
- depends_on('py-grpcio@1.29.0:2', type=('build', 'run'))
- depends_on('py-hdfs@2.1.0:3.0.0', type=('build', 'run'))
- depends_on('py-httplib2@0.8:0.18.0', type=('build', 'run'))
- depends_on('py-mock@1.0.1:3.0.0', type=('build', 'run'))
- depends_on('py-numpy@1.14.3:2', type=('build', 'run'))
- depends_on('py-pymongo@3.8.0:4.0.0', type=('build', 'run'))
- depends_on('py-oauth2client@2.0.1:4', type=('build', 'run'))
- depends_on('py-protobuf@3.12.2:4', type=('build', 'run'))
- depends_on('py-pyarrow@0.15.1:0.18.0', type=('build', 'run'), when='^python@3.0:')
- depends_on('py-pydot@1.2.0:2', type=('build', 'run'))
- depends_on('py-python-dateutil@2.8.0:3', type=('build', 'run'))
+ depends_on('py-pip@7.0.0:', type='build')
+ depends_on('py-cython@0.28.1:', type='build')
+ depends_on('py-avro@1.8.1:1.9', type=('build', 'run'), when='^python@:2')
+ depends_on('py-avro-python3@1.8.1:1.9.1,1.9.3:1.9', type=('build', 'run'), when='^python@3:')
+ depends_on('py-crcmod@1.7:1', type=('build', 'run'))
+ depends_on('py-dill@0.3.1.1:0.3.1', type=('build', 'run'))
+ depends_on('py-fastavro@0.21.4:0.23', type=('build', 'run'))
+ depends_on('py-funcsigs@1.0.2:1', type=('build', 'run'), when='^python@:2')
+ depends_on('py-future@0.18.2:0', type=('build', 'run'))
+ depends_on('py-futures@3.2:3', type=('build', 'run'), when='^python@:2')
+ depends_on('py-grpcio@1.29:1', type=('build', 'run'))
+ depends_on('py-hdfs@2.1:2', type=('build', 'run'))
+ depends_on('py-httplib2@0.8:0.17', type=('build', 'run'))
+ depends_on('py-mock@1.0.1:2', type=('build', 'run'))
+ depends_on('py-numpy@1.14.3:1', type=('build', 'run'))
+ depends_on('py-pymongo@3.8:3', type=('build', 'run'))
+ depends_on('py-oauth2client@2.0.1:3', type=('build', 'run'))
+ depends_on('py-protobuf@3.12.2:3', type=('build', 'run'))
+ depends_on('py-pyarrow@0.15.1:0.17', type=('build', 'run'), when='platform=cray')
+ depends_on('py-pyarrow@0.15.1:0.17', type=('build', 'run'), when='platform=darwin')
+ depends_on('py-pyarrow@0.15.1:0.17', type=('build', 'run'), when='platform=linux')
+ depends_on('py-pyarrow@0.15.1:0.17', type=('build', 'run'), when='platform=windows ^python@3:')
+ depends_on('py-pydot@1.2.0:1', type=('build', 'run'))
+ depends_on('py-python-dateutil@2.8:2', type=('build', 'run'))
depends_on('py-pytz@2018.3:', type=('build', 'run'))
- depends_on('py-pyvcf@0.6.8:0.7.0', type=('build', 'run'), when='^python@:2.9')
- depends_on('py-requests@2.24.0:3.0.0', type=('build', 'run'))
- depends_on('py-typing@3.7.0:3.8.0', type=('build', 'run'), when='^python@:3.5')
- depends_on('py-typing-extensions@3.7.0:3.8.0', type=('build', 'run'))
+ depends_on('py-pyvcf@0.6.8:0.6', type=('build', 'run'), when='^python@:2')
+ depends_on('py-requests@2.24:2', type=('build', 'run'))
+ depends_on('py-typing@3.7.0:3.7', type=('build', 'run'), when='^python@:3.5.2')
+ depends_on('py-typing-extensions@3.7.0:3.7', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py
index 9d691f0783..c54000afc4 100644
--- a/var/spack/repos/builtin/packages/py-astroid/package.py
+++ b/var/spack/repos/builtin/packages/py-astroid/package.py
@@ -49,7 +49,7 @@ class PyAstroid(PythonPackage):
depends_on('py-enum34@1.1.3:', when='^python@:3.3', type=('build', 'run'))
depends_on('py-singledispatch', when='^python@:3.3', type=('build', 'run'))
depends_on('py-backports-functools-lru-cache', when='^python@:3.2', type=('build', 'run'))
- depends_on('py-typed-ast@1.3.0:1.3', when='@2.2.5:2.3.0 ^python@3.7.0:3.7')
+ depends_on('py-typed-ast@1.3.0:', when='@2.2.5:2.3.0 ^python@3.7.0:3.7')
depends_on('py-typed-ast@1.4.0:1.4', when='@2.3.1: ^python@:3.7', type=('build', 'run'))
depends_on('py-typing-extensions@3.7.4:', when='@2.7.3: ^python@:3.7', type=('build', 'run'))
depends_on('py-typing-extensions@3.10:', when='@2.8.3: ^python@:3.9', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-avro-python3/package.py b/var/spack/repos/builtin/packages/py-avro-python3/package.py
index 224bcec05e..77707047ff 100644
--- a/var/spack/repos/builtin/packages/py-avro-python3/package.py
+++ b/var/spack/repos/builtin/packages/py-avro-python3/package.py
@@ -15,6 +15,10 @@ class PyAvroPython3(PythonPackage):
pypi = "avro-python3/avro-python3-1.10.0.tar.gz"
version('1.10.0', sha256='a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05')
+ version('1.9.1', sha256='daab2cea71b942a1eb57d700d4a729e9d6cd93284d4dd4d65a378b9f958aa0d2')
- depends_on('python@2.7,3.0:', type=('build', 'run'))
+ depends_on('python@3.5:', when='@1.10:', type=('build', 'run'))
+ depends_on('python@3.4:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
+ depends_on('py-isort', when='@1.10:', type='build')
+ depends_on('py-pycodestyle', when='@1.10:', type='build')
diff --git a/var/spack/repos/builtin/packages/py-certifi/package.py b/var/spack/repos/builtin/packages/py-certifi/package.py
index b7efd601e2..a4ee0241f3 100644
--- a/var/spack/repos/builtin/packages/py-certifi/package.py
+++ b/var/spack/repos/builtin/packages/py-certifi/package.py
@@ -16,6 +16,7 @@ class PyCertifi(PythonPackage):
version('2021.10.8', sha256='78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872')
version('2020.6.20', sha256='5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3')
+ version('2020.4.5.1', sha256='51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519')
version('2019.9.11', sha256='e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50')
version('2019.6.16', sha256='945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695')
version('2019.3.9', sha256='b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae')
diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py
index 1bdf4fb282..9a5596e02e 100644
--- a/var/spack/repos/builtin/packages/py-csvkit/package.py
+++ b/var/spack/repos/builtin/packages/py-csvkit/package.py
@@ -25,8 +25,13 @@ class PyCsvkit(PythonPackage):
depends_on('py-dbf@0.94.003', type=('build', 'run'), when='@0.9.1')
depends_on('py-xlrd@0.7.1:', type=('build', 'run'), when='@0.9.1')
depends_on('py-sqlalchemy@0.6.6:', type=('build', 'run'), when='@0.9.1')
- depends_on('py-openpyxl@2.2.0-b1', type=('build', 'run'), when='@0.9.1')
+ depends_on('py-openpyxl@2.2.0', type=('build', 'run'), when='@0.9.1')
depends_on('py-agate@1.6.1:', type=('build', 'run'), when='@1:')
depends_on('py-agate-excel@0.2.2:', type=('build', 'run'), when='@1:')
depends_on('py-agate-dbf@0.2.0:', type=('build', 'run'), when='@1:')
depends_on('py-agate-sql@0.5.3:', type=('build', 'run'), when='@1:')
+
+ @when('@0.9.1')
+ def patch(self):
+ # Non-existent version requirement
+ filter_file('2.2.0-b1', '2.2.0', 'setup.py', string=True)
diff --git a/var/spack/repos/builtin/packages/py-cyordereddict/package.py b/var/spack/repos/builtin/packages/py-cyordereddict/package.py
index ec5fd981dc..a0385c0019 100644
--- a/var/spack/repos/builtin/packages/py-cyordereddict/package.py
+++ b/var/spack/repos/builtin/packages/py-cyordereddict/package.py
@@ -12,4 +12,6 @@ class PyCyordereddict(PythonPackage):
homepage = "https://github.com/shoyer/cyordereddict"
pypi = "cyordereddict/cyordereddict-1.0.0.tar.gz"
+
version('1.0.0', sha256='d9b2c31796999770801a9a49403b8cb49510ecb64e5d1e9d4763ed44f2d5a76e')
+ version('0.2.2', sha256='f8387caaffba695d704311842291ede696080a5ed306f07f1825de126fb7f1ec')
diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py
index 0628fa762b..ee8d8f457a 100644
--- a/var/spack/repos/builtin/packages/py-enum34/package.py
+++ b/var/spack/repos/builtin/packages/py-enum34/package.py
@@ -12,6 +12,7 @@ class PyEnum34(PythonPackage):
homepage = "https://bitbucket.org/stoneleaf/enum34/src"
pypi = "enum34/enum34-1.1.6.tar.gz"
+ version('1.1.10', sha256='cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248')
version('1.1.6', sha256='8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1')
# enum34 is a backport of the enum library from Python 3.4. It is not
diff --git a/var/spack/repos/builtin/packages/py-ftfy/package.py b/var/spack/repos/builtin/packages/py-ftfy/package.py
index c9c7ff07d0..11a29e0b41 100644
--- a/var/spack/repos/builtin/packages/py-ftfy/package.py
+++ b/var/spack/repos/builtin/packages/py-ftfy/package.py
@@ -15,8 +15,10 @@ class PyFtfy(PythonPackage):
version('6.0.3', sha256='ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b')
version('5.8', sha256='51c7767f8c4b47d291fcef30b9625fb5341c06a31e6a3b627039c706c42f3720')
+ version('4.4.3', sha256='3c0066db64a98436e751e56414f03f1cdea54f29364c0632c141c36cca6a5d94')
- depends_on('python@3.5:', type=('build', 'run'))
- depends_on('python@3.6:', type=('build', 'run'), when='@6.0.3:')
+ depends_on('python@3.6:', type=('build', 'run'), when='@6:')
+ depends_on('python@3.5:', type=('build', 'run'), when='@5:')
depends_on('py-setuptools', type='build')
+ depends_on('py-html5lib', when='@:4', type=('build', 'run'))
depends_on('py-wcwidth', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-google-auth/package.py b/var/spack/repos/builtin/packages/py-google-auth/package.py
index a465b3f872..5b3d70a84d 100644
--- a/var/spack/repos/builtin/packages/py-google-auth/package.py
+++ b/var/spack/repos/builtin/packages/py-google-auth/package.py
@@ -20,7 +20,7 @@ class PyGoogleAuth(PythonPackage):
depends_on('python@3.6:', type=('build', 'run'), when='@1.35:')
depends_on('python@2.7:2.8,3.6:', type=('build', 'run'), when='@1.24:')
depends_on('py-setuptools', type='build')
- depends_on('py-setuptools@40.3.0', type='build', when='@2.3.2:')
+ depends_on('py-setuptools@40.3.0:', type='build', when='@2.3.2:')
depends_on('py-pyasn1-modules@0.2.1:', type=('build', 'run'))
depends_on('py-rsa@3.1.4:', type=('build', 'run'))
depends_on('py-rsa@3.1.4:4', type=('build', 'run'), when='@2.3.2 ^python@3.6:')
diff --git a/var/spack/repos/builtin/packages/py-guidata/package.py b/var/spack/repos/builtin/packages/py-guidata/package.py
index e5d76a7c03..926686e353 100644
--- a/var/spack/repos/builtin/packages/py-guidata/package.py
+++ b/var/spack/repos/builtin/packages/py-guidata/package.py
@@ -15,7 +15,8 @@ class PyGuidata(PythonPackage):
version('1.7.5', sha256='531d5e9ea784120c2e14212cfbd9c63f78fc7a77bcb9c5497be984584ee455c0')
+ # See `doc/installation.rst`
+ depends_on('python@2.6:2,3.2:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
- depends_on('py-pyqt4', type=('build', 'run'))
- depends_on('py-spyder@2.0:2.9.9', type=('build', 'run'))
- depends_on('py-h5py', type=('build', 'run'))
+ depends_on('py-pyqt5@5.5:', type=('build', 'run'))
+ depends_on('py-spyder@2.0.10:', type=('build', 'run')) # TODO: spyderlib == spyder?
diff --git a/var/spack/repos/builtin/packages/py-importlib/package.py b/var/spack/repos/builtin/packages/py-importlib/package.py
index 27040a7aaa..5883bd20b2 100644
--- a/var/spack/repos/builtin/packages/py-importlib/package.py
+++ b/var/spack/repos/builtin/packages/py-importlib/package.py
@@ -13,5 +13,3 @@ class PyImportlib(PythonPackage):
pypi = "importlib/importlib-1.0.4.zip"
version('1.0.4', sha256='b6ee7066fea66e35f8d0acee24d98006de1a0a8a94a8ce6efe73a9a23c8d9826')
-
- depends_on('python@:2.6,3.0.0:3.0', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-intervaltree/package.py b/var/spack/repos/builtin/packages/py-intervaltree/package.py
index 6d11b01b3c..c4c6e25789 100644
--- a/var/spack/repos/builtin/packages/py-intervaltree/package.py
+++ b/var/spack/repos/builtin/packages/py-intervaltree/package.py
@@ -13,6 +13,8 @@ class PyIntervaltree(PythonPackage):
url = "https://github.com/chaimleib/intervaltree/archive/3.0.2.tar.gz"
version('3.0.2', sha256='e8ab75b66077f2e5fb85ac56cb6df834689edb048d38601d53d8867cce3b77d1')
+ version('2.1.0', sha256='e444398cbc9582a51c372a344cc7e05d53c53daaac2aae827951ff88554b96ff')
- depends_on('py-sortedcontainers@2.0:2', type=('build', 'run'))
+ depends_on('py-sortedcontainers', type=('build', 'run'))
+ depends_on('py-sortedcontainers@2.0:2', when='@3:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-jedi/package.py b/var/spack/repos/builtin/packages/py-jedi/package.py
index 06c507d77c..3d33a9968d 100644
--- a/var/spack/repos/builtin/packages/py-jedi/package.py
+++ b/var/spack/repos/builtin/packages/py-jedi/package.py
@@ -40,8 +40,6 @@ class PyJedi(PythonPackage):
depends_on('python@2.7:2.8,3.5:', type=('build', 'run'), when='@0.17.2')
depends_on('python@3.6:', type=('build', 'run'), when='@0.18.0')
- depends_on('py-parso@0.1.0', type=('build', 'run'), when='@0.11.0')
- depends_on('py-parso@0.1.1', type=('build', 'run'), when='@0.11.1')
depends_on('py-parso@0.2.0:', type=('build', 'run'), when='@0.12.0')
depends_on('py-parso@0.3.0:', type=('build', 'run'), when='@0.12.1:0.14.0')
depends_on('py-parso@0.7.0:0.7', type=('build', 'run'), when='@0.17.2')
diff --git a/var/spack/repos/builtin/packages/py-mechanize/package.py b/var/spack/repos/builtin/packages/py-mechanize/package.py
index 544cd7ab1f..0e0cfbea62 100644
--- a/var/spack/repos/builtin/packages/py-mechanize/package.py
+++ b/var/spack/repos/builtin/packages/py-mechanize/package.py
@@ -16,5 +16,5 @@ class PyMechanize(PythonPackage):
version('0.2.5', sha256='2e67b20d107b30c00ad814891a095048c35d9d8cb9541801cebe85684cc84766')
depends_on('py-setuptools', type='build')
- depends_on('py-html5lib@099999:', type=('build', 'run'))
+ depends_on('py-html5lib@0.999999999:', when='@0.4:', type=('build', 'run'))
depends_on('python@2.7:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-mypy/package.py b/var/spack/repos/builtin/packages/py-mypy/package.py
index adcad33a2b..d375366d37 100644
--- a/var/spack/repos/builtin/packages/py-mypy/package.py
+++ b/var/spack/repos/builtin/packages/py-mypy/package.py
@@ -18,18 +18,23 @@ class PyMypy(PythonPackage):
version('0.800', sha256='e0202e37756ed09daf4b0ba64ad2c245d357659e014c3f51d8cd0681ba66940a')
version('0.790', sha256='2b21ba45ad9ef2e2eb88ce4aeadd0112d0f5026418324176fd494a6824b74975')
version('0.740', sha256='48c8bc99380575deb39f5d3400ebb6a8a1cb5cc669bbba4d3bb30f904e0a0e7d')
+ version('0.670', sha256='e80fd6af34614a0e898a57f14296d0dacb584648f0339c2e000ddbf0f4cc2f8d')
variant('python2', default=False, description='Enable checking of python 2 type annotations')
depends_on('python@3.6:', when='@0.920:', type=('build', 'run'))
- depends_on("python@3.5:", type=("build", "run"))
+ depends_on("python@3.5:", when='@0.700:', type=("build", "run"))
+ depends_on('python@3.4:', type=('build', 'run'))
depends_on('py-setuptools@40.6.2:', when='@0.790:', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-wheel@0.30:', when='@0.790:', type='build')
depends_on('py-typed-ast@1.4.0:1', when='@0.920: ^python@:3.7', type=('build', 'run'))
depends_on('py-typed-ast@1.4.0:1.4', when='@0.900:0.910 ^python@:3.7', type=('build', 'run'))
- depends_on('py-typed-ast@1.4.0:1.4', when='@:0.800', type=('build', 'run'))
- depends_on('py-typing-extensions@3.7.4:', type=('build', 'run'))
- depends_on('py-mypy-extensions@0.4.3:0.4', type=('build', 'run'))
+ depends_on('py-typed-ast@1.4.0:1.4', when='@0.700:0.899', type=('build', 'run'))
+ depends_on('py-typed-ast@1.3.1:1.3', when='@:0.699', type=('build', 'run'))
+ depends_on('py-typing-extensions@3.7.4:', when='@0.700:', type=('build', 'run'))
+ depends_on('py-typing@3.5.3:', when='@:0.699 ^python@:3.4', type=('build', 'run'))
+ depends_on('py-mypy-extensions@0.4.3:0.4', when='@0.700:', type=('build', 'run'))
+ depends_on('py-mypy-extensions@0.4.0:0.4', type=('build', 'run'))
depends_on('py-tomli@1.1:2', when='@0.920:', type=('build', 'run'))
depends_on('py-toml', when='@0.900:0.910', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-neo/package.py b/var/spack/repos/builtin/packages/py-neo/package.py
index 9e23395cef..e2f4e08443 100644
--- a/var/spack/repos/builtin/packages/py-neo/package.py
+++ b/var/spack/repos/builtin/packages/py-neo/package.py
@@ -17,7 +17,9 @@ class PyNeo(PythonPackage):
version('0.8.0', sha256='3382a37b24a384006238b72981f1e9259de9bfa71886f8ed564d35d254ace458')
version('0.5.2', sha256='1de436b7d5e72a5b4f1baa68bae5b790624a9ac44b2673811cb0b6ef554d3f8b')
version('0.4.1', sha256='a5a4f3aa31654d52789f679717c9fb622ad4f59b56d227dca490357b9de0a1ce')
+ version('0.3.3', sha256='6b80eb5bdc9eb4eca829f7464f861c5f1a3a6289559de037930d529bb3dddefb')
depends_on('py-setuptools', type='build')
- depends_on('py-numpy@1.7.1:', type=('build', 'run'))
+ depends_on('py-numpy@1.7.1:', when='@0.4:', type=('build', 'run'))
+ depends_on('py-numpy@1.3.0:', type=('build', 'run'))
depends_on('py-quantities@0.9.0:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-niworkflows/package.py b/var/spack/repos/builtin/packages/py-niworkflows/package.py
index e923c77b4d..650e07eaa2 100644
--- a/var/spack/repos/builtin/packages/py-niworkflows/package.py
+++ b/var/spack/repos/builtin/packages/py-niworkflows/package.py
@@ -41,7 +41,6 @@ class PyNiworkflows(PythonPackage):
depends_on('py-pybids@0.9.4:', type=('build', 'run'))
depends_on('py-pyyaml', type=('build', 'run'))
depends_on('py-scikit-image', type=('build', 'run'))
- depends_on('py-scikit-image@0.14.4', when='^python@:3.5', type=('build', 'run'))
depends_on('py-scikit-learn', when='@:1.3', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
depends_on('py-seaborn', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-oauth2client/package.py b/var/spack/repos/builtin/packages/py-oauth2client/package.py
index 1e64160d4c..a4e6fcc13c 100644
--- a/var/spack/repos/builtin/packages/py-oauth2client/package.py
+++ b/var/spack/repos/builtin/packages/py-oauth2client/package.py
@@ -17,8 +17,10 @@ class PyOauth2client(PythonPackage):
pypi = "oauth2client/oauth2client-4.1.3.tar.gz"
version('4.1.3', sha256='d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6')
+ version('3.0.0', sha256='5b5b056ec6f2304e7920b632885bd157fa71d1a7f3ddd00a43b1541a8d1a2460')
- depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
+ depends_on('python@2.7:2,3.4:', when='@4:', type=('build', 'run'))
+ depends_on('python@2.6:2,3.3:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
depends_on('py-httplib2@0.9.1:', type=('build', 'run'))
depends_on('py-pyasn1@0.1.7:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-openpyxl/package.py b/var/spack/repos/builtin/packages/py-openpyxl/package.py
index 67ba77c738..e96c7f5cda 100644
--- a/var/spack/repos/builtin/packages/py-openpyxl/package.py
+++ b/var/spack/repos/builtin/packages/py-openpyxl/package.py
@@ -14,13 +14,16 @@ class PyOpenpyxl(PythonPackage):
version('3.0.3', sha256='547a9fc6aafcf44abe358b89ed4438d077e9d92e4f182c87e2dc294186dc4b64')
version('2.4.5', sha256='78c331e819fb0a63a1339d452ba0b575d1a31f09fdcce793a31bec7e9ef4ef21')
+ version('2.2.0', sha256='c34e3f7e3106dbe6d792f35d9a2f01c08fdd21a6fe582a2f540e39a70e7443c4')
+ version('1.8.6', sha256='aa11a4acd2765392808bca2041f6f9ba17565c72dccc3f5d876bf78effa06126')
depends_on('python@3.6:', when='@3.0:', type=('build', 'run'))
depends_on('python@2.7:2.8,3.5:', when='@2.6:', type=('build', 'run'))
depends_on('python@2.7:2.8,3.4:', when='@2.5:', type=('build', 'run'))
depends_on('python@2.6:2.8,3.3:', when='@2.1:', type=('build', 'run'))
+ depends_on('python@2.6:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
- depends_on('py-jdcal', type=('build', 'run'))
- depends_on('py-et-xmlfile', type=('build', 'run'))
+ depends_on('py-jdcal', when='@2.2:', type=('build', 'run'))
+ depends_on('py-et-xmlfile', when='@2.4:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pyepsg/package.py b/var/spack/repos/builtin/packages/py-pyepsg/package.py
index 25f180d37c..cb958ec485 100644
--- a/var/spack/repos/builtin/packages/py-pyepsg/package.py
+++ b/var/spack/repos/builtin/packages/py-pyepsg/package.py
@@ -12,6 +12,7 @@ class PyPyepsg(PythonPackage):
homepage = "https://pyepsg.readthedocs.io/en/latest/"
pypi = "pyepsg/pyepsg-0.3.2.tar.gz"
+ version('0.4.0', sha256='2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7')
version('0.3.2', sha256='597ef8c0e8c1be3db8f68c5985bcfbbc32e22f087e93e81ceb03ff094898e059')
depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-pymol/package.py b/var/spack/repos/builtin/packages/py-pymol/package.py
index f62e0c76ab..66f28e8e5c 100644
--- a/var/spack/repos/builtin/packages/py-pymol/package.py
+++ b/var/spack/repos/builtin/packages/py-pymol/package.py
@@ -32,6 +32,10 @@ class PyPymol(PythonPackage):
depends_on('libxml2')
depends_on('py-pmw-patched', type=('build', 'run'))
depends_on('py-pyqt5', type=('build', 'run'))
+ depends_on('py-pmw', type=('build', 'run'))
+ depends_on('libmmtf-cpp', type=('build', 'run', 'link'))
+ depends_on('msgpack-c', type=('build', 'run'))
+ depends_on('libpng', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
def install_args(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/py-pysam/package.py b/var/spack/repos/builtin/packages/py-pysam/package.py
index a11b6fd5e7..82add0c37d 100644
--- a/var/spack/repos/builtin/packages/py-pysam/package.py
+++ b/var/spack/repos/builtin/packages/py-pysam/package.py
@@ -11,15 +11,17 @@ class PyPysam(PythonPackage):
sets."""
homepage = "https://github.com/pysam-developers/pysam"
- url = "https://github.com/pysam-developers/pysam/archive/v0.14.1.tar.gz"
+ pypi = "pysam/pysam-0.14.1.tar.gz"
- version('0.15.3', sha256='f553d48d0345404b6b103d0b82bad09c8d78420e1cc6bef33040553fc579e284')
- version('0.15.2', sha256='8cb3dd70f0d825086ac059ec2445ebd2ec5f14af73e7f1f4bd358966aaee5ed3')
- version('0.15.1', sha256='12221285af17e32b8f3fed033f90c6177a798afe41420eb5c3352d4e18ee12ed')
- version('0.14.1', sha256='d2bb40cd083c1357768e4683377f03471d160cfe8421136630bfa47f5adb3219')
+ version('0.15.3', sha256='a98dd0a164aa664b1ab30a36f653752f00e93c13deeb66868597f4b2a30f7265')
+ version('0.15.2', sha256='d049efd91ed5b1af515aa30280bc9cb46a92ddd15d546c9b21ee68a6ed4055d9')
+ version('0.15.1', sha256='658421124c2f3de1b7445e03ca8413df0077f67ea9980abdaab0d1b5f7a8936f')
+ version('0.14.1', sha256='2e86f5228429d08975c8adb9030296699012a8deba8ba26cbfc09b374f792c97')
+ version('0.7.7', sha256='c9f3018482eec99ee199dda3fdef2aa7424dde6574672a4c0d209a10985755cc')
depends_on('py-setuptools', type='build')
- depends_on('py-cython@0.21:', type='build')
+ depends_on('py-cython@0.21:', when='@0.14:', type='build')
+ depends_on('py-cython@0.17:', type='build')
depends_on('curl')
depends_on('bcftools')
depends_on('htslib')
diff --git a/var/spack/repos/builtin/packages/py-pyscf/package.py b/var/spack/repos/builtin/packages/py-pyscf/package.py
index 0afc825828..bd07301fdb 100644
--- a/var/spack/repos/builtin/packages/py-pyscf/package.py
+++ b/var/spack/repos/builtin/packages/py-pyscf/package.py
@@ -29,7 +29,6 @@ class PyPyscf(PythonPackage):
depends_on('libcint+coulomb_erf+f12')
depends_on('libxc')
depends_on('xcfun')
- depends_on('xcfun@2.0.0a2', when='@:1.7.4')
def setup_build_environment(self, env):
# Tell PSCF where supporting libraries are located."
diff --git a/var/spack/repos/builtin/packages/py-pysolar/package.py b/var/spack/repos/builtin/packages/py-pysolar/package.py
index 1f523c10aa..2f7e4a1964 100644
--- a/var/spack/repos/builtin/packages/py-pysolar/package.py
+++ b/var/spack/repos/builtin/packages/py-pysolar/package.py
@@ -15,6 +15,8 @@ class PyPysolar(PythonPackage):
pypi = "pysolar/pysolar-0.8.tar.gz"
version('0.8', sha256='548c05177acd2845143d9624e670635cd3e5c3a63782449ca35e090ca755c617')
+ version('0.6', sha256='961f43d6346b41451930c7892f144c19c6e0ecfbdda6980611c866a691b6127f',
+ url='https://files.pythonhosted.org/packages/source/p/pysolar/Pysolar-0.6.tar.gz')
depends_on('py-setuptools', type='build')
depends_on('python@3:', type=('build', 'run'), when='@0.8:')
diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py
index efa602ef4e..000aa481f7 100644
--- a/var/spack/repos/builtin/packages/py-pyspark/package.py
+++ b/var/spack/repos/builtin/packages/py-pyspark/package.py
@@ -14,6 +14,7 @@ class PyPyspark(PythonPackage):
version('3.0.1', sha256='38b485d3634a86c9a2923c39c8f08f003fdd0e0a3d7f07114b2fb4392ce60479')
version('2.4.4', sha256='13655eb113b8cf5f3f85b24fd92f86c4668a723723bd68949d028fa0df2cf694')
+ version('2.3.2', sha256='7fb3b4fe47edb0fb78cecec37e0f2a728590f17ef6a49eae55141a7a374c07c8')
version('2.3.0', sha256='0b3536910e154c36a94239f0ba0a201f476aadc72006409e5787198ffd01986e')
depends_on('python@2.7:3.7', when='@:2', type=('build', 'run'))
@@ -21,4 +22,5 @@ class PyPyspark(PythonPackage):
depends_on('py-setuptools', type='build')
depends_on('py-py4j@0.10.9', when='@3.0.1', type=('build', 'run'))
depends_on('py-py4j@0.10.7', when='@2.4.4', type=('build', 'run'))
+ depends_on('py-py4j@0.10.7', when='@2.3.2', type=('build', 'run'))
depends_on('py-py4j@0.10.6', when='@2.3.0', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-python-dateutil/package.py b/var/spack/repos/builtin/packages/py-python-dateutil/package.py
index 50e207dd8a..07f00fe023 100644
--- a/var/spack/repos/builtin/packages/py-python-dateutil/package.py
+++ b/var/spack/repos/builtin/packages/py-python-dateutil/package.py
@@ -20,8 +20,9 @@ class PyPythonDateutil(PythonPackage):
version('2.4.2', sha256='3e95445c1db500a344079a47b171c45ef18f57d188dffdb0e4165c71bea8eb3d')
version('2.4.0', sha256='439df33ce47ef1478a4f4765f3390eab0ed3ec4ae10be32f2930000c8d19f417')
version('2.2', sha256='eec865307ebe7f329a6a9945c15453265a449cdaaf3710340828a1934d53e468')
+ version('1.5', sha256='6f197348b46fb8cdf9f3fcfc2a7d5a97da95db3e2e8667cf657216274fe1b009')
depends_on('python@2.7:2.8,3.3:', when='@2.7.5:', type=('build', 'run'))
depends_on('py-setuptools@24.3:', type='build')
depends_on('py-setuptools-scm', type='build', when='@2.7.0:')
- depends_on('py-six@1.5:', type=('build', 'run'))
+ depends_on('py-six@1.5:', when='@2:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pyutilib/package.py b/var/spack/repos/builtin/packages/py-pyutilib/package.py
index 79318b3deb..1a7c4fd3da 100644
--- a/var/spack/repos/builtin/packages/py-pyutilib/package.py
+++ b/var/spack/repos/builtin/packages/py-pyutilib/package.py
@@ -17,6 +17,7 @@ class PyPyutilib(PythonPackage):
homepage = "https://github.com/PyUtilib/pyutilib"
url = "https://github.com/PyUtilib/pyutilib/archive/5.5.1.tar.gz"
+ version('6.0.0', sha256='b758419b42f9f512330644ebf05d54a1d3c5671268c344204e02f32713342de5')
version('5.6.2', sha256='3f9f500cf1f15a92e7eb0b3c3ca2af537a2a9e61fe70ad6be4d2d08d9e47764f')
version('5.6.1', sha256='0d0d57921877dc292dd9de39596fabc83b5d072adf10a90c979f678662ddb752')
version('5.6', sha256='ea1e263652d8199322759e169e4a40fc23964c49e82ae1470ab83a613a6e6b25')
@@ -28,5 +29,6 @@ class PyPyutilib(PythonPackage):
version('5.3.4', sha256='475c97bf1213add6b7fefaa3f05affef3613e6aecc9fcb3cc0693304671b73c3')
version('5.3.3', sha256='318f4d60c9552493fe81a4b2e0418d2cf43aaab68e6d23e2c9a68ef010c9cf21')
+ depends_on('python@2.7:2,3.4:', type=('build', 'run'))
depends_on('py-nose', type=('build', 'run'))
depends_on('py-six', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pyvcf/package.py b/var/spack/repos/builtin/packages/py-pyvcf/package.py
index 9285fc84eb..266a6b69e1 100644
--- a/var/spack/repos/builtin/packages/py-pyvcf/package.py
+++ b/var/spack/repos/builtin/packages/py-pyvcf/package.py
@@ -10,8 +10,13 @@ class PyPyvcf(PythonPackage):
"""A Variant Call Format reader for Python"""
homepage = "https://pyvcf.readthedocs.org/en/latest/index.html"
- url = "https://github.com/jamescasbon/PyVCF/archive/v0.6.0.tar.gz"
+ pypi = "PyVCF/PyVCF-0.6.0.tar.gz"
- version('0.6.0', sha256='a360376d445e27b74db3216f6931a94a4ea99aa4a7f4b4a8347e7f11836698b9')
+ version('0.6.8', sha256='e9d872513d179d229ab61da47a33f42726e9613784d1cb2bac3f8e2642f6f9d9')
+ version('0.6.0', sha256='d9ec3bbedb64fa35c2648a9c41fdefaedd3912ff597a436e073d27aeccf5de7c')
depends_on('py-setuptools', type='build')
+ depends_on('py-argparse', when='^python@:2.6', type=('build', 'run'))
+ depends_on('py-counter', when='^python@:2.6', type=('build', 'run'))
+ depends_on('py-ordereddict', when='^python@:2.6', type=('build', 'run'))
+ depends_on('py-unittest2', when='^python@:2.6', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py
index b68af04549..f182633266 100644
--- a/var/spack/repos/builtin/packages/py-pyyaml/package.py
+++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py
@@ -17,6 +17,7 @@ class PyPyyaml(PythonPackage):
version('6.0', sha256='68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2')
version('5.3.1', sha256='b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d')
+ version('5.2', sha256='c0ee8eca2c582d29c3c2ec6e2c4f703d1b7f1fb10bc72317355a746057e7346c')
version('5.1.2', sha256='01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4')
version('5.1', sha256='436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95')
version('3.13', sha256='3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf')
diff --git a/var/spack/repos/builtin/packages/py-requests-futures/package.py b/var/spack/repos/builtin/packages/py-requests-futures/package.py
index dd69b2ff03..6e1c258f6a 100644
--- a/var/spack/repos/builtin/packages/py-requests-futures/package.py
+++ b/var/spack/repos/builtin/packages/py-requests-futures/package.py
@@ -13,6 +13,7 @@ class PyRequestsFutures(PythonPackage):
pypi = "requests-futures/requests-futures-1.0.0.tar.gz"
version('1.0.0', sha256='35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148')
+ version('0.9.7', sha256='a9ca2c3480b6fac29ec5de59c146742e2ab2b60f8c68581766094edb52ea7bad')
depends_on('py-setuptools@38.6.1:', type='build')
depends_on('py-futures@2.1.3:', type=('build', 'run'), when='^python@:3.1')
diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py
index 374926c3f9..04978df737 100644
--- a/var/spack/repos/builtin/packages/py-requests/package.py
+++ b/var/spack/repos/builtin/packages/py-requests/package.py
@@ -18,6 +18,7 @@ class PyRequests(PythonPackage):
version('2.23.0', sha256='b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6')
version('2.22.0', sha256='11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4')
version('2.21.0', sha256='502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e')
+ version('2.18.4', sha256='9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e')
version('2.14.2', sha256='a274abba399a23e8713ffd2b5706535ae280ebe2b8069ee6a941cb089440d153')
version('2.13.0', sha256='5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8')
version('2.11.1', sha256='5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133')
diff --git a/var/spack/repos/builtin/packages/py-simplejson/package.py b/var/spack/repos/builtin/packages/py-simplejson/package.py
index cb14c92329..6cb840eb9a 100644
--- a/var/spack/repos/builtin/packages/py-simplejson/package.py
+++ b/var/spack/repos/builtin/packages/py-simplejson/package.py
@@ -21,6 +21,7 @@ class PySimplejson(PythonPackage):
version('3.8.2', sha256='d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495cdd47f')
version('3.8.1', sha256='428ac8f3219c78fb04ce05895d5dff9bd813c05a9a7922c53dc879cd32a12493')
version('3.8.0', sha256='217e4797da3a9a4a9fbe6722e0db98070b8443a88212d7acdbd241a7668141d9')
+ version('3.3.0', sha256='7a8a6bd82e111976aeb06138316ab10847adf612925072eaff8512228bcf9a1f')
depends_on('python@2.5:2.8,3.3:', type=('build', 'run'), when='@3.16.0:')
depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py
index afbbd7fa77..ff611f5d8a 100644
--- a/var/spack/repos/builtin/packages/py-slepc4py/package.py
+++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py
@@ -46,7 +46,6 @@ class PySlepc4py(PythonPackage):
depends_on('py-petsc4py@3.9.0:3.9', when='@3.9.0:3.9', type=('build', 'run'))
depends_on('py-petsc4py@3.8.0:3.8', when='@3.8.0:3.8', type=('build', 'run'))
depends_on('py-petsc4py@3.7.0:3.7', when='@3.7.0:3.7', type=('build', 'run'))
- depends_on('py-petsc4py@3.6.0:3.6', when='@3.6.0:3.6', type=('build', 'run'))
depends_on('slepc')
depends_on('slepc@3.16.0:3.16', when='@3.16.0:3.16')
@@ -58,7 +57,6 @@ class PySlepc4py(PythonPackage):
depends_on('slepc@3.9.0:3.9', when='@3.9.0:3.9')
depends_on('slepc@3.8.0:3.8', when='@3.8.0:3.8')
depends_on('slepc@3.7.0:3.7', when='@3.7.0:3.7')
- depends_on('slepc@3.6.0:3.6', when='@3.6.0:3.6')
@property
def build_directory(self):
diff --git a/var/spack/repos/builtin/packages/py-tabulate/package.py b/var/spack/repos/builtin/packages/py-tabulate/package.py
index f135b84a5b..e4adacb2f3 100644
--- a/var/spack/repos/builtin/packages/py-tabulate/package.py
+++ b/var/spack/repos/builtin/packages/py-tabulate/package.py
@@ -15,6 +15,7 @@ class PyTabulate(PythonPackage):
version('0.8.9', sha256='eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7')
version('0.8.7', sha256='db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007')
version('0.8.6', sha256='5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8')
+ version('0.8.5', sha256='d0097023658d4dea848d6ae73af84532d1e86617ac0925d1adf1dd903985dac3')
version('0.8.3', sha256='8af07a39377cee1103a5c8b3330a421c2d99b9141e9cc5ddd2e3263fea416943')
version('0.7.7', sha256='83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6')
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py
index 916108e7be..251db91b9a 100644
--- a/var/spack/repos/builtin/packages/py-tensorflow/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py
@@ -226,7 +226,6 @@ class PyTensorflow(Package, CudaPackage):
depends_on('cuda@:10.2', when='+cuda @:2.3')
depends_on('cuda@:11.1', when='+cuda @2.4.0:')
depends_on('cudnn', when='+cuda')
- depends_on('cudnn@6.5', when='@0.5:0.6 +cuda')
# depends_on('tensorrt', when='+tensorrt')
depends_on('nccl', when='+nccl')
depends_on('mpi', when='+mpi')
diff --git a/var/spack/repos/builtin/packages/py-tokenizers/package.py b/var/spack/repos/builtin/packages/py-tokenizers/package.py
index 5242d2ac97..b0f49f9161 100644
--- a/var/spack/repos/builtin/packages/py-tokenizers/package.py
+++ b/var/spack/repos/builtin/packages/py-tokenizers/package.py
@@ -10,6 +10,7 @@ class PyTokenizers(PythonPackage):
homepage = "https://github.com/huggingface/tokenizers"
pypi = "tokenizers/tokenizers-0.6.0.tar.gz"
+ version('0.10.3', sha256='1a5d3b596c6d3a237e1ad7f46c472d467b0246be7fd1a364f12576eb8db8f7e6')
version('0.6.0', sha256='1da11fbfb4f73be695bed0d655576097d09a137a16dceab2f66399716afaffac')
version('0.5.2', sha256='b5a235f9c71d04d4925df6c4fa13b13f1d03f9b7ac302b89f8120790c4f742bc')
diff --git a/var/spack/repos/builtin/packages/py-tqdm/package.py b/var/spack/repos/builtin/packages/py-tqdm/package.py
index 9c6029646f..3a1499c960 100644
--- a/var/spack/repos/builtin/packages/py-tqdm/package.py
+++ b/var/spack/repos/builtin/packages/py-tqdm/package.py
@@ -15,6 +15,7 @@ class PyTqdm(PythonPackage):
version('4.62.3', sha256='d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d')
version('4.59.0', sha256='d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33')
version('4.56.2', sha256='11d544652edbdfc9cc41aa4c8a5c166513e279f3f2d9f1a9e1c89935b51de6ff')
+ version('4.46.0', sha256='4733c4a10d0f2a4d098d801464bdaf5240c7dadd2a7fde4ee93b0a0efd9fb25e')
version('4.45.0', sha256='00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81')
version('4.36.1', sha256='abc25d0ce2397d070ef07d8c7e706aede7920da163c64997585d42d3537ece3d')
version('4.8.4', sha256='bab05f8bb6efd2702ab6c532e5e6a758a66c0d2f443e09784b73e4066e6b3a37')
diff --git a/var/spack/repos/builtin/packages/py-transformers/package.py b/var/spack/repos/builtin/packages/py-transformers/package.py
index 03ffc20785..b046f5b569 100644
--- a/var/spack/repos/builtin/packages/py-transformers/package.py
+++ b/var/spack/repos/builtin/packages/py-transformers/package.py
@@ -19,23 +19,18 @@ class PyTransformers(PythonPackage):
depends_on('python@3.6:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
- depends_on('py-numpy', type=('build', 'run'))
- depends_on('py-numpy@1.17:', when='@4.6.1:', type=('build', 'run'))
-
- depends_on('py-tokenizers', type=('build', 'run'))
- depends_on('py-tokenizers@0.10.1:0.10', when='@4.6.1:', type=('build', 'run'))
-
depends_on('py-dataclasses', when='^python@:3.6', type=('build', 'run'))
- depends_on('py-boto3', when='@2.8.0', type=('build', 'run'))
- depends_on('py-filelock', type=('build', 'run'))
- depends_on('py-requests', type=('build', 'run'))
- depends_on('py-tqdm@4.27:', type=('build', 'run'))
- depends_on('py-regex@:2019.12.16,2019.12.18:', type=('build', 'run'))
-
- depends_on('py-sentencepiece', type=('build', 'run'))
- depends_on('py-sentencepiece@0.1.91', when='@4.6.1:', type=('build', 'run'))
-
- depends_on('py-sacremoses', type=('build', 'run'))
depends_on('py-importlib-metadata', when='@4.6.1: ^python@:3.7', type=('build', 'run'))
+ depends_on('py-filelock', type=('build', 'run'))
depends_on('py-huggingface-hub@0.0.8', when='@4.6.1:', type=('build', 'run'))
+ depends_on('py-numpy', type=('build', 'run'))
+ depends_on('py-numpy@1.17:', when='@4.6.1:', type=('build', 'run'))
depends_on('py-packaging', when='@4.6.1:', type=('build', 'run'))
+ depends_on('py-regex@:2019.12.16,2019.12.18:', type=('build', 'run'))
+ depends_on('py-requests', type=('build', 'run'))
+ depends_on('py-sacremoses', type=('build', 'run'))
+ depends_on('py-tokenizers@0.5.2', when='@2.8.0', type=('build', 'run'))
+ depends_on('py-tokenizers@0.10.1:0.10', when='@4.6.1:', type=('build', 'run'))
+ depends_on('py-tqdm@4.27:', type=('build', 'run'))
+ depends_on('py-boto3', when='@2.8.0', type=('build', 'run'))
+ depends_on('py-sentencepiece', when='@2.8.0', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-typed-ast/package.py b/var/spack/repos/builtin/packages/py-typed-ast/package.py
index 2de58678a3..de0045c2ee 100644
--- a/var/spack/repos/builtin/packages/py-typed-ast/package.py
+++ b/var/spack/repos/builtin/packages/py-typed-ast/package.py
@@ -16,6 +16,8 @@ class PyTypedAst(PythonPackage):
version('1.4.2', sha256='9fc0b3cb5d1720e7141d103cf4819aea239f7d136acf9ee4a69b047b7986175a')
version('1.4.1', sha256='8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b')
version('1.4.0', sha256='66480f95b8167c9c5c5c87f32cf437d585937970f3fc24386f313a4c97b44e34')
+ version('1.3.5', sha256='5315f4509c1476718a4825f45a203b82d7fdf2a6f5f0c8f166435975b1c9f7d4',
+ url='https://files.pythonhosted.org/packages/source/t/typed-ast/typed-ast-1.3.5.tar.gz')
depends_on('python@3.3:', type=('build', 'link', 'run'))
depends_on('python@:3.8', when="@:1.4.0") # build errors with 3.9 until 1.4.1
diff --git a/var/spack/repos/builtin/packages/py-urllib3/package.py b/var/spack/repos/builtin/packages/py-urllib3/package.py
index 71ff2e2827..66adb28006 100644
--- a/var/spack/repos/builtin/packages/py-urllib3/package.py
+++ b/var/spack/repos/builtin/packages/py-urllib3/package.py
@@ -14,8 +14,10 @@ class PyUrllib3(PythonPackage):
pypi = "urllib3/urllib3-1.25.6.tar.gz"
version('1.26.6', sha256='f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f')
+ version('1.25.9', sha256='3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527')
version('1.25.6', sha256='9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86')
version('1.25.3', sha256='dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232')
+ version('1.24.3', sha256='2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4')
version('1.21.1', sha256='b14486978518ca0901a76ba973d7821047409d7f726f22156b24e83fd71382a5')
version('1.20', sha256='97ef2b6e2878d84c0126b9f4e608e37a951ca7848e4855a7f7f4437d5c34a72f')
version('1.14', sha256='dd4fb13a4ce50b18338c7e4d665b21fd38632c5d4b1d9f1a1379276bd3c08d37')
diff --git a/var/spack/repos/builtin/packages/py-yahmm/package.py b/var/spack/repos/builtin/packages/py-yahmm/package.py
index d499107b5e..193901cd85 100644
--- a/var/spack/repos/builtin/packages/py-yahmm/package.py
+++ b/var/spack/repos/builtin/packages/py-yahmm/package.py
@@ -12,6 +12,7 @@ class PyYahmm(PythonPackage):
pypi = "yahmm/yahmm-1.1.3.zip"
version('1.1.3', sha256='fe3614ef96da9410468976756fb93dc8235485242c05df01d8e5ed356a7dfb43')
+ version('1.1.2', sha256='5e81077323dc6da9fb792169b639f29e5293b0c8272e4c22b204ca95ac0df90a')
depends_on('py-cython@0.20.1:', type=('build', 'run'))
depends_on('py-numpy@1.8.0:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-yarl/package.py b/var/spack/repos/builtin/packages/py-yarl/package.py
index 6208fbf766..19cadcdbc8 100644
--- a/var/spack/repos/builtin/packages/py-yarl/package.py
+++ b/var/spack/repos/builtin/packages/py-yarl/package.py
@@ -8,10 +8,11 @@ class PyYarl(PythonPackage):
"""The module provides handy URL class for URL parsing and changing."""
homepage = "https://github.com/aio-libs/yarl"
- url = "https://github.com/aio-libs/yarl/archive/v1.4.2.tar.gz"
+ pypi = "yarl/yarl-1.4.2.tar.gz"
- version('1.7.2', sha256='19b94c68e8eda5731f87d79e3c34967a11e69695965113c4724d2491f76ad461')
- version('1.4.2', sha256='a400eb3f54f7596eeaba8100a8fa3d72135195423c52808dc54a43c6b100b192')
+ version('1.7.2', sha256='45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd')
+ version('1.4.2', sha256='58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b')
+ version('1.3.0', sha256='024ecdc12bc02b321bc66b41327f930d1c2c543fa9a561b39861da9388ba7aa9')
depends_on('python@3.5:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
diff --git a/var/spack/repos/builtin/packages/qt-creator/package.py b/var/spack/repos/builtin/packages/qt-creator/package.py
index 69c1462e91..985967d4f9 100644
--- a/var/spack/repos/builtin/packages/qt-creator/package.py
+++ b/var/spack/repos/builtin/packages/qt-creator/package.py
@@ -22,7 +22,7 @@ class QtCreator(QMakePackage):
# built with a different version of sqlite than the bundled copy, it will
# cause symbol conflict. Force Spack to build with the same version of
# sqlite as the bundled copy.
- depends_on('sqlite@3.8.10.2', when='@:4.4.0')
+ # depends_on('sqlite@3.8.10.2', when='@:4.4.0')
depends_on('sqlite@3.8.10.3:', when='@4.8.0:')
# Qt Creator 4.3.0+ requires a C++14 compiler
diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py
index c12c7cefaf..ab95bd8f3c 100644
--- a/var/spack/repos/builtin/packages/rust/package.py
+++ b/var/spack/repos/builtin/packages/rust/package.py
@@ -77,7 +77,7 @@ class Rust(Package):
# These version strings are officially supported, but aren't explicitly
# listed because there's no stable checksum for them.
- # version('nightly')
+ version('nightly')
# version('beta')
# Version Notes:
diff --git a/var/spack/repos/builtin/packages/seacas/package.py b/var/spack/repos/builtin/packages/seacas/package.py
index cd389ce56c..414fec59f9 100644
--- a/var/spack/repos/builtin/packages/seacas/package.py
+++ b/var/spack/repos/builtin/packages/seacas/package.py
@@ -90,8 +90,12 @@ class Seacas(CMakePackage):
depends_on('hdf5+hl~mpi', when='~mpi')
depends_on('cgns@4.2.0:+mpi+scoping', when='+cgns +mpi')
depends_on('cgns@4.2.0:~mpi+scoping', when='+cgns ~mpi')
- depends_on('adios2@develop~mpi', when='+adios2 ~mpi')
- depends_on('adios2@develop+mpi', when='+adios2 +mpi')
+
+ with when('+adios2'):
+ depends_on('adios2@master')
+ depends_on('adios2~mpi', when='~mpi')
+ depends_on('adios2+mpi', when='+mpi')
+
depends_on('matio', when='+matio')
with when('+metis'):
depends_on('metis+int64+real64')
diff --git a/var/spack/repos/builtin/packages/spectrum-mpi/package.py b/var/spack/repos/builtin/packages/spectrum-mpi/package.py
index ceca784288..d1b4808447 100644
--- a/var/spack/repos/builtin/packages/spectrum-mpi/package.py
+++ b/var/spack/repos/builtin/packages/spectrum-mpi/package.py
@@ -6,13 +6,16 @@ import os
import re
-class SpectrumMpi(Package):
+class SpectrumMpi(BundlePackage):
"""IBM MPI implementation from Spectrum MPI."""
has_code = False
homepage = "https://www-03.ibm.com/systems/spectrum-computing/products/mpi"
+ # https://www.ibm.com/docs/en/smpi/10.4
+ version('10.4')
+
provides('mpi')
executables = ['^ompi_info$']
@@ -91,9 +94,6 @@ class SpectrumMpi(Package):
results.append('')
return results
- def install(self, spec, prefix):
- raise InstallError('IBM MPI is not installable; it is vendor supplied')
-
def setup_dependent_package(self, module, dependent_spec):
# get the compiler names
if '%xl' in dependent_spec or '%xl_r' in dependent_spec:
diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py
index 160b2b8886..be3d16b383 100644
--- a/var/spack/repos/builtin/packages/turbine/package.py
+++ b/var/spack/repos/builtin/packages/turbine/package.py
@@ -2,8 +2,6 @@
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-
import os
from spack import *
@@ -20,7 +18,6 @@ class Turbine(AutotoolsPackage):
version('master', branch='master')
version('1.3.0', sha256='9709e5dada91a7dce958a7967d6ff2bd39ccc9e7da62d05a875324b5089da393')
version('1.2.3', sha256='a3156c7e0b39e166da3de8892f55fa5d535b0c99c87a9add067c801098fe51ba')
- version('1.1.0', sha256='98fad47597935a04d15072e42bf85411d55ef00cb6f953e9f14d6de902e33209')
variant('python', default=False,
description='Enable calling python')
@@ -28,11 +25,10 @@ class Turbine(AutotoolsPackage):
description='Enable calling R')
variant('hdf5', default=False,
description='Enable HDF5 support')
- depends_on('adlbx@master', when='@master')
- depends_on('adlbx@:0.9.2', when='@:1.2.3')
- depends_on('adlbx@:0.8.0', when='@:1.1.0')
- depends_on('adlbx', when='@1.2.1:')
+
depends_on('adlbx')
+ depends_on('adlbx@master', when='@master')
+ depends_on('adlbx@:0.9.2', when='@1.2.3:1.2.99')
depends_on('tcl', type=('build', 'run'))
depends_on('zsh', type=('build', 'run'))
depends_on('swig', type='build')