diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-10-03 15:09:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-03 09:09:02 -0400 |
| commit | b9e72557e8b52b63244500f226afda0efe798df2 (patch) | |
| tree | 80521b68338eccca9bd6787315938e51011946a2 /var | |
| parent | 2de116d285f9853284b0e033d66a67bc0f3cdc2b (diff) | |
| download | spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.gz spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.bz2 spack-b9e72557e8b52b63244500f226afda0efe798df2.tar.xz spack-b9e72557e8b52b63244500f226afda0efe798df2.zip | |
Remove .99 from version ranges (#26422)
In most cases, .99 can be omitted thanks to #26402 .
Diffstat (limited to 'var')
603 files changed, 1794 insertions, 1794 deletions
diff --git a/var/spack/repos/builtin.mock/packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py index 8db616e61d..90b6261c09 100644 --- a/var/spack/repos/builtin.mock/packages/openblas/package.py +++ b/var/spack/repos/builtin.mock/packages/openblas/package.py @@ -16,6 +16,6 @@ class Openblas(Package): version('0.2.13', 'b1190f3d3471685f17cfd1ec1d252ac9') # See #20019 for this conflict - conflicts('%gcc@:4.4.99', when='@0.2.14:') + conflicts('%gcc@:4.4', when='@0.2.14:') provides('blas') diff --git a/var/spack/repos/builtin/packages/3dtk/package.py b/var/spack/repos/builtin/packages/3dtk/package.py index a205bde42c..3f64b12393 100644 --- a/var/spack/repos/builtin/packages/3dtk/package.py +++ b/var/spack/repos/builtin/packages/3dtk/package.py @@ -35,7 +35,7 @@ class _3dtk(CMakePackage): generator = 'Ninja' depends_on('cmake@3.5:', when='@trunk', type='build') - depends_on('cmake@2.6.1:2.999', when='@1.2', type='build') + depends_on('cmake@2.6.1:2', when='@1.2', type='build') depends_on('ninja', type='build') depends_on('boost+serialization+graph+regex+filesystem+system+thread+date_time+program_options') depends_on('suite-sparse') diff --git a/var/spack/repos/builtin/packages/acts/package.py b/var/spack/repos/builtin/packages/acts/package.py index 66a5429dc9..6f26ccec60 100644 --- a/var/spack/repos/builtin/packages/acts/package.py +++ b/var/spack/repos/builtin/packages/acts/package.py @@ -134,7 +134,7 @@ class Acts(CMakePackage, CudaPackage): # Build dependencies # FIXME: Use spack's autodiff package once there is one - depends_on('boost @1.62:1.69.99 +program_options +test', when='@:0.10.3') + depends_on('boost @1.62:1.69 +program_options +test', when='@:0.10.3') depends_on('boost @1.71: +filesystem +program_options +test', when='@0.10.4:') depends_on('cmake @3.14:', type='build') depends_on('dd4hep @1.11:', when='+dd4hep') diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py index 26fe5527e1..d2c53249d8 100644 --- a/var/spack/repos/builtin/packages/adios/package.py +++ b/var/spack/repos/builtin/packages/adios/package.py @@ -77,9 +77,9 @@ class Adios(AutotoolsPackage): depends_on('bzip2', when='+bzip2') depends_on('szip', when='+szip') depends_on('sz@:1.4.10', when='@:1.12.0 +sz') - depends_on('sz@1.4.11.0:1.4.11.99', when='@1.13.0 +sz') - depends_on('sz@1.4.12.3:1.4.12.99', when='@1.13.1: +sz') - depends_on('zfp@0.5.1:0.5.99', when='+zfp') + depends_on('sz@1.4.11.0:1.4.11', when='@1.13.0 +sz') + depends_on('sz@1.4.12.3:1.4.12', when='@1.13.1: +sz') + depends_on('zfp@0.5.1:0.5', when='+zfp') depends_on('lz4', when='+lz4') depends_on('c-blosc@1.12.0:', when='+blosc') # optional transports & file converters diff --git a/var/spack/repos/builtin/packages/akantu/package.py b/var/spack/repos/builtin/packages/akantu/package.py index dce8862426..7f9a742159 100644 --- a/var/spack/repos/builtin/packages/akantu/package.py +++ b/var/spack/repos/builtin/packages/akantu/package.py @@ -29,7 +29,7 @@ class Akantu(CMakePackage): variant('python', default=False, description="Activates python bindings") - depends_on('boost@:1.66', when='@:3.0.99') + depends_on('boost@:1.66', when='@:3.0') depends_on('boost') depends_on('lapack') depends_on('cmake@3.5.1:', type='build') @@ -49,9 +49,9 @@ class Akantu(CMakePackage): extends('python', when='+python') - conflicts('%gcc@:5.3.99') - conflicts('@:3.0.99 external_solvers=petsc') - conflicts('@:3.0.99 +python') + conflicts('%gcc@:5.3') + conflicts('@:3.0 external_solvers=petsc') + conflicts('@:3.0 +python') def cmake_args(self): spec = self.spec @@ -68,7 +68,7 @@ class Akantu(CMakePackage): 'ON' if spec.satisfies('+python') else 'OFF'), ] - if spec.satisfies('@:3.0.99'): + if spec.satisfies('@:3.0'): args.extend(['-DCMAKE_CXX_FLAGS=-Wno-class-memaccess', '-DAKANTU_TRACTION_AT_SPLIT_NODE_CONTACT:BOOL=OFF']) else: diff --git a/var/spack/repos/builtin/packages/alps/package.py b/var/spack/repos/builtin/packages/alps/package.py index ef2686f724..f696d27d9a 100644 --- a/var/spack/repos/builtin/packages/alps/package.py +++ b/var/spack/repos/builtin/packages/alps/package.py @@ -28,14 +28,14 @@ class Alps(CMakePackage): depends_on('hdf5 ~mpi+hl') depends_on('lapack') # build fails for latest python@3.7 - depends_on('python@:3.6.99', type=('build', 'link', 'run')) + depends_on('python@:3.6', type=('build', 'link', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run')) # use depends_on to help with dependency resolution - depends_on('py-numpy@:1.19', when='^python@:3.6.99') - depends_on('py-scipy@:1.5', when='^python@:3.6.99') + depends_on('py-numpy@:1.19', when='^python@:3.6') + depends_on('py-scipy@:1.5', when='^python@:3.6') # fix for gcc@7: patch('alps_newgcc.patch', when='%gcc@7:') diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index 5462da1255..72d62abfef 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -32,8 +32,8 @@ class Alquimia(CMakePackage): 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.99', when='@xsdk-0.4.0') - depends_on('petsc@3.8.0:3.8.99', when='@xsdk-0.3.0') + 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') depends_on('petsc@3.10:', when='@develop') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index 4dfc8643fc..498baa911a 100644 --- a/var/spack/repos/builtin/packages/aluminum/package.py +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -48,7 +48,7 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage): depends_on('hwloc@1.11:') depends_on('hwloc +cuda +nvml', when='+cuda') depends_on('hwloc@2.3.0:', when='+rocm') - depends_on('cub', when='@:0.1,0.6.0: +cuda ^cuda@:10.99') + depends_on('cub', when='@:0.1,0.6.0: +cuda ^cuda@:10') depends_on('hipcub', when='@:0.1,0.6.0: +rocm') conflicts('~cuda', when='+cuda_rma', msg='CUDA RMA support requires CUDA') @@ -87,7 +87,7 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage): args.append( '-DALUMINUM_ENABLE_MPI_CUDA:BOOL=%s' % ('+ht' in spec)) - if spec.satisfies('@:0.1,0.6.0: +cuda ^cuda@:10.99'): + if spec.satisfies('@:0.1,0.6.0: +cuda ^cuda@:10'): args.append( '-DCUB_DIR:FILEPATH=%s' % spec['cub'].prefix) diff --git a/var/spack/repos/builtin/packages/ambari/package.py b/var/spack/repos/builtin/packages/ambari/package.py index 2348a3c80d..6ef3f2449d 100644 --- a/var/spack/repos/builtin/packages/ambari/package.py +++ b/var/spack/repos/builtin/packages/ambari/package.py @@ -19,7 +19,7 @@ class Ambari(PythonPackage): version('2.7.3', sha256='30fe72e60fa6b62fe032bd193ebd0cef20b65c54b57cad92f6f44daabd3771cf') version('2.7.1', sha256='ea4eb28f377ce9d0b9b7648f2020dda4be974c6d9a22ebaafbf1bc97890e4e42') - depends_on('python@:2.7.999', type=('build', 'run')) - depends_on('py-setuptools@:44.99.99', type='build') + depends_on('python@:2.7', type=('build', 'run')) + depends_on('py-setuptools@:44', type='build') depends_on('py-mock', type='test') depends_on('py-coilmq', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/amdlibflame/package.py b/var/spack/repos/builtin/packages/amdlibflame/package.py index 4b35d337eb..56e97e5894 100644 --- a/var/spack/repos/builtin/packages/amdlibflame/package.py +++ b/var/spack/repos/builtin/packages/amdlibflame/package.py @@ -39,7 +39,7 @@ class Amdlibflame(LibflameBase): version('3.0', sha256='d94e08b688539748571e6d4c1ec1ce42732eac18bd75de989234983c33f01ced') version('2.2', sha256='12b9c1f92d2c2fa637305aaa15cf706652406f210eaa5cbc17aaea9fcfa576dc') - patch('aocc-2.2.0.patch', when="@:2.999", level=1) + patch('aocc-2.2.0.patch', when="@:2", level=1) patch('cray-compiler-wrapper.patch') provides('flame@5.2', when='@2:') diff --git a/var/spack/repos/builtin/packages/amdlibm/package.py b/var/spack/repos/builtin/packages/amdlibm/package.py index fdf71087a1..c38c98fd1e 100644 --- a/var/spack/repos/builtin/packages/amdlibm/package.py +++ b/var/spack/repos/builtin/packages/amdlibm/package.py @@ -39,7 +39,7 @@ class Amdlibm(SConsPackage): patch("0001-libm-ose-Scripts-cleanup-pyc-files.patch", when="@2.2") patch("0002-libm-ose-prevent-log-v3.c-from-building.patch", when="@2.2") - conflicts("%gcc@:9.1.999", msg="Minimum required GCC version is 9.2.0") + conflicts("%gcc@:9.1", msg="Minimum required GCC version is 9.2.0") def build_args(self, spec, prefix): """Setting build arguments for amdlibm """ diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index ad8f00b52a..a5721cf12e 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -93,7 +93,7 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): depends_on('sundials@5.7.0: +ARKODE +CVODE +rocm amdgpu_target=%s' % tgt, when='@21.07: +sundials +rocm amdgpu_target=%s' % tgt) depends_on('cuda@9.0.0:', when='+cuda') depends_on('python@2.7:', type='build', when='@:20.04') - depends_on('cmake@3.5:', type='build', when='@:18.10.99') + depends_on('cmake@3.5:', type='build', when='@:18.10') depends_on('cmake@3.13:', type='build', when='@18.11:') depends_on('cmake@3.14:', type='build', when='@19.04:') # cmake @3.17: is necessary to handle cuda @11: correctly @@ -141,7 +141,7 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): conflicts('cuda_arch=30', when='+cuda', msg='AMReX only supports compute capabilities >= 3.5') conflicts('cuda_arch=32', when='+cuda', msg='AMReX only supports compute capabilities >= 3.5') conflicts('+rocm', when='@:20.11', msg='AMReX HIP support needs AMReX newer than version 20.11') - conflicts('%rocm@4.2.0:4.2.99', when='+rocm', + conflicts('%rocm@4.2.0:4.2', when='+rocm', msg='AMReX does not support rocm-4.2 due to a compiler bug') conflicts('+cuda', when='+rocm', msg='CUDA and HIP support are exclusive') diff --git a/var/spack/repos/builtin/packages/aocl-sparse/package.py b/var/spack/repos/builtin/packages/aocl-sparse/package.py index 3f8aec953b..f23ef06027 100644 --- a/var/spack/repos/builtin/packages/aocl-sparse/package.py +++ b/var/spack/repos/builtin/packages/aocl-sparse/package.py @@ -23,7 +23,7 @@ class AoclSparse(CMakePackage): version('3.0', sha256='1d04ba16e04c065051af916b1ed9afce50296edfa9b1513211a7378e1d6b952e') version('2.2', sha256='33c2ed6622cda61d2613ee63ff12c116a6cd209c62e54307b8fde986cd65f664') - conflicts("%gcc@:9.1.999", msg="Minimum required GCC version is 9.2.0") + conflicts("%gcc@:9.1", msg="Minimum required GCC version is 9.2.0") variant('build_type', default='Release', description='CMake build type', diff --git a/var/spack/repos/builtin/packages/aoflagger/package.py b/var/spack/repos/builtin/packages/aoflagger/package.py index 417527cec6..e44961bcfd 100644 --- a/var/spack/repos/builtin/packages/aoflagger/package.py +++ b/var/spack/repos/builtin/packages/aoflagger/package.py @@ -15,7 +15,7 @@ class Aoflagger(CMakePackage): version('2.10.0', sha256='3ec1188d37101acf2029575ebc09c50b19c158c88a12b55ac5d25a96bd8fc18d') - depends_on('casacore+python+fftw@1.9.99:') + depends_on('casacore+python+fftw@1.10:') depends_on('fftw~mpi@3.0:') depends_on('boost+python@:1.66.99') depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/ape/package.py b/var/spack/repos/builtin/packages/ape/package.py index f2a08a18e4..18ccbeca3c 100644 --- a/var/spack/repos/builtin/packages/ape/package.py +++ b/var/spack/repos/builtin/packages/ape/package.py @@ -16,7 +16,7 @@ class Ape(Package): version('2.2.1', sha256='1bdb7f987fde81f8a5f335da6b59fa884e6d185d4a0995c90fde7c04376ce9e3') depends_on('gsl') - depends_on('libxc@:4.999', when='@2.3.0:') + depends_on('libxc@:4', when='@2.3.0:') depends_on('libxc@:2.2.2', when='@:2.2.1') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/apr-util/package.py b/var/spack/repos/builtin/packages/apr-util/package.py index a08f110a7c..74125e00b6 100644 --- a/var/spack/repos/builtin/packages/apr-util/package.py +++ b/var/spack/repos/builtin/packages/apr-util/package.py @@ -73,12 +73,12 @@ class AprUtil(AutotoolsPackage): args.append('--without-pgsql') if '+sqlite' in spec: - if spec.satisfies('^sqlite@3.0:3.999'): + if spec.satisfies('^sqlite@3.0:3'): args.extend([ '--with-sqlite3={0}'.format(spec['sqlite'].prefix), '--without-sqlite2', ]) - elif spec.satisfies('^sqlite@2.0:2.999'): + elif spec.satisfies('^sqlite@2.0:2'): args.extend([ '--with-sqlite2={0}'.format(spec['sqlite'].prefix), '--without-sqlite3', diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index dacad32465..98e1271c4f 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -94,7 +94,7 @@ class Ascent(CMakePackage, CudaPackage): ########################################################################### # Certain CMake versions have been found to break for our use cases - depends_on("cmake@3.14.1:3.14.99,3.18.2:", type='build') + depends_on("cmake@3.14.1:3.14,3.18.2:", type='build') depends_on("conduit~python", when="~python") depends_on("conduit+python", when="+python") depends_on("conduit+mpi", when="+mpi") diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index c0bf35aad3..72ab85c947 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -28,8 +28,8 @@ class Asciidoc(AutotoolsPackage): depends_on('libxslt', type=('build', 'run')) depends_on('docbook-xml', type=('build', 'run')) depends_on('docbook-xsl', type=('build', 'run')) - depends_on('python@2.3.0:2.7.99', when='@:8.6.9', type=('build', 'run')) - depends_on('python@3.5:', when='@9.0.2:', type=('build', 'run')) + depends_on('python@2.3.0:2.7', when='@:8.6.9', type=('build', 'run')) + depends_on('python@3.5:', when='@9.0.2:', type=('build', 'run')) @when('@:8.6.9') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/asdf-cxx/package.py b/var/spack/repos/builtin/packages/asdf-cxx/package.py index 742d939666..e1cf42c39b 100644 --- a/var/spack/repos/builtin/packages/asdf-cxx/package.py +++ b/var/spack/repos/builtin/packages/asdf-cxx/package.py @@ -44,7 +44,7 @@ class AsdfCxx(CMakePackage): depends_on('python', type=('build', 'run'), when='+python') # An error in the cmake script requires swig all the time, not only when # Python bindings are used - depends_on('swig @3.0.0:3.999.999', type='build') + depends_on('swig @3.0.0:3', type='build') # Neither earlier nor later versions of yaml-cpp work depends_on('yaml-cpp @0.6.3') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/awscli/package.py b/var/spack/repos/builtin/packages/awscli/package.py index 3463f92147..b56e0a7265 100644 --- a/var/spack/repos/builtin/packages/awscli/package.py +++ b/var/spack/repos/builtin/packages/awscli/package.py @@ -21,7 +21,7 @@ class Awscli(PythonPackage): depends_on('py-botocore@1.12.169', when='@1.16.179', type=('build', 'run')) depends_on('py-docutils@0.10:0.15', type=('build', 'run')) depends_on('py-rsa@3.1.2:3.5.0', type=('build', 'run')) - depends_on('py-s3transfer@0.2.0:0.2.999', type=('build', 'run')) + depends_on('py-s3transfer@0.2.0:0.2', type=('build', 'run')) depends_on('py-argparse@1.1:', when='^python@:2.6', type=('build', 'run')) depends_on('py-pyyaml@3.10:3.13', when='^python@:2.6,3.0:3.3', type=('build', 'run')) depends_on('py-pyyaml@3.10:5.2', when='^python@3.4:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index 2d28640e0d..959a363191 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -95,7 +95,7 @@ class Axom(CachedCMakePackage, CudaPackage): depends_on("conduit~hdf5", when="~hdf5") # HDF5 needs to be the same as Conduit's - depends_on("hdf5@1.8.19:1.8.999~cxx~fortran", when="+hdf5") + depends_on("hdf5@1.8.19:1.8~cxx~fortran", when="+hdf5") depends_on("lua", when="+lua") diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index 445d32b2c3..3bd2d57fb4 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -54,8 +54,8 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage): # Prior to 2.30, gold did not distribute the generated files and # thus needs bison, even for a one-time build. - depends_on('m4', type='build', when='@:2.29.99 +gold') - depends_on('bison', type='build', when='@:2.29.99 +gold') + depends_on('m4', type='build', when='@:2.29 +gold') + depends_on('bison', type='build', when='@:2.29 +gold') # 2.34 needs makeinfo due to a bug, see: # https://sourceware.org/bugzilla/show_bug.cgi?id=25491 diff --git a/var/spack/repos/builtin/packages/bison/package.py b/var/spack/repos/builtin/packages/bison/package.py index a10cea2cf4..09db5feed9 100644 --- a/var/spack/repos/builtin/packages/bison/package.py +++ b/var/spack/repos/builtin/packages/bison/package.py @@ -58,8 +58,8 @@ class Bison(AutotoolsPackage, GNUMirrorPackage): patch('pgi.patch', when='@3.0.4') # The NVIDIA compilers do not currently support some GNU builtins. # Detect this case and use the fallback path. - patch('nvhpc-3.6.patch', when='@3.6.0:3.6.99 %nvhpc') - patch('nvhpc-3.7.patch', when='@3.7.0:3.7.99 %nvhpc') + patch('nvhpc-3.6.patch', when='@3.6.0:3.6 %nvhpc') + patch('nvhpc-3.7.patch', when='@3.7.0:3.7 %nvhpc') conflicts('%intel@:14', when='@3.4.2:', msg="Intel 14 has immature C11 support") diff --git a/var/spack/repos/builtin/packages/blasr-libcpp/package.py b/var/spack/repos/builtin/packages/blasr-libcpp/package.py index c008d3452f..76a8e0b55b 100644 --- a/var/spack/repos/builtin/packages/blasr-libcpp/package.py +++ b/var/spack/repos/builtin/packages/blasr-libcpp/package.py @@ -21,7 +21,7 @@ class BlasrLibcpp(Package): version('5.3.1', sha256='45a673255bfe7e29ed1f5bdb6410aa45cb6b907400d038c3da9daf1058b09156') depends_on('pbbam') - depends_on('hdf5+cxx@1.8.12:1.8.99') + depends_on('hdf5+cxx@1.8.12:1.8') # maximum version is 1.8.20 currently. There doesn't appear to be a # major version 1.9 and the 1.10.1 version doesn't build correctly. # https://github.com/PacificBiosciences/blasr/issues/355 diff --git a/var/spack/repos/builtin/packages/blasr/package.py b/var/spack/repos/builtin/packages/blasr/package.py index 5b3c0f3c09..64aeb38564 100644 --- a/var/spack/repos/builtin/packages/blasr/package.py +++ b/var/spack/repos/builtin/packages/blasr/package.py @@ -17,7 +17,7 @@ class Blasr(Package): version('5.3.1', sha256='ff7da5a03096294572e6c64340354da5c5ee1c86c277e7b899f2c170c1ac4049') depends_on('ncurses') - depends_on('hdf5+cxx@1.8.12:1.8.99') + depends_on('hdf5+cxx@1.8.12:1.8') depends_on('htslib') depends_on('zlib') depends_on('boost') diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 3003cc0e0c..41ad86e61c 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -15,7 +15,7 @@ class Blitz(AutotoolsPackage): version('1.0.1', sha256='b62fc3f07b64b264307b01fec5e4f2793e09a68dcb5378984aedbc2e4b3adcef') version('1.0.0', sha256='79c06ea9a0585ba0e290c8140300e3ad19491c45c1d90feb52819abc3b58a0c1') - depends_on('python@:2.7.999', type='build', when='@:1.0.1') + depends_on('python@:2.7', type='build', when='@:1.0.1') depends_on('python@3:', type='build', when='@1.0.2:') build_targets = ['lib'] diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py index cfc63a508f..adc75c848c 100644 --- a/var/spack/repos/builtin/packages/boost/package.py +++ b/var/spack/repos/builtin/packages/boost/package.py @@ -176,19 +176,19 @@ class Boost(Package): depends_on('py-numpy', when='+numpy', type=('build', 'run')) # Coroutine, Context, Fiber, etc., are not straightforward. - conflicts('+context', when='@:1.50.99') # Context since 1.51.0. + conflicts('+context', when='@:1.50') # Context since 1.51.0. conflicts('cxxstd=98', when='+context') # Context requires >=C++11. - conflicts('+coroutine', when='@:1.52.99') # Context since 1.53.0. + conflicts('+coroutine', when='@:1.52') # Context since 1.53.0. conflicts('~context', when='+coroutine') # Coroutine requires Context. - conflicts('+fiber', when='@:1.61.99') # Fiber since 1.62.0. + conflicts('+fiber', when='@:1.61') # Fiber since 1.62.0. conflicts('cxxstd=98', when='+fiber') # Fiber requires >=C++11. conflicts('~context', when='+fiber') # Fiber requires Context. # C++20/2a is not support by Boost < 1.73.0 - conflicts('cxxstd=2a', when='@:1.72.99') + conflicts('cxxstd=2a', when='@:1.72') # C++17 is not supported by Boost<1.63.0. - conflicts('cxxstd=17', when='@:1.62.99') + conflicts('cxxstd=17', when='@:1.62') conflicts('+taggedlayout', when='+versionedlayout') conflicts('+numpy', when='~python') @@ -197,7 +197,7 @@ class Boost(Package): conflicts('cxxstd=98', when='+mpi+python @1.72.0') # Container's Extended Allocators were not added until 1.56.0 - conflicts('+container', when='@:1.55.99') + conflicts('+container', when='@:1.55') # Boost.System till 1.76 (included) was relying on mutex, which was not # detected correctly on Darwin platform when using GCC @@ -220,19 +220,19 @@ class Boost(Package): patch('xl_1_62_0_le.patch', when='@1.62.0%xl') # Patch fix from https://svn.boost.org/trac/boost/ticket/10125 - patch('call_once_variadic.patch', when='@1.54.0:1.55.9999%gcc@5.0:') + patch('call_once_variadic.patch', when='@1.54.0:1.55%gcc@5.0:') # Patch fix for PGI compiler - patch('boost_1.67.0_pgi.patch', when='@1.67.0:1.68.9999%pgi') + patch('boost_1.67.0_pgi.patch', when='@1.67.0:1.68%pgi') patch('boost_1.63.0_pgi.patch', when='@1.63.0%pgi') patch('boost_1.63.0_pgi_17.4_workaround.patch', when='@1.63.0%pgi@17.4') # Patch to override the PGI toolset when using the NVIDIA compilers - patch('nvhpc-1.74.patch', when='@1.74.0:1.75.9999%nvhpc') - patch('nvhpc-1.76.patch', when='@1.76.0:1.76.9999%nvhpc') + patch('nvhpc-1.74.patch', when='@1.74.0:1.75%nvhpc') + patch('nvhpc-1.76.patch', when='@1.76.0:1.76%nvhpc') # Patch to workaround compiler bug - patch('nvhpc-find_address.patch', when='@1.75.0:1.76.999%nvhpc') + patch('nvhpc-find_address.patch', when='@1.75.0:1.76%nvhpc') # Fix for version comparison on newer Clang on darwin # See: https://github.com/boostorg/build/issues/440 @@ -276,11 +276,11 @@ class Boost(Package): # Support bzip2 and gzip in other directory # See https://github.com/boostorg/build/pull/154 - patch('boost_154.patch', when='@1.56.0:1.63.99') + patch('boost_154.patch', when='@1.56.0:1.63') # Backport Python3 import problem # See https://github.com/boostorg/python/pull/218 - patch('boost_218.patch', when='@1.63.0:1.67.99') + patch('boost_218.patch', when='@1.63.0:1.67') # Fix B2 bootstrap toolset during installation # See https://github.com/spack/spack/issues/20757 diff --git a/var/spack/repos/builtin/packages/bowtie/package.py b/var/spack/repos/builtin/packages/bowtie/package.py index a3120f5789..2408b450ce 100644 --- a/var/spack/repos/builtin/packages/bowtie/package.py +++ b/var/spack/repos/builtin/packages/bowtie/package.py @@ -48,7 +48,7 @@ class Bowtie(MakefilePackage): # correspond to 'aarch64' architecture # reference: https://github.com/BenLangmead/bowtie/pull/13 - patch('for_aarch64.patch', when='@1.2:1.2.999 target=aarch64:') + patch('for_aarch64.patch', when='@1.2.0:1.2 target=aarch64:') # measures for narrowing error patch('fix_narrowing_err.patch', when='@1.2.1:1.2.3') diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 20639549c9..83e5b5058b 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -67,26 +67,26 @@ class Caliper(CMakePackage, CudaPackage): variant('fortran', default=False, description='Enable Fortran support') - depends_on('adiak@0.1:0.99', when='@2.2: +adiak') + depends_on('adiak@0.1:0', when='@2.2: +adiak') - depends_on('papi@5.3:5.99', when='@:2.2 +papi') - depends_on('papi@5.3:6.99', when='@2.3: +papi') + depends_on('papi@5.3:5', when='@:2.2 +papi') + depends_on('papi@5.3:6', when='@2.3: +papi') - depends_on('libpfm4@4.8:4.99', when='+libpfm') + depends_on('libpfm4@4.8:4', when='+libpfm') depends_on('mpi', when='+mpi') - depends_on('unwind@1.2:1.99', when='+libunwind') + depends_on('unwind@1.2:1', when='+libunwind') depends_on('elfutils', when='+libdw') - depends_on('sosflow@spack', when='@1.0:1.99+sosflow') + depends_on('sosflow@spack', when='@1.0:1+sosflow') depends_on('cmake', type='build') depends_on('python', type='build') # sosflow support not yet in 2.0 - conflicts('+sosflow', '@2.0.0:2.5.99') - conflicts('+adiak', '@:2.1.99') - conflicts('+libdw', '@:2.4.99') + conflicts('+sosflow', '@2.0.0:2.5') + conflicts('+adiak', '@:2.1') + conflicts('+libdw', '@:2.4') patch('for_aarch64.patch', when='target=aarch64:') diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py index e954037cef..97313342cc 100644 --- a/var/spack/repos/builtin/packages/cantera/package.py +++ b/var/spack/repos/builtin/packages/cantera/package.py @@ -43,8 +43,8 @@ class Cantera(SConsPackage): depends_on('py-numpy', when='+python', type=('build', 'run')) depends_on('py-scipy', when='+python', type=('build', 'run')) depends_on('py-3to2', when='+python', type=('build', 'run')) - depends_on('py-unittest2', when='+python^python@2.6.0:2.6.999', type=('build', 'run')) - depends_on('py-unittest2py3k', when='+python^python@3.1.0:3.1.999', type=('build', 'run')) + depends_on('py-unittest2', when='+python^python@2.6.0:2.6', type=('build', 'run')) + depends_on('py-unittest2py3k', when='+python^python@3.1.0:3.1', type=('build', 'run')) # Matlab toolbox dependencies extends('matlab', when='+matlab') diff --git a/var/spack/repos/builtin/packages/catch2/package.py b/var/spack/repos/builtin/packages/catch2/package.py index 8b7f8b7402..e0f4812389 100644 --- a/var/spack/repos/builtin/packages/catch2/package.py +++ b/var/spack/repos/builtin/packages/catch2/package.py @@ -99,15 +99,15 @@ class Catch2(CMakePackage): args.append(self.define('BUILD_TESTING', self.run_tests)) return args - @when('@:1.6.99') + @when('@:1.6') def cmake(self, spec, prefix): pass - @when('@:1.6.99') + @when('@:1.6') def build(self, spec, prefix): pass - @when('@:1.6.99') + @when('@:1.6') def install(self, spec, prefix): mkdirp(prefix.include) install(join_path('single_include', 'catch.hpp'), prefix.include) diff --git a/var/spack/repos/builtin/packages/ccache/package.py b/var/spack/repos/builtin/packages/ccache/package.py index 9484d29a16..1278c73e2d 100644 --- a/var/spack/repos/builtin/packages/ccache/package.py +++ b/var/spack/repos/builtin/packages/ccache/package.py @@ -39,25 +39,25 @@ class Ccache(CMakePackage): depends_on('zstd', when='@4.0:') - depends_on('gperf', when='@:3.99') + depends_on('gperf', when='@:3') depends_on('hiredis@0.13.3:', when='@4.4:') - depends_on('libxslt', when='@:3.99') - depends_on('zlib', when='@:3.99') + depends_on('libxslt', when='@:3') + depends_on('zlib', when='@:3') conflicts('%gcc@:5', when='@4.4:') conflicts('%clang@:4', when='@4.4:') # Before 4.0 this was an Autotools package - @when('@:3.99') + @when('@:3') def cmake(self, spec, prefix): configure_args = ["--prefix=" + prefix] configure(*configure_args) - @when('@:3.99') + @when('@:3') def build(self, spec, prefix): make() - @when('@:3.99') + @when('@:3') def install(self, spec, prefix): make("install") diff --git a/var/spack/repos/builtin/packages/ceed/package.py b/var/spack/repos/builtin/packages/ceed/package.py index 9a2c66f753..59c91f56be 100644 --- a/var/spack/repos/builtin/packages/ceed/package.py +++ b/var/spack/repos/builtin/packages/ceed/package.py @@ -90,11 +90,11 @@ class Ceed(BundlePackage, CudaPackage, ROCmPackage): # Nek5000, GSLIB, Nekbone, and NekCEM # ceed-3.0 and ceed-4.0 - depends_on('nek5000@19.0', when='@3.0.0:4.99+nek') - depends_on('nektools@19.0%gcc', when='@3.0.0:4.99+nek') - depends_on('gslib@1.0.6', when='@3.0.0:4.99+nek') - depends_on('nekbone@17.0', when='@3.0.0:4.99+nek') - depends_on('nekcem@c8db04b', when='@3.0.0:4.99+nek') + depends_on('nek5000@19.0', when='@3.0.0:4+nek') + depends_on('nektools@19.0%gcc', when='@3.0.0:4+nek') + depends_on('gslib@1.0.6', when='@3.0.0:4+nek') + depends_on('nekbone@17.0', when='@3.0.0:4+nek') + depends_on('nekcem@c8db04b', when='@3.0.0:4+nek') # ceed-2.0 depends_on('nek5000@17.0', when='@2.0.0+nek') depends_on('nektools@17.0%gcc', when='@2.0.0+nek') @@ -110,28 +110,28 @@ class Ceed(BundlePackage, CudaPackage, ROCmPackage): # PETSc # ceed 4.0 - depends_on('petsc@3.15.0:3.15.99', when='@4.0.0:4.99.99+petsc') + depends_on('petsc@3.15.0:3.15', when='@4.0.0:4+petsc') for arch in CudaPackage.cuda_arch_values: depends_on('petsc+cuda cuda_arch={0}'.format(arch), when='@4.0.0+petsc+cuda cuda_arch={0}'.format(arch)) for target in ROCmPackage.amdgpu_targets: - depends_on('petsc@3.15.0:3.15.99+rocm amdgpu_target={0}'.format(target), - when='@4.0.0:4.99.99+petsc+rocm amdgpu_target={0}'.format(target)) - depends_on('petsc@3.15.0:3.15.99~hdf5~superlu-dist', + depends_on('petsc@3.15.0:3.15+rocm amdgpu_target={0}'.format(target), + when='@4.0.0:4+petsc+rocm amdgpu_target={0}'.format(target)) + depends_on('petsc@3.15.0:3.15~hdf5~superlu-dist', when='@4.0.0+petsc+quickbuild') - depends_on('petsc@3.15.0:3.15.99+mpi+double~int64', when='@4.0.0:4.99.99+petsc~mfem') + depends_on('petsc@3.15.0:3.15+mpi+double~int64', when='@4.0.0:4+petsc~mfem') # ceed-3.0 depends_on('petsc+cuda', when='@3.0.0+petsc+cuda') # For a +quickbuild we disable hdf5, and superlu-dist in PETSc. - depends_on('petsc@3.13.0:3.13.99~hdf5~superlu-dist', + depends_on('petsc@3.13.0:3.13~hdf5~superlu-dist', when='@3.0.0+petsc+quickbuild') - depends_on('petsc@3.13.0:3.13.99+mpi+double~int64', when='@3.0.0+petsc~mfem') + depends_on('petsc@3.13.0:3.13+mpi+double~int64', when='@3.0.0+petsc~mfem') # Coax concretizer to use version of hypre required by transitive # dependencies (mfem, petsc) depends_on('hypre@:2.18.2', when='@3.0.0+mfem') # The mfem petsc examples need the petsc variants +hypre, +suite-sparse, # and +mumps: - depends_on('petsc@3.13.0:3.13.99+mpi+hypre+suite-sparse+mumps+double~int64', + depends_on('petsc@3.13.0:3.13+mpi+hypre+suite-sparse+mumps+double~int64', when='@3.0.0+petsc+mfem') # ceed-2.0 # For a +quickbuild we disable hdf5, and superlu-dist in PETSc. diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py index b10b90e7a3..116ec24450 100644 --- a/var/spack/repos/builtin/packages/cereal/package.py +++ b/var/spack/repos/builtin/packages/cereal/package.py @@ -32,7 +32,7 @@ class Cereal(CMakePackage): patch("Boost2.patch", when="@1.2.2:") patch("pointers.patch") # fixed in HEAD but not released yet - patch("LockGuard-default-ctor.patch", when="@:1.3.999") + patch("LockGuard-default-ctor.patch", when="@:1.3") depends_on('cmake@2.6.2:', type='build') diff --git a/var/spack/repos/builtin/packages/cgns/package.py b/var/spack/repos/builtin/packages/cgns/package.py index eab936b1e4..f57bec7631 100644 --- a/var/spack/repos/builtin/packages/cgns/package.py +++ b/var/spack/repos/builtin/packages/cgns/package.py @@ -44,7 +44,7 @@ class Cgns(CMakePackage): variant('mem_debug', default=False, description='Enable memory debugging option') depends_on('cmake@3.8:', when='@4.2:', type='build') - depends_on('cmake@2.8:', when='@:4.1.99', type='build') + depends_on('cmake@2.8:', when='@:4.1', type='build') depends_on('hdf5~mpi', when='+hdf5~mpi') depends_on('hdf5+mpi', when='+hdf5+mpi') depends_on('mpi', when='+mpi') diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py index bee9cdb35c..7697925d7f 100644 --- a/var/spack/repos/builtin/packages/charmpp/package.py +++ b/var/spack/repos/builtin/packages/charmpp/package.py @@ -124,7 +124,7 @@ class Charmpp(Package): conflicts("~tracing", "+papi") conflicts("backend=multicore", "+smp") - conflicts("backend=ucx", when="@:6.9.99") + conflicts("backend=ucx", when="@:6.9") @property def charmarch(self): diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index 657e25ab80..c3a17eb129 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -32,7 +32,7 @@ class ClingoBootstrap(Clingo): conflicts('%{0}'.format(compiler_spec), when='platform=cray', msg='GCC is required to bootstrap clingo on Cray') conflicts( - '%gcc@:5.99.99', msg='C++14 support is required to bootstrap clingo' + '%gcc@:5', msg='C++14 support is required to bootstrap clingo' ) # On Darwin we bootstrap with Apple Clang diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 9c1da9fb7e..bbb2f3fedd 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -167,15 +167,15 @@ class Cmake(Package): depends_on('xz', when='~ownlibs') depends_on('libarchive@3.1.0:', when='~ownlibs') depends_on('libarchive@3.3.3:', when='@3.15.0:~ownlibs') - depends_on('libuv@1.0.0:1.10.99', when='@3.7.0:3.10.3~ownlibs') - depends_on('libuv@1.10.0:1.10.99', when='@3.11.0:3.11.99~ownlibs') + depends_on('libuv@1.0.0:1.10', when='@3.7.0:3.10.3~ownlibs') + depends_on('libuv@1.10.0:1.10', when='@3.11.0:3.11~ownlibs') depends_on('libuv@1.10.0:', when='@3.12.0:~ownlibs') depends_on('rhash', when='@3.8.0:~ownlibs') depends_on('qt', when='+qt') depends_on('python@2.7.11:', when='+doc', type='build') depends_on('py-sphinx', when='+doc', type='build') depends_on('openssl', when='+openssl+ownlibs') - depends_on('openssl@:1.0.99', when='@:3.6.9+openssl+ownlibs') + depends_on('openssl@:1.0', when='@:3.6.9+openssl+ownlibs') depends_on('ncurses', when='+ncurses') # Cannot build with Intel, should be fixed in 3.6.2 @@ -201,14 +201,14 @@ class Cmake(Package): # Remove -A from the C++ flags we use when CXX_EXTENSIONS is OFF # Should be fixed in 3.19. # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5025 - patch('pgi-cxx-ansi.patch', when='@3.15:3.18.99') + patch('pgi-cxx-ansi.patch', when='@3.15:3.18') # Adds CCE v11+ fortran preprocessing definition. # requires Cmake 3.19+ # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5882 patch('5882-enable-cce-fortran-preprocessing.patch', sha256='b48396c0e4f61756248156b6cebe9bc0d7a22228639b47b5aa77c9330588ce88', - when='@3.19.0:3.19.99') + when='@3.19.0:3.19') conflicts('+qt', when='^qt@5.4.0') # qt-5.4.0 has broken CMake modules diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index 11332ae02c..19c8d076b3 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -35,7 +35,7 @@ class Comgr(CMakePackage): # /opt/rocm, and this breaks the build when /opt/rocm exists. patch('hip-tests.patch', when='@:4.2.0') - depends_on('cmake@3.2.0:', type='build', when='@:3.8.99') + depends_on('cmake@3.2.0:', type='build', when='@:3.8') depends_on('cmake@3.13.4:', type='build', when='@3.9.0:') depends_on('zlib', type='link') diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 45be5e0027..a784668d9f 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -118,8 +118,8 @@ class Conduit(CMakePackage): # # Use HDF5 1.8, for wider output compatibly # variants reflect we are not using hdf5's mpi or fortran features. - depends_on("hdf5@1.8.19:1.8.999~cxx", when="+hdf5+hdf5_compat+shared") - depends_on("hdf5@1.8.19:1.8.999~shared~cxx", when="+hdf5+hdf5_compat~shared") + depends_on("hdf5@1.8.19:1.8~cxx", when="+hdf5+hdf5_compat+shared") + depends_on("hdf5@1.8.19:1.8~shared~cxx", when="+hdf5+hdf5_compat~shared") depends_on("hdf5~cxx", when="+hdf5~hdf5_compat+shared") depends_on("hdf5~shared~cxx", when="+hdf5~hdf5_compat~shared") # we need to hand this to conduit so it can properly diff --git a/var/spack/repos/builtin/packages/converge/package.py b/var/spack/repos/builtin/packages/converge/package.py index 27bab2db62..038c743436 100644 --- a/var/spack/repos/builtin/packages/converge/package.py +++ b/var/spack/repos/builtin/packages/converge/package.py @@ -66,7 +66,7 @@ class Converge(Package): # $ spack spec converge@2.4.10 +mpi ^openmpi@:1.10 # # TODO: Add version ranges for other MPI libraries - depends_on('openmpi@1.10.0:1.10.999', when='@2.4.0:2.4.999+mpi^openmpi') + depends_on('openmpi@1.10.0:1.10', when='@2.4.0:2.4+mpi^openmpi') depends_on('openmpi@1.5:1.8', when='@2.2:2.3+mpi^openmpi') depends_on('openmpi@:1.4', when='@:2.1+mpi^openmpi') diff --git a/var/spack/repos/builtin/packages/cosmomc/package.py b/var/spack/repos/builtin/packages/cosmomc/package.py index ea4ddf5f4b..0f3061ce27 100644 --- a/var/spack/repos/builtin/packages/cosmomc/package.py +++ b/var/spack/repos/builtin/packages/cosmomc/package.py @@ -43,7 +43,7 @@ class Cosmomc(Package): depends_on('py-pandas', type=('build', 'run'), when='+python') depends_on('py-scipy', type=('build', 'run'), when='+python') depends_on('py-six', type=('build', 'run'), when='+python') - depends_on('python @2.7:2.999,3.4:', type=('build', 'run'), when='+python') + depends_on('python @2.7:2,3.4:', type=('build', 'run'), when='+python') patch('Makefile.patch') patch('errorstop.patch') diff --git a/var/spack/repos/builtin/packages/couchdb/package.py b/var/spack/repos/builtin/packages/couchdb/package.py index 4498247feb..481a49722e 100644 --- a/var/spack/repos/builtin/packages/couchdb/package.py +++ b/var/spack/repos/builtin/packages/couchdb/package.py @@ -26,7 +26,7 @@ class Couchdb(AutotoolsPackage): depends_on('gmake', type='build') depends_on('help2man', type='build') depends_on('python', type=('build', 'run')) - depends_on('erlang@:22.99', type=('build', 'run')) + depends_on('erlang@:22', type=('build', 'run')) def setup_build_environment(self, env): env.set('CPATH', self.spec['mozjs'].prefix.include.js) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 2d086d22a3..cc6a4881a4 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -98,10 +98,10 @@ class Cp2k(MakefilePackage, CudaPackage): with when('+libxc'): depends_on('pkgconfig', type='build', when='@7.0:') - depends_on('libxc@2.2.2:3.99.0', when='@:5.5999', type='build') - depends_on('libxc@4.0.3:4.99.0', when='@6.0:6.9', type='build') - depends_on('libxc@4.0.3:4.99.0', when='@7.0:8.1') - depends_on('libxc@5.1.3:5.1.99', when='@8.2:') + depends_on('libxc@2.2.2:3', when='@:5', type='build') + depends_on('libxc@4.0.3:4', when='@6.0:6.9', type='build') + depends_on('libxc@4.0.3:4', when='@7.0:8.1') + depends_on('libxc@5.1.3:5.1', when='@8.2:') with when('+mpi'): depends_on('mpi@2:') @@ -112,14 +112,14 @@ class Cp2k(MakefilePackage, CudaPackage): depends_on('cosma+cuda', when='+cuda') conflicts('~mpi') # COSMA support was introduced in 8+ - conflicts('@:7.999') + conflicts('@:7') with when('+elpa'): conflicts('~mpi', msg='elpa requires MPI') depends_on('elpa+openmp', when='+openmp') depends_on('elpa~openmp', when='~openmp') - depends_on('elpa@2011.12:2016.13', when='@:5.999') - depends_on('elpa@2011.12:2017.11', when='@6.0:6.999') + depends_on('elpa@2011.12:2016.13', when='@:5') + depends_on('elpa@2011.12:2017.11', when='@6.0:6') depends_on('elpa@2018.05:2020.11.001', when='@7.0:8.2') depends_on('elpa@2021.05:', when='@8.3:') @@ -132,7 +132,7 @@ class Cp2k(MakefilePackage, CudaPackage): # dynamically, therefore can't set this as pure build-type dependency. with when('+pexsi'): conflicts('~mpi', msg='pexsi requires MPI') - depends_on('pexsi+fortran@0.9.0:0.9.999', when='@:4.999') + depends_on('pexsi+fortran@0.9.0:0.9', when='@:4') depends_on('pexsi+fortran@0.10.0:', when='@5.0:') # only OpenMP should be consistently used, all other common things @@ -142,18 +142,18 @@ class Cp2k(MakefilePackage, CudaPackage): depends_on('sirius+fortran+shared') depends_on('sirius+openmp', when='+openmp') depends_on('sirius~openmp', when='~openmp') - depends_on('sirius@:6.999', when='@:7.999') - depends_on('sirius@7:7.0.999', when='@8:8.2') + depends_on('sirius@:6', when='@:7') + depends_on('sirius@7.0.0:7.0', when='@8:8.2') depends_on('sirius@7.2:', when='@8.3:') conflicts('~mpi') # sirius support was introduced in 7+ - conflicts('@:6.999') + conflicts('@:6') with when('+libvori'): depends_on('libvori@201219:', when='@8.1', type='build') depends_on('libvori@210412:', when='@8.2:', type='build') # libvori support was introduced in 8+ - conflicts('@:7.999') + conflicts('@:7') # the bundled libcusmm uses numpy in the parameter prediction (v7+) # which is written using Python 3 @@ -464,10 +464,10 @@ class Cp2k(MakefilePackage, CudaPackage): .format(elpa_suffix=elpa_suffix, dso_suffix=dso_suffix)))) - if spec.satisfies('@:4.999'): - if elpa.satisfies('@:2014.5.999'): + if spec.satisfies('@:4'): + if elpa.satisfies('@:2014.5'): cppflags.append('-D__ELPA') - elif elpa.satisfies('@2014.6:2015.10.999'): + elif elpa.satisfies('@2014.6:2015.10'): cppflags.append('-D__ELPA2') else: cppflags.append('-D__ELPA3') @@ -616,7 +616,7 @@ class Cp2k(MakefilePackage, CudaPackage): def build_directory(self): build_dir = self.stage.source_path - if self.spec.satisfies('@:6.9999'): + if self.spec.satisfies('@:6'): # prior to version 7.1 was the Makefile located in makefiles/ build_dir = join_path(build_dir, 'makefiles') diff --git a/var/spack/repos/builtin/packages/cpio/package.py b/var/spack/repos/builtin/packages/cpio/package.py index e3cc5a27d7..90f195bc90 100644 --- a/var/spack/repos/builtin/packages/cpio/package.py +++ b/var/spack/repos/builtin/packages/cpio/package.py @@ -33,7 +33,7 @@ class Cpio(AutotoolsPackage, GNUMirrorPackage): spec = self.spec if name == 'cflags': - if '%intel@:17.999' in spec: + if '%intel@:17' in spec: flags.append('-no-gcc') elif '%clang' in spec or '%fj' in spec: diff --git a/var/spack/repos/builtin/packages/creduce/package.py b/var/spack/repos/builtin/packages/creduce/package.py index 0975216955..bdcbfe12d7 100644 --- a/var/spack/repos/builtin/packages/creduce/package.py +++ b/var/spack/repos/builtin/packages/creduce/package.py @@ -22,7 +22,7 @@ class Creduce(CMakePackage): depends_on('flex') depends_on('libxml2') - depends_on('llvm@8.0.0', when='@:2.10.999') + depends_on('llvm@8.0.0', when='@:2.10') depends_on('perl') depends_on('perl-exporter-lite') depends_on('perl-file-which') diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 280e0844b0..5e246ce8b2 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -30,7 +30,7 @@ class Cube(AutotoolsPackage): variant('gui', default=True, description='Build Cube GUI') - patch('qt-version.patch', when='@4.3.0:4.3.999 +gui') + patch('qt-version.patch', when='@4.3.0:4.3 +gui') depends_on('cubelib@4.6', when='@4.6') depends_on('cubelib@4.5', when='@4.5') @@ -45,7 +45,7 @@ class Cube(AutotoolsPackage): depends_on('zlib') depends_on('qt@5:', when='@4.3.0: +gui') - depends_on('qt@4.8:', when='@4.2.0:4.2.999 +gui') + depends_on('qt@4.8:', when='@4.2.0:4.2 +gui') conflicts('~gui', when='@4.4:') diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index f7f5bc496f..aa3a8c532b 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -205,7 +205,7 @@ class Cudnn(Package): if pkg: version(long_ver, sha256=pkg) # Add constraints matching CUDA version to cuDNN version - cuda_req = 'cuda@{0}.0:{0}.999'.format(cuda_ver) + cuda_req = 'cuda@{0}.0:{0}'.format(cuda_ver) cudnn_ver_req = '@{0}'.format(long_ver) depends_on(cuda_req, when=cudnn_ver_req) diff --git a/var/spack/repos/builtin/packages/curl/package.py b/var/spack/repos/builtin/packages/curl/package.py index 7b04455e28..6781454ef0 100644 --- a/var/spack/repos/builtin/packages/curl/package.py +++ b/var/spack/repos/builtin/packages/curl/package.py @@ -74,7 +74,7 @@ class Curl(AutotoolsPackage): variant('ldap', default=False, description='enable ldap support') variant('libidn2', default=False, description='enable libidn2 support') - conflicts('+libssh', when='@:7.57.99') + conflicts('+libssh', when='@:7.57') # on OSX and --with-ssh the configure steps fails with # one or more libs available at link-time are not available run-time # unless the libssh are installed externally (e.g. via homebrew), even diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py index 6a9d661fc4..72a60497fc 100644 --- a/var/spack/repos/builtin/packages/damask-grid/package.py +++ b/var/spack/repos/builtin/packages/damask-grid/package.py @@ -15,7 +15,7 @@ class DamaskGrid(CMakePackage): version('3.0.0-alpha4', sha256='0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493') depends_on('cmake@3.10:', type='build') - depends_on('petsc+fftw@3.14.0:3.14.99,3.15.1:3.15.99') + depends_on('petsc+fftw@3.14.0:3.14,3.15.1:3.15') depends_on('hdf5+fortran') patch('CMakeDebugRelease.patch', when='@3.0.0-alpha4') diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py index 5f52ce43a3..9c4bd09af3 100644 --- a/var/spack/repos/builtin/packages/damask-mesh/package.py +++ b/var/spack/repos/builtin/packages/damask-mesh/package.py @@ -15,7 +15,7 @@ class DamaskMesh(CMakePackage): version('3.0.0-alpha4', sha256='0bb8bde43b27d852b1fb6e359a7157354544557ad83d87987b03f5d629ce5493') depends_on('cmake@3.10:', type='build') - depends_on('petsc@3.14.0:3.14.99,3.15.1:3.15.99') + depends_on('petsc@3.14.0:3.14,3.15.1:3.15') depends_on('hdf5+fortran') patch('CMakeDebugRelease.patch', when='@3.0.0-alpha4') diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 4f2db65802..fabedb23be 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -146,7 +146,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on('boost cxxstd=11', when='cxxstd=11') depends_on('boost cxxstd=14', when='cxxstd=14') depends_on('boost cxxstd=17', when='cxxstd=17') - depends_on('bzip2', when='@:8.99') + depends_on('bzip2', when='@:8') depends_on('lapack') depends_on('ninja', type='build') depends_on('suite-sparse') @@ -157,7 +157,7 @@ class Dealii(CMakePackage, CudaPackage): depends_on('cmake@3.9:', when='+cuda', type='build') # Older version of deal.II do not build with Cmake 3.10, see # https://github.com/dealii/dealii/issues/5510 - depends_on('cmake@:3.9.99', when='@:8.99', type='build') + depends_on('cmake@:3.9', when='@:8', type='build') depends_on('mpi', when='+mpi') depends_on('python', when='@8.5.0:+python') @@ -347,7 +347,7 @@ class Dealii(CMakePackage, CudaPackage): self.define('DEAL_II_ALLOW_BUNDLED', False) ]) - if spec.satisfies('@:8.99'): + if spec.satisfies('@:8'): options.extend([ # Cmake may still pick up system's bzip2, fix this: self.define('BZIP2_FOUND', True), diff --git a/var/spack/repos/builtin/packages/dihydrogen/package.py b/var/spack/repos/builtin/packages/dihydrogen/package.py index c621477b7e..1cc6ffc92f 100644 --- a/var/spack/repos/builtin/packages/dihydrogen/package.py +++ b/var/spack/repos/builtin/packages/dihydrogen/package.py @@ -62,9 +62,9 @@ class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): depends_on('catch2', type='test') # Specify the correct version of Aluminum - depends_on('aluminum@0.4:0.4.99', when='@0.1:0.1.99 +al') - depends_on('aluminum@0.5.0:0.5.99', when='@0.2.0 +al') - depends_on('aluminum@0.7.0:0.7.99', when='@0.2.1 +al') + depends_on('aluminum@0.4.0:0.4', when='@0.1 +al') + depends_on('aluminum@0.5.0:0.5', when='@0.2.0 +al') + depends_on('aluminum@0.7.0:0.7', when='@0.2.1 +al') depends_on('aluminum@0.7.0:', when='@:0.0,0.2.1: +al') # Add Aluminum variants @@ -83,7 +83,7 @@ class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): for when in ['+cuda', '+distconv']: depends_on('cuda', when=when) depends_on('cudnn', when=when) - depends_on('cub', when='^cuda@:10.99') + depends_on('cub', when='^cuda@:10') # Note that #1712 forces us to enumerate the different blas variants depends_on('openblas', when='blas=openblas') @@ -172,7 +172,7 @@ class Dihydrogen(CMakePackage, CudaPackage, ROCmPackage): args.append('-DcuDNN_DIR={0}'.format( spec['cudnn'].prefix)) - if spec.satisfies('^cuda@:10.99'): + if spec.satisfies('^cuda@:10'): if '+cuda' in spec or '+distconv' in spec: args.append('-DCUB_DIR={0}'.format( spec['cub'].prefix)) diff --git a/var/spack/repos/builtin/packages/draco/package.py b/var/spack/repos/builtin/packages/draco/package.py index 9c0dac3037..cd7807627e 100644 --- a/var/spack/repos/builtin/packages/draco/package.py +++ b/var/spack/repos/builtin/packages/draco/package.py @@ -49,18 +49,18 @@ class Draco(CMakePackage): variant('qt', default=False, description='Enable Qt support') variant('superlu_dist', default=True, description='Enable SuperLU-DIST support') - depends_on('cmake@3.9:', when='@:6.99', type='build') - depends_on('cmake@3.11:', when='@7.0.0:7.1.99', type='build') - depends_on('cmake@3.14:', when='@7.2.0:7.6.99', type='build') + depends_on('cmake@3.9:', when='@:6', type='build') + depends_on('cmake@3.11:', when='@7.0.0:7.1', type='build') + depends_on('cmake@3.14:', when='@7.2.0:7.6', type='build') depends_on('cmake@3.17:', when='@7.7:', type='build') depends_on('cmake@3.18:', when='@7.9:', type='build') - depends_on('gsl@:2.5.99', when='@:7.10.99') + depends_on('gsl@:2.5', when='@:7.10') depends_on('gsl@2.6:', when='@7.11.0:') depends_on('mpi@3:', type=('build', 'link', 'run')) depends_on('numdiff', type='build') - depends_on('random123@1.09', when='@:7.6.99') + depends_on('random123@1.09', when='@:7.6') depends_on('random123', when='@7.7.0:') - depends_on('python@2.7:', when='@:7.6.99', type=('build', 'run', 'test')) + depends_on('python@2.7:', when='@:7.6', type=('build', 'run', 'test')) depends_on('python@3.5:', when='@7.7.0:', type=('build', 'run', 'test')) # Optional dependencies @@ -73,17 +73,17 @@ class Draco(CMakePackage): depends_on('parmetis', when='+parmetis') depends_on('qt', when='+qt', type=('build', 'link', 'run')) - depends_on('superlu-dist@:5.99', when='@:7.6.99+superlu_dist') + depends_on('superlu-dist@:5', when='@:7.6+superlu_dist') depends_on('py-matplotlib', when='+pythontools', type=('run')) - conflicts('+cuda', when='@:7.6.99') - conflicts('+caliper', when='@:7.7.99') + conflicts('+cuda', when='@:7.6') + conflicts('+caliper', when='@:7.7') # Fix python discovery. patch('d710.patch', when='@7.1.0^python@3:') - patch('d710-python2.patch', when='@7.1.0^python@2.7:2.99') - patch('d730.patch', when='@7.3.0:7.3.99') - patch('d740.patch', when='@7.4.0:7.4.99') + patch('d710-python2.patch', when='@7.1.0^python@2.7:2') + patch('d730.patch', when='@7.3.0:7.3') + patch('d740.patch', when='@7.4.0:7.4') patch('d760-cray.patch', when='@7.6.0') patch('d770-nocuda.patch', when='@7.7.0') diff --git a/var/spack/repos/builtin/packages/dyninst/package.py b/var/spack/repos/builtin/packages/dyninst/package.py index 6e313c25f9..3288a7df56 100644 --- a/var/spack/repos/builtin/packages/dyninst/package.py +++ b/var/spack/repos/builtin/packages/dyninst/package.py @@ -44,7 +44,7 @@ class Dyninst(CMakePackage): boost_libs = '+atomic+chrono+date_time+filesystem+system+thread+timer' depends_on('boost@1.61.0:' + boost_libs, when='@10.1.0:') - depends_on('boost@1.61.0:1.69.99' + boost_libs, when='@:10.0.99') + depends_on('boost@1.61.0:1.69' + boost_libs, when='@:10.0') depends_on('boost@1.67.0:' + boost_libs, when='@11.0.0:') depends_on('libiberty+pic') @@ -54,22 +54,22 @@ class Dyninst(CMakePackage): # NB: Parallel DWARF parsing in Dyninst 10.2.0 requires a thread- # safe libdw depends_on('elfutils@0.178:', type='link', when='@10.2.0:') - depends_on('elfutils', type='link', when='@9.3.0:10.1.99') - depends_on('libelf', type='link', when='@:9.2.99') + depends_on('elfutils', type='link', when='@9.3.0:10.1') + depends_on('libelf', type='link', when='@:9.2') # Dyninst uses libdw from elfutils starting with 10.0, and used # libdwarf before that. - depends_on('libdwarf', when='@:9.99.99') + depends_on('libdwarf', when='@:9') depends_on('tbb@2018.6:', when='@10.0.0:') depends_on('cmake@3.4.0:', type='build', when='@10.1.0:') - depends_on('cmake@3.0.0:', type='build', when='@10.0.0:10.0.99') - depends_on('cmake@2.8:', type='build', when='@:9.99.99') + depends_on('cmake@3.0.0:', type='build', when='@10.0.0:10.0') + depends_on('cmake@2.8:', type='build', when='@:9') patch('stat_dysect.patch', when='+stat_dysect') patch('stackanalysis_h.patch', when='@9.2.0') - patch('v9.3.2-auto.patch', when='@9.3.2 %gcc@:4.7.99') + patch('v9.3.2-auto.patch', when='@9.3.2 %gcc@:4.7') patch('tribool.patch', when='@9.3.0:10.0.0 ^boost@1.69:') # No Mac support (including apple-clang) @@ -86,12 +86,12 @@ class Dyninst(CMakePackage): conflicts('%xl_r') # Version 11.0 requires a C++11-compliant ABI - conflicts('%gcc@:5.99.99', when='@11.0.0:') + conflicts('%gcc@:5', when='@11.0.0:') # Versions 9.3.x used cotire, but have no knob to turn it off. # Cotire has no real use for one-time builds and can break # parallel builds with both static and shared libs. - @when('@9.3.0:9.3.99') + @when('@9.3.0:9.3') def patch(self): filter_file('USE_COTIRE true', 'USE_COTIRE false', 'cmake/shared.cmake') @@ -126,7 +126,7 @@ class Dyninst(CMakePackage): return args # Old style cmake args, up through 10.0. - @when('@:10.0.99') + @when('@:10.0') def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index 01b9988f11..97ecab41d6 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -45,9 +45,9 @@ class Eccodes(CMakePackage): depends_on('netcdf-c', when='+netcdf') # Cannot be built with openjpeg@2.0.x. - depends_on('openjpeg@1.5.0:1.5.999,2.1.0:2.3.999', when='jp2k=openjpeg') + depends_on('openjpeg@1.5.0:1.5,2.1.0:2.3', when='jp2k=openjpeg') # Additional constraint for older versions. - depends_on('openjpeg@:2.1.999', when='@:2.16 jp2k=openjpeg') + depends_on('openjpeg@:2.1', when='@:2.16 jp2k=openjpeg') depends_on('jasper', when='jp2k=jasper') depends_on('libpng', when='+png') depends_on('libaec', when='+aec') @@ -56,7 +56,7 @@ class Eccodes(CMakePackage): # The interface is available only for Python 2. # Python 3 interface is available as a separate packages: # https://confluence.ecmwf.int/display/ECC/Python+3+interface+for+ecCodes - depends_on('python@2.6:2.999', when='+python', + depends_on('python@2.6:2', when='+python', type=('build', 'link', 'run')) depends_on('py-numpy', when='+python', type=('build', 'run')) extends('python', when='+python') diff --git a/var/spack/repos/builtin/packages/edm4hep/package.py b/var/spack/repos/builtin/packages/edm4hep/package.py index 1cdad385cb..4fdb7e476b 100644 --- a/var/spack/repos/builtin/packages/edm4hep/package.py +++ b/var/spack/repos/builtin/packages/edm4hep/package.py @@ -31,7 +31,7 @@ class Edm4hep(CMakePackage): depends_on('root@6.08:') depends_on('podio@0.13:') - depends_on('hepmc@:2.99.99', type='test') + depends_on('hepmc@:2', type='test') depends_on('heppdt', type='test') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index 6ab9ba299a..001f9c21f4 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -44,9 +44,9 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): patch('python_shebang.patch', when='@:2020.05.001') # fails to build due to broken type-bound procedures in OMP parallel regions - conflicts('+openmp', when='@2021.05.001: %gcc@:7.999', + conflicts('+openmp', when='@2021.05.001: %gcc@:7', msg='ELPA-2021.05.001+ requires GCC-8+ for OpenMP support') - conflicts('+rocm', when='@:2020.99', + conflicts('+rocm', when='@:2020', msg='ROCm support was introduced in ELPA 2021.05.001') conflicts('+mpi', when='+rocm', msg='ROCm support and MPI are not yet compatible') diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index f304be6525..a45d726fd0 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -59,7 +59,7 @@ class Emacs(AutotoolsPackage, GNUMirrorPackage): depends_on('gcc@11: +strip languages=jit', when="+native") conflicts('@:26.3', when='platform=darwin os=catalina') - conflicts('+native', when='@:27.99.99', msg="native compilation require @master") + conflicts('+native', when='@:27', msg="native compilation require @master") @when('platform=darwin') def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/embree/package.py b/var/spack/repos/builtin/packages/embree/package.py index 524e8ec9c6..b6c6c0f7f3 100644 --- a/var/spack/repos/builtin/packages/embree/package.py +++ b/var/spack/repos/builtin/packages/embree/package.py @@ -51,7 +51,7 @@ class Embree(CMakePackage): self.define('EMBREE_ISA_AVX512SKX', True), ] - if spec.satisfies('%gcc@:7.99'): + if spec.satisfies('%gcc@:7'): # remove unsupported -mprefer-vector-width=256, otherwise copied # from common/cmake/gnu.cmake args.append('-DFLAGS_AVX512SKX=-mavx512f -mavx512dq -mavx512cd' diff --git a/var/spack/repos/builtin/packages/esmf/package.py b/var/spack/repos/builtin/packages/esmf/package.py index 3f65662ae7..28ce836bec 100644 --- a/var/spack/repos/builtin/packages/esmf/package.py +++ b/var/spack/repos/builtin/packages/esmf/package.py @@ -47,25 +47,25 @@ class Esmf(MakefilePackage): depends_on('perl', type='test') # Make esmf build with newer intel versions - patch('intel.patch', when='@:7.0.99 %intel@17:') + patch('intel.patch', when='@:7.0 %intel@17:') # Make esmf build with newer gcc versions # https://sourceforge.net/p/esmf/esmf/ci/3706bf758012daebadef83d6575c477aeff9c89b/ - patch('gcc.patch', when='@:7.0.99 %gcc@6:') + patch('gcc.patch', when='@:7.0 %gcc@6:') # Fix undefined reference errors with mvapich2 # https://sourceforge.net/p/esmf/esmf/ci/34de0ccf556ba75d35c9687dae5d9f666a1b2a18/ - patch('mvapich2.patch', when='@:7.0.99') + patch('mvapich2.patch', when='@:7.0') # Allow different directories for creation and # installation of dynamic libraries on OSX: - patch('darwin_dylib_install_name.patch', when='platform=darwin @:7.0.99') + patch('darwin_dylib_install_name.patch', when='platform=darwin @:7.0') # Missing include file for newer gcc compilers # https://trac.macports.org/ticket/57493 patch('cstddef.patch', when='@7.1.0r %gcc@8:') # Make script from mvapich2.patch executable - @when('@:7.0.99') + @when('@:7.0') @run_before('build') def chmod_scripts(self): chmod = which('chmod') diff --git a/var/spack/repos/builtin/packages/evtgen/package.py b/var/spack/repos/builtin/packages/evtgen/package.py index b827a36fd9..4e01e0953b 100644 --- a/var/spack/repos/builtin/packages/evtgen/package.py +++ b/var/spack/repos/builtin/packages/evtgen/package.py @@ -41,7 +41,7 @@ class Evtgen(CMakePackage): "evtgen with pythia bindings results in a circular dependency " "that cannot be resolved at the moment! " "Use evtgen+pythia8^pythia8~evtgen.") - conflicts('+hepmc3', when='@:01.99.99', + conflicts('+hepmc3', when='@:01', msg='hepmc3 support was added in 02.00.00') def cmake_args(self): @@ -67,7 +67,7 @@ class Evtgen(CMakePackage): with working_dir(self.build_directory, create=True): inspect.getmodule(self).configure(*options) - @when('@:01.99.99') + @when('@:01') def configure_args(self): args = [] @@ -81,11 +81,11 @@ class Evtgen(CMakePackage): return args - @when('@:01.99.99') + @when('@:01') def cmake(self, spec, prefix): pass - @when('@:01.99.99') + @when('@:01') def build(self, spec, prefix): self.configure(spec, prefix) # avoid parallel compilation errors @@ -94,7 +94,7 @@ class Evtgen(CMakePackage): make('lib_shared') make('all') - @when('@:01.99.99') + @when('@:01') def install(self, spec, prefix): with working_dir(self.build_directory): make('install') diff --git a/var/spack/repos/builtin/packages/fairlogger/package.py b/var/spack/repos/builtin/packages/fairlogger/package.py index e2112215e2..6a09ea71d9 100644 --- a/var/spack/repos/builtin/packages/fairlogger/package.py +++ b/var/spack/repos/builtin/packages/fairlogger/package.py @@ -42,14 +42,14 @@ class Fairlogger(CMakePackage): variant('pretty', default=False, description='Use BOOST_PRETTY_FUNCTION macro (Supported by 1.4+).') - conflicts('+pretty', when='@:1.3.99') + conflicts('+pretty', when='@:1.3') depends_on('cmake@3.9.4:', type='build') depends_on('git', type='build', when='@develop') depends_on('boost', when='+pretty') conflicts('^boost@1.70:', when='^cmake@:3.14') - depends_on('fmt@5.3.0:5.99', when='@1.6.0:1.6.1') + depends_on('fmt@5.3.0:5', when='@1.6.0:1.6.1') depends_on('fmt@5.3.0:', when='@1.6.2:') def patch(self): @@ -71,6 +71,6 @@ class Fairlogger(CMakePackage): args.append(self.define_from_variant('USE_BOOST_PRETTY_FUNCTION', 'pretty')) if self.spec.satisfies('@1.6:'): args.append('-DUSE_EXTERNAL_FMT=ON') - if self.spec.satisfies('^boost@:1.69.99'): + if self.spec.satisfies('^boost@:1.69'): args.append('-DBoost_NO_BOOST_CMAKE=ON') return args diff --git a/var/spack/repos/builtin/packages/fenics/package.py b/var/spack/repos/builtin/packages/fenics/package.py index 164148149a..72c1766ee9 100644 --- a/var/spack/repos/builtin/packages/fenics/package.py +++ b/var/spack/repos/builtin/packages/fenics/package.py @@ -102,7 +102,7 @@ class Fenics(CMakePackage): depends_on('zlib', when='+zlib') depends_on('boost+filesystem+program_options+system+iostreams+timer+regex+chrono') - depends_on('boost+filesystem+program_options+system+iostreams+timer+regex+chrono@1.68.0', when='@:2018.99') + depends_on('boost+filesystem+program_options+system+iostreams+timer+regex+chrono@1.68.0', when='@:2018') depends_on('mpi', when='+mpi') depends_on('hdf5+hl+fortran', when='+hdf5+petsc') diff --git a/var/spack/repos/builtin/packages/ferret/package.py b/var/spack/repos/builtin/packages/ferret/package.py index 7131b78332..41e4ac82f4 100644 --- a/var/spack/repos/builtin/packages/ferret/package.py +++ b/var/spack/repos/builtin/packages/ferret/package.py @@ -38,7 +38,7 @@ class Ferret(Package): # Make Java dependency optional with older versions of Ferret patch('https://github.com/NOAA-PMEL/Ferret/commit/c7eb70a0b17045c8ca7207d586bfea77a5340668.patch', sha256='5bd581db4578c013faed375844b206fbe71f93fe9ce60f8f9f41d64abc6a5972', - level=1, working_dir='FERRET', when='@:6.99') + level=1, working_dir='FERRET', when='@:6') resource(name='datasets', url='https://github.com/NOAA-PMEL/FerretDatasets/archive/v7.6.tar.gz', diff --git a/var/spack/repos/builtin/packages/ffmpeg/package.py b/var/spack/repos/builtin/packages/ffmpeg/package.py index b0d05d3501..4310ae9837 100644 --- a/var/spack/repos/builtin/packages/ffmpeg/package.py +++ b/var/spack/repos/builtin/packages/ffmpeg/package.py @@ -93,19 +93,19 @@ class Ffmpeg(AutotoolsPackage): depends_on('xz', when='+lzma') # TODO: enable when libxml2 header issue is resolved - # conflicts('+libxml2', when='@:3.999') + # conflicts('+libxml2', when='@:3') # See: https://www.ffmpeg.org/index.html#news (search AV1) - conflicts('+libaom', when='@:3.999') + conflicts('+libaom', when='@:3') # All of the following constraints were sourced from the official 'ffmpeg' # change log, which can be found here: # https://raw.githubusercontent.com/FFmpeg/FFmpeg/release/4.0/Changelog - conflicts('+sdl2', when='@:3.1.999') - conflicts('+libsnappy', when='@:2.7.999') - conflicts('+X', when='@:2.4.999') - conflicts('+lzma', when='@2.3.999:') - conflicts('+libwebp', when='@2.1.999:') - conflicts('+libssh', when='@2.0.999:') - conflicts('+libzmq', when='@:1.999.999') + conflicts('+sdl2', when='@:3.1') + conflicts('+libsnappy', when='@:2.7') + conflicts('+X', when='@:2.4') + conflicts('+lzma', when='@2.3:') + conflicts('+libwebp', when='@2.1:') + conflicts('+libssh', when='@2.1:') + conflicts('+libzmq', when='@:1') conflicts('%nvhpc') @property diff --git a/var/spack/repos/builtin/packages/fftw/package.py b/var/spack/repos/builtin/packages/fftw/package.py index 890002b131..4d29bf58f1 100644 --- a/var/spack/repos/builtin/packages/fftw/package.py +++ b/var/spack/repos/builtin/packages/fftw/package.py @@ -29,7 +29,7 @@ class FftwBase(AutotoolsPackage): depends_on('llvm-openmp', when='%apple-clang +openmp') # https://github.com/FFTW/fftw3/commit/902d0982522cdf6f0acd60f01f59203824e8e6f3 - conflicts('%gcc@8:8.9999', when="@3.3.7") + conflicts('%gcc@8.0:8', when="@3.3.7") conflicts('precision=long_double', when='@2.1.5', msg='Long double precision is not supported in FFTW 2') conflicts('precision=quad', when='@2.1.5', diff --git a/var/spack/repos/builtin/packages/fides/package.py b/var/spack/repos/builtin/packages/fides/package.py index edf27369ee..6e405aeb03 100644 --- a/var/spack/repos/builtin/packages/fides/package.py +++ b/var/spack/repos/builtin/packages/fides/package.py @@ -23,7 +23,7 @@ class Fides(CMakePackage): variant('vtk-m', default=True, description="build VTK-m support") # Certain CMake versions have been found to break for our use cases - depends_on("cmake@3.14.1:3.14.99,3.18.2:", type='build') + depends_on("cmake@3.14.1:3.14,3.18.2:", type='build') depends_on("mpi", when="+mpi") depends_on('adios2~zfp', when='+adios2') diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py index 76e5a894ae..c49a060b25 100644 --- a/var/spack/repos/builtin/packages/findutils/package.py +++ b/var/spack/repos/builtin/packages/findutils/package.py @@ -50,7 +50,7 @@ class Findutils(AutotoolsPackage, GNUMirrorPackage): # Detect this case and use the fallback path. patch('nvhpc.patch', when='@4.6.0 %nvhpc') # Workaround bug where __LONG_WIDTH__ is not defined - patch('nvhpc-long-width.patch', when='@4.8.0:4.8.99 %nvhpc') + patch('nvhpc-long-width.patch', when='@4.8.0:4.8 %nvhpc') build_directory = 'spack-build' diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py index 899188fe6b..6767c93331 100644 --- a/var/spack/repos/builtin/packages/flecsi/package.py +++ b/var/spack/repos/builtin/packages/flecsi/package.py @@ -95,7 +95,7 @@ class Flecsi(CMakePackage, CudaPackage): depends_on('python@3.0:', when='+tutorial @:1.9') depends_on('doxygen', when='+doxygen @:1.9') depends_on('llvm', when='+flecstan @:1.9') - depends_on('pfunit@3.0:3.99', when='@:1.9') + depends_on('pfunit@3.0:3', when='@:1.9') depends_on('py-gcovr', when='+coverage @:1.9') # FleCSI@2.x diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index ad95d5a019..8cb514c426 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -43,14 +43,14 @@ class FluxCore(AutotoolsPackage): depends_on("libzmq@4.0.4:") depends_on("czmq@3.0.1:") - depends_on("hwloc@1.11.1:1.99", when="@:0.17.0") + depends_on("hwloc@1.11.1:1", when="@:0.17.0") depends_on("hwloc@1.11.1:", when="@0.17.0:") depends_on("hwloc +cuda", when='+cuda') # Provide version hints for lua so that the concretizer succeeds when no # explicit flux-core version is given. See issue #10000 for details depends_on("lua", type=('build', 'run', 'link')) - depends_on("lua@5.1:5.2.99", when="@:0.17.0") - depends_on("lua@5.1:5.3.99", when="@0.18.0:,master") + depends_on("lua@5.1:5.2", when="@:0.17.0") + depends_on("lua@5.1:5.3", when="@0.18.0:,master") depends_on("lua-luaposix") # `link` dependency on python due to Flux's `pymod` module depends_on("python@3.6:", type=('build', 'run', 'link')) @@ -180,7 +180,7 @@ class FluxCore(AutotoolsPackage): if name == 'cflags': # https://github.com/flux-framework/flux-core/issues/3482 if self.spec.satisfies('%gcc@10:') and \ - self.spec.satisfies('@0.23.0:0.23.99'): + self.spec.satisfies('@0.23.0:0.23'): if flags is None: flags = [] flags.append('-Wno-error=stringop-truncation') diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 2857a58ea7..97e76c216d 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -46,9 +46,9 @@ class FluxSched(AutotoolsPackage): depends_on("flux-core", type=('build', 'link', 'run')) depends_on("flux-core+cuda", when='+cuda', type=('build', 'run', 'link')) - depends_on("flux-core@0.16.0:0.16.99", when='@0.8.0', type=('build', 'run', 'link')) + depends_on("flux-core@0.16.0:0.16", when='@0.8.0', type=('build', 'run', 'link')) depends_on("flux-core@0.22.0", when='@0.14.0', type=('build', 'run', 'link')) - depends_on("flux-core@0.23.0:0.25.99", when='@0.15.0', type=('build', 'run', 'link')) + depends_on("flux-core@0.23.0:0.25", when='@0.15.0', type=('build', 'run', 'link')) depends_on("flux-core@0.26.0:", when='@0.16.0', type=('build', 'run', 'link')) depends_on("flux-core@0.28.0:", when='@0.17.0', type=('build', 'run', 'link')) depends_on("flux-core@master", when='@master', type=('build', 'run', 'link')) diff --git a/var/spack/repos/builtin/packages/fmt/package.py b/var/spack/repos/builtin/packages/fmt/package.py index 74aa5eb301..0e1ea4c747 100644 --- a/var/spack/repos/builtin/packages/fmt/package.py +++ b/var/spack/repos/builtin/packages/fmt/package.py @@ -42,8 +42,8 @@ class Fmt(CMakePackage): # Supported compilers/standards are detailed here: # http://fmtlib.net/latest/index.html#portability - conflicts('%gcc@:4.3.999', when='@5:') - conflicts('%llvm@:2.8.999', when='@5:') + conflicts('%gcc@:4.3', when='@5:') + conflicts('%llvm@:2.8', when='@5:') # 5 and above require C++11 conflicts('cxxstd=98', when='@5:') # 5.0.0 enables C++14 auto return types in C++11 mode diff --git a/var/spack/repos/builtin/packages/fstrack/package.py b/var/spack/repos/builtin/packages/fstrack/package.py index 0e76ccf63b..c14a0ba190 100644 --- a/var/spack/repos/builtin/packages/fstrack/package.py +++ b/var/spack/repos/builtin/packages/fstrack/package.py @@ -19,7 +19,7 @@ class Fstrack(MakefilePackage): variant('flow', default=True, description='Build the flow tracker') - depends_on('gmt@4.0:4.999', when='+flow') + depends_on('gmt@4.0:4', when='+flow') depends_on('netcdf-c', when='+flow') parallel = False diff --git a/var/spack/repos/builtin/packages/ganglia/package.py b/var/spack/repos/builtin/packages/ganglia/package.py index 1c70084c5b..0c98d7e0ea 100644 --- a/var/spack/repos/builtin/packages/ganglia/package.py +++ b/var/spack/repos/builtin/packages/ganglia/package.py @@ -25,7 +25,7 @@ class Ganglia(AutotoolsPackage): depends_on('libtool', type='build') depends_on('apr') depends_on('libconfuse') - depends_on('python@:2.7.999') + depends_on('python@:2.7') depends_on('pcre') depends_on('libtirpc') depends_on('expat') diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 52e099fc40..a7d37c8651 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -36,9 +36,9 @@ class Gaudi(CMakePackage): description='Build with Intel VTune profiler support') # only build subdirectory GaudiExamples when +optional - patch("build_testing.patch", when="@:34.99") + patch("build_testing.patch", when="@:34") # fixes for the cmake config which could not find newer boost versions - patch("link_target_fixes.patch", when="@33.0:34.99") + patch("link_target_fixes.patch", when="@33.0:34") patch("link_target_fixes32.patch", when="@:32.2") # These dependencies are needed for a minimal Gaudi build @@ -52,9 +52,9 @@ class Gaudi(CMakePackage): depends_on('uuid') depends_on('nlohmann-json', when="@35.0:") depends_on('python', type=('build', 'run')) - depends_on('python@:3.7.99', when='@32.2:34.99', type=('build', 'run')) - depends_on('python@:2.99.99', when='@:32.1', type=('build', 'run')) - depends_on('py-setuptools@:45.99.99', when='^python@:2.7.99', type='build') + depends_on('python@:3.7', when='@32.2:34', type=('build', 'run')) + depends_on('python@:2', when='@:32.1', type=('build', 'run')) + depends_on('py-setuptools@:45', when='^python@:2.7', type='build') depends_on('py-six', type=('build', 'run')) depends_on('py-xenv@1:', when='@:34.9', type=('build', 'run')) depends_on('range-v3') @@ -71,15 +71,15 @@ class Gaudi(CMakePackage): depends_on('gperftools', when='+optional') depends_on('gdb', when='+optional') depends_on('gsl', when='+optional') - depends_on('heppdt@:2.99.99', when='+optional') + depends_on('heppdt@:2', when='+optional') depends_on('jemalloc', when='+optional') depends_on('libpng', when='+optional') depends_on('libunwind', when='+optional') - depends_on('py-networkx@:2.2', when='+optional ^python@:2.7.99') + depends_on('py-networkx@:2.2', when='+optional ^python@:2.7') depends_on('py-networkx', when='+optional ^python@3.0.0:') depends_on('py-setuptools', when='+optional') depends_on('py-nose', when='+optional') - depends_on('relax', when='@:33.99 +optional') + depends_on('relax', when='@:33 +optional') depends_on('xerces-c', when='+optional') # NOTE: pocl cannot be added as a minimal OpenCL implementation because # ROOT does not like being exposed to LLVM symbols. @@ -105,7 +105,7 @@ class Gaudi(CMakePackage): self.define("GAUDI_USE_INTELAMPLIFIER", False), self.define("GAUDI_USE_GPERFTOOLS", False), ] # this is not really used in spack builds, but needs to be set - if self.spec.version < Version('34.99'): + if self.spec.version < Version('34'): args.append("-DHOST_BINARY_TAG=x86_64-linux-gcc9-opt") return args diff --git a/var/spack/repos/builtin/packages/gaussian-view/package.py b/var/spack/repos/builtin/packages/gaussian-view/package.py index d690419aa8..caa3d71bf1 100644 --- a/var/spack/repos/builtin/packages/gaussian-view/package.py +++ b/var/spack/repos/builtin/packages/gaussian-view/package.py @@ -40,11 +40,11 @@ class GaussianView(Package): description='Use gaussian-src instead of gaussian (prebuilt binary)' ) - depends_on('gaussian@16-B.01', type='run', when='@:6.0.99') + depends_on('gaussian@16-B.01', type='run', when='@:6.0') 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.99') + conflicts('+gaussian-src', when='@:6.0') depends_on('libx11', type=('run', 'link')) depends_on('libxext', type=('run', 'link')) @@ -101,7 +101,7 @@ files as documented here: https://spack.readthedocs.io/en/latest/build_settings.html#package-permissions""" .format(perm_script_path)) - @when('@:6.0.99') + @when('@:6.0') def setup_run_environment(self, env): env.set('GV_DIR', self.prefix) diff --git a/var/spack/repos/builtin/packages/gdal/package.py b/var/spack/repos/builtin/packages/gdal/package.py index a1cf3c389f..ad69198a91 100644 --- a/var/spack/repos/builtin/packages/gdal/package.py +++ b/var/spack/repos/builtin/packages/gdal/package.py @@ -107,7 +107,7 @@ class Gdal(AutotoolsPackage): # Required dependencies depends_on('libtiff@3.6.0:') # 3.9.0+ needed to pass testsuite depends_on('libgeotiff@1.2.1:1.4', when='@:2.4.0') - depends_on('libgeotiff@1.2.1:1.5', when='@2.4.1:2.4.99') + depends_on('libgeotiff@1.2.1:1.5', when='@2.4.1:2.4') depends_on('libgeotiff@1.5:', when='@3.0.0:') depends_on('json-c') depends_on('json-c@0.12.1', when='@:2.2') @@ -145,9 +145,9 @@ class Gdal(AutotoolsPackage): depends_on('poppler@:0.63', when='@:2.3 +poppler') depends_on('poppler@:0.71', when='@:2.4 +poppler') depends_on('poppler@0.24:', when='@3: +poppler') - depends_on('proj@:4', when='+proj @2.3.0:2.3.999') - depends_on('proj@:5', when='+proj @2.4.0:2.4.999') - depends_on('proj@:6', when='+proj @2.5:2.999') + depends_on('proj@:4', when='+proj @2.3.0:2.3') + depends_on('proj@:5', when='+proj @2.4.0:2.4') + depends_on('proj@:6', when='+proj @2.5:2') depends_on('proj@6:', when='+proj @3:') depends_on('perl', type=('build', 'run'), when='+perl') # see gdal_version_and_min_supported_python_version @@ -164,7 +164,7 @@ class Gdal(AutotoolsPackage): depends_on('java@4:', type=('build', 'link', 'run'), when='@:2.0+java') depends_on('ant', type='build', when='+java') depends_on('swig', type='build', when='+java') - depends_on('jackcess@1.2.0:1.2.999', type='run', when='+mdb') + depends_on('jackcess@1.2.0:1.2', type='run', when='+mdb') depends_on('armadillo', when='+armadillo') depends_on('cryptopp', when='+cryptopp @2.1:') depends_on('openssl', when='+crypto @2.3:') diff --git a/var/spack/repos/builtin/packages/geant4-data/package.py b/var/spack/repos/builtin/packages/geant4-data/package.py index c69b190861..c3c91f3b32 100644 --- a/var/spack/repos/builtin/packages/geant4-data/package.py +++ b/var/spack/repos/builtin/packages/geant4-data/package.py @@ -37,77 +37,77 @@ class Geant4Data(BundlePackage): # they generally don't change on the patch level # Can move to declaring on a dataset basis if needed # geant4@10.7.X - depends_on("g4ndl@4.6", when='@10.7.0:10.7.9999') - depends_on("g4emlow@7.13", when='@10.7.0:10.7.9999') - depends_on("g4photonevaporation@5.7", when='@10.7.0:10.7.9999') - depends_on("g4radioactivedecay@5.6", when='@10.7.0:10.7.9999') - depends_on("g4particlexs@3.1.1", when='@10.7.1:10.7.9999') + depends_on("g4ndl@4.6", when='@10.7.0:10.7') + depends_on("g4emlow@7.13", when='@10.7.0:10.7') + depends_on("g4photonevaporation@5.7", when='@10.7.0:10.7') + depends_on("g4radioactivedecay@5.6", when='@10.7.0:10.7') + depends_on("g4particlexs@3.1.1", when='@10.7.1:10.7') depends_on("g4particlexs@3.1", when='@10.7.0') - depends_on("g4pii@1.3", when='@10.7.0:10.7.9999') - depends_on("g4realsurface@2.2", when='@10.7.0:10.7.9999') - depends_on("g4saiddata@2.0", when='@10.7.0:10.7.9999') - depends_on("g4abla@3.1", when='@10.7.0:10.7.9999') - depends_on("g4incl@1.0", when='@10.7.0:10.7.9999') - depends_on("g4ensdfstate@2.3", when='@10.7.0:10.7.9999') + depends_on("g4pii@1.3", when='@10.7.0:10.7') + depends_on("g4realsurface@2.2", when='@10.7.0:10.7') + depends_on("g4saiddata@2.0", when='@10.7.0:10.7') + depends_on("g4abla@3.1", when='@10.7.0:10.7') + depends_on("g4incl@1.0", when='@10.7.0:10.7') + depends_on("g4ensdfstate@2.3", when='@10.7.0:10.7') # geant4@10.6.X - depends_on("g4ndl@4.6", when='@10.6.0:10.6.9999') + depends_on("g4ndl@4.6", when='@10.6.0:10.6') depends_on("g4emlow@7.9", when='@10.6.0') - depends_on("g4emlow@7.9.1", when='@10.6.1:10.6.9999') - depends_on("g4photonevaporation@5.5", when='@10.6.0:10.6.9999') - depends_on("g4radioactivedecay@5.4", when='@10.6.0:10.6.9999') - depends_on("g4particlexs@2.1", when='@10.6.0:10.6.9999') - depends_on("g4pii@1.3", when='@10.6.0:10.6.9999') - depends_on("g4realsurface@2.1.1", when='@10.6.0:10.6.9999') - depends_on("g4saiddata@2.0", when='@10.6.0:10.6.9999') - depends_on("g4abla@3.1", when='@10.6.0:10.6.9999') - depends_on("g4incl@1.0", when='@10.6.0:10.6.9999') - depends_on("g4ensdfstate@2.2", when='@10.6.0:10.6.9999') + depends_on("g4emlow@7.9.1", when='@10.6.1:10.6') + depends_on("g4photonevaporation@5.5", when='@10.6.0:10.6') + depends_on("g4radioactivedecay@5.4", when='@10.6.0:10.6') + depends_on("g4particlexs@2.1", when='@10.6.0:10.6') + depends_on("g4pii@1.3", when='@10.6.0:10.6') + depends_on("g4realsurface@2.1.1", when='@10.6.0:10.6') + depends_on("g4saiddata@2.0", when='@10.6.0:10.6') + depends_on("g4abla@3.1", when='@10.6.0:10.6') + depends_on("g4incl@1.0", when='@10.6.0:10.6') + depends_on("g4ensdfstate@2.2", when='@10.6.0:10.6') # geant4@10.5.X - depends_on("g4ndl@4.5", when='@10.5.0:10.5.9999') - depends_on("g4emlow@7.7", when='@10.5.0:10.5.9999') - depends_on("g4photonevaporation@5.3", when='@10.5.0:10.5.9999') - depends_on("g4radioactivedecay@5.3", when='@10.5.0:10.5.9999') - depends_on("g4particlexs@1.1", when='@10.5.0:10.5.9999') - depends_on("g4pii@1.3", when='@10.5.0:10.5.9999') - depends_on("g4realsurface@2.1.1", when='@10.5.0:10.5.9999') - depends_on("g4saiddata@2.0", when='@10.5.0:10.5.9999') - depends_on("g4abla@3.1", when='@10.5.0:10.5.9999') - depends_on("g4incl@1.0", when='@10.5.0:10.5.9999') - depends_on("g4ensdfstate@2.2", when='@10.5.0:10.5.9999') + depends_on("g4ndl@4.5", when='@10.5.0:10.5') + depends_on("g4emlow@7.7", when='@10.5.0:10.5') + depends_on("g4photonevaporation@5.3", when='@10.5.0:10.5') + depends_on("g4radioactivedecay@5.3", when='@10.5.0:10.5') + depends_on("g4particlexs@1.1", when='@10.5.0:10.5') + depends_on("g4pii@1.3", when='@10.5.0:10.5') + depends_on("g4realsurface@2.1.1", when='@10.5.0:10.5') + depends_on("g4saiddata@2.0", when='@10.5.0:10.5') + depends_on("g4abla@3.1", when='@10.5.0:10.5') + depends_on("g4incl@1.0", when='@10.5.0:10.5') + depends_on("g4ensdfstate@2.2", when='@10.5.0:10.5') # geant4@10.4.X - depends_on("g4ndl@4.5", when='@10.4.0:10.4.9999') - depends_on("g4emlow@7.3", when='@10.4.0:10.4.9999') - depends_on("g4photonevaporation@5.2", when='@10.4.0:10.4.9999') - depends_on("g4radioactivedecay@5.2", when='@10.4.0:10.4.9999') - depends_on("g4neutronxs@1.4", when='@10.4.0:10.4.9999') - depends_on("g4pii@1.3", when='@10.4.0:10.4.9999') - - depends_on("g4realsurface@2.1.1", when='@10.4.2:10.4.9999') + depends_on("g4ndl@4.5", when='@10.4.0:10.4') + depends_on("g4emlow@7.3", when='@10.4.0:10.4') + depends_on("g4photonevaporation@5.2", when='@10.4.0:10.4') + depends_on("g4radioactivedecay@5.2", when='@10.4.0:10.4') + depends_on("g4neutronxs@1.4", when='@10.4.0:10.4') + depends_on("g4pii@1.3", when='@10.4.0:10.4') + + depends_on("g4realsurface@2.1.1", when='@10.4.2:10.4') depends_on("g4realsurface@2.1", when='@10.4.0:10.4.1') - depends_on("g4saiddata@1.1", when='@10.4.0:10.4.9999') - depends_on("g4abla@3.1", when='@10.4.0:10.4.9999') - depends_on("g4ensdfstate@2.2", when='@10.4.0:10.4.9999') + depends_on("g4saiddata@1.1", when='@10.4.0:10.4') + depends_on("g4abla@3.1", when='@10.4.0:10.4') + depends_on("g4ensdfstate@2.2", when='@10.4.0:10.4') # geant4@10.3.X - depends_on("g4ndl@4.5", when='@10.3.0:10.3.9999') - depends_on("g4emlow@6.50", when='@10.3.0:10.3.9999') + depends_on("g4ndl@4.5", when='@10.3.0:10.3') + depends_on("g4emlow@6.50", when='@10.3.0:10.3') - depends_on("g4photonevaporation@4.3.2", when='@10.3.1:10.3.9999') + depends_on("g4photonevaporation@4.3.2", when='@10.3.1:10.3') depends_on("g4photonevaporation@4.3", when='@10.3.0') - depends_on("g4radioactivedecay@5.1.1", when='@10.3.1:10.3.9999') + depends_on("g4radioactivedecay@5.1.1", when='@10.3.1:10.3') depends_on("g4radioactivedecay@5.1", when='@10.3.0') - depends_on("g4neutronxs@1.4", when='@10.3.0:10.3.9999') - depends_on("g4pii@1.3", when='@10.3.0:10.3.9999') - depends_on("g4realsurface@1.0", when='@10.3.0:10.3.9999') - depends_on("g4saiddata@1.1", when='@10.3.0:10.3.9999') - depends_on("g4abla@3.0", when='@10.3.0:10.3.9999') - depends_on("g4ensdfstate@2.1", when='@10.3.0:10.3.9999') + depends_on("g4neutronxs@1.4", when='@10.3.0:10.3') + depends_on("g4pii@1.3", when='@10.3.0:10.3') + depends_on("g4realsurface@1.0", when='@10.3.0:10.3') + depends_on("g4saiddata@1.1", when='@10.3.0:10.3') + depends_on("g4abla@3.0", when='@10.3.0:10.3') + depends_on("g4ensdfstate@2.1", when='@10.3.0:10.3') def install(self, spec, prefix): spec = self.spec diff --git a/var/spack/repos/builtin/packages/geant4/package.py b/var/spack/repos/builtin/packages/geant4/package.py index 7d945570dc..5361869643 100644 --- a/var/spack/repos/builtin/packages/geant4/package.py +++ b/var/spack/repos/builtin/packages/geant4/package.py @@ -76,7 +76,7 @@ class Geant4(CMakePackage): when='@10.7.0: cxxstd=' + std) depends_on('clhep@2.3.3.0: cxxstd=' + std, - when='@10.3.3:10.6.99 cxxstd=' + std) + when='@10.3.3:10.6 cxxstd=' + std) # Spack only supports Xerces-c 3 and above, so no version req depends_on('xerces-c netaccessor=curl cxxstd=' + std, when='cxxstd=' + std) @@ -85,13 +85,13 @@ class Geant4(CMakePackage): depends_on('vecgeom@1.1.8 cxxstd=' + std, when='@10.7.0: +vecgeom cxxstd=' + std) depends_on('vecgeom@1.1.5 cxxstd=' + std, - when='@10.6.0:10.6.99 +vecgeom cxxstd=' + std) + when='@10.6.0:10.6 +vecgeom cxxstd=' + std) depends_on('vecgeom@1.1.0 cxxstd=' + std, - when='@10.5.0:10.5.99 +vecgeom cxxstd=' + std) + when='@10.5.0:10.5 +vecgeom cxxstd=' + std) depends_on('vecgeom@0.5.2 cxxstd=' + std, - when='@10.4.0:10.4.99 +vecgeom cxxstd=' + std) + when='@10.4.0:10.4 +vecgeom cxxstd=' + std) depends_on('vecgeom@0.3rc cxxstd=' + std, - when='@10.3.0:10.3.99 +vecgeom cxxstd=' + std) + when='@10.3.0:10.3 +vecgeom cxxstd=' + std) # Boost.python, conflict handled earlier depends_on('boost@1.70: +python cxxstd=' + std, @@ -110,7 +110,7 @@ class Geant4(CMakePackage): # CLHEP. patch('CLHEP-10.03.03.patch', level=1, when='@10.3.3') # These patches can be applied independent of the cxxstd value? - patch('cxx17.patch', when='@:10.3.99 cxxstd=17') + patch('cxx17.patch', when='@:10.3 cxxstd=17') patch('cxx17_geant4_10_0.patch', level=1, when='@10.4.0 cxxstd=17') patch('geant4-10.4.3-cxx17-removed-features.patch', level=1, when='@10.4.3 cxxstd=17') @@ -131,7 +131,7 @@ class Geant4(CMakePackage): # Don't install the package cache file as Spack will set # up CMAKE_PREFIX_PATH etc for the dependencies - if spec.version > Version('10.5.99'): + if spec.version >= Version('10.6'): options.append('-DGEANT4_INSTALL_PACKAGE_CACHE=OFF') # Multithreading diff --git a/var/spack/repos/builtin/packages/gitconddb/package.py b/var/spack/repos/builtin/packages/gitconddb/package.py index 1c4139ff77..2075f39f34 100644 --- a/var/spack/repos/builtin/packages/gitconddb/package.py +++ b/var/spack/repos/builtin/packages/gitconddb/package.py @@ -39,6 +39,6 @@ class Gitconddb(CMakePackage): depends_on('libgit2') # Known conflicts on C++17 compatibility (aggressive for now) - conflicts('%gcc@:7.9.999', msg="GitCondDB requires GCC 8 or newer for C++17 support") - conflicts('%apple-clang', when="@:0.1.99", msg="No Darwin support for clang in older versions") - conflicts('%clang platform=darwin', when="@:0.1.99", msg="No Darwin support for clang in older versions") + conflicts('%gcc@:7.9', msg="GitCondDB requires GCC 8 or newer for C++17 support") + conflicts('%apple-clang', when="@:0.1", msg="No Darwin support for clang in older versions") + conflicts('%clang platform=darwin', when="@:0.1", msg="No Darwin support for clang in older versions") diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 975fbd5b75..4df21a5095 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -76,7 +76,7 @@ class Glib(Package): patch('g_date_strftime.patch', when='@2.42.1') # Clang doesn't seem to acknowledge the pragma lines to disable the -Werror # around a legitimate usage. - patch('no-Werror=format-security.patch', when='@:2.57.99') + patch('no-Werror=format-security.patch', when='@:2.57') # Patch to prevent compiler errors in kernels older than 2.6.35 patch('old-kernels.patch', when='@2.56.0:2.56.1 os=rhel6') patch('old-kernels.patch', when='@2.56.0:2.56.1 os=centos6') @@ -187,7 +187,7 @@ class Glib(Package): args.append('GTKDOC_REBASE={0}'.format(true)) return args - @when('@:2.57.99') + @when('@:2.57') def install(self, spec, prefix): configure('--prefix={0}'.format(prefix), *self.configure_args()) make() @@ -266,7 +266,7 @@ class Glib(Package): # the gettext library directory. The patch below explitly adds the # appropriate -L path. spec = self.spec - if spec.satisfies('@2:2.99'): + if spec.satisfies('@2.0:2'): pattern = 'Libs:' repl = 'Libs: -L{0} -Wl,-rpath={0} '.format( spec['gettext'].libs.directories[0]) diff --git a/var/spack/repos/builtin/packages/gnupg/package.py b/var/spack/repos/builtin/packages/gnupg/package.py index 2a602d8eff..68a01c5b2c 100644 --- a/var/spack/repos/builtin/packages/gnupg/package.py +++ b/var/spack/repos/builtin/packages/gnupg/package.py @@ -45,7 +45,7 @@ class Gnupg(AutotoolsPackage): @run_after('install') def add_gpg2_symlink(self): - if self.spec.satisfies("@2.0:2.999"): + if self.spec.satisfies("@2.0:2"): symlink('gpg', self.prefix.bin.gpg2) def configure_args(self): diff --git a/var/spack/repos/builtin/packages/gnuradio/package.py b/var/spack/repos/builtin/packages/gnuradio/package.py index 8c02cb9f81..512c062c9c 100644 --- a/var/spack/repos/builtin/packages/gnuradio/package.py +++ b/var/spack/repos/builtin/packages/gnuradio/package.py @@ -29,7 +29,7 @@ class Gnuradio(CMakePackage): depends_on('swig@3.0.8:', type='build') depends_on('log4cpp@1.0:') # https://github.com/gnuradio/gnuradio/pull/3566 - depends_on('boost@1.53:1.72.999') + depends_on('boost@1.53:1.72') depends_on('py-numpy', type=('build', 'run')) depends_on('py-click', type=('build', 'run')) depends_on('py-pyyaml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/gnutls/package.py b/var/spack/repos/builtin/packages/gnutls/package.py index d84cf93d59..57a64925d4 100644 --- a/var/spack/repos/builtin/packages/gnutls/package.py +++ b/var/spack/repos/builtin/packages/gnutls/package.py @@ -38,7 +38,7 @@ class Gnutls(AutotoolsPackage): depends_on('guile', when='+guile') depends_on('nettle@:2.9', when='@3.3.9') depends_on('nettle', when='@3.5:') - depends_on('libidn2@:2.0.99', when='@:3.5.99') + depends_on('libidn2@:2.0', when='@:3.5') depends_on('libidn2') depends_on('zlib', when='+zlib') depends_on('gettext') diff --git a/var/spack/repos/builtin/packages/gpdb/package.py b/var/spack/repos/builtin/packages/gpdb/package.py index 9e25e3240e..dfb1cff18a 100644 --- a/var/spack/repos/builtin/packages/gpdb/package.py +++ b/var/spack/repos/builtin/packages/gpdb/package.py @@ -27,7 +27,7 @@ class Gpdb(AutotoolsPackage): version('5.23.0', sha256='b06a797eb941362d5473b84d5def349b5ce12ce87ab116bea7c74ad193738ae9') depends_on('zstd') - depends_on('py-setuptools@:44.99.99') + depends_on('py-setuptools@:44') depends_on('apr') depends_on('libevent') depends_on('curl') diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py index b7e03e95ce..f4834a7922 100644 --- a/var/spack/repos/builtin/packages/gplates/package.py +++ b/var/spack/repos/builtin/packages/gplates/package.py @@ -23,12 +23,12 @@ class Gplates(CMakePackage): depends_on('cmake@2.8.8:', type='build') depends_on('ninja', type='build') # Qt 5 does not support (at least) the Q_WS_* constants. - depends_on('qt+opengl@4.4.0:4.99') + depends_on('qt+opengl@4.4.0:4') depends_on('qwt@6.0.1:') depends_on('glu') depends_on('glew') # GDAL's OGRSFDriverRegistrar is not compatible anymore starting with 2.0. - depends_on('gdal@1.3.2:1.99') + depends_on('gdal@1.3.2:1') depends_on('cgal@3.5:') # The latest release of gplates came out before PROJ.6 was released, # so I'm assuming it's not supported. @@ -36,7 +36,7 @@ class Gplates(CMakePackage): # Boost's Python library has a different name starting with 1.67. # There were changes to Boost's optional in 1.61 that make the build fail. depends_on('boost+python@1.34:1.60') - depends_on('python@2:2.99') + depends_on('python@2.0:2') # When built in parallel, headers are not generated before they are used # (specifically, ViewportWindowUi.h) with the Makefiles generator. diff --git a/var/spack/repos/builtin/packages/grace/package.py b/var/spack/repos/builtin/packages/grace/package.py index cbe9c9f585..3d2a84e051 100644 --- a/var/spack/repos/builtin/packages/grace/package.py +++ b/var/spack/repos/builtin/packages/grace/package.py @@ -28,7 +28,7 @@ class Grace(AutotoolsPackage): depends_on('motif') depends_on('jpeg') depends_on('libpng') - depends_on('fftw@2:2.999') + depends_on('fftw@2.0:2') depends_on('netcdf-c') def patch(self): diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index f34b9b316a..86f9667ab9 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -94,7 +94,7 @@ class Grass(AutotoolsPackage): depends_on('opencl', when='+opencl') depends_on('bzip2', when='+bzlib') depends_on('zstd', when='+zstd') - depends_on('gdal@:3.2.999', when='+gdal') + depends_on('gdal@:3.2', when='+gdal') depends_on('liblas', when='+liblas') depends_on('wxwidgets', when='+wxwidgets') depends_on('py-wxpython@2.8.10.1:', when='+wxwidgets', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index e0368c6ba4..743b347106 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -53,11 +53,11 @@ class GribApi(CMakePackage): # depends_on('valgrind', type='test', when='+test') depends_on('netcdf-c', when='+netcdf') - depends_on('openjpeg@1.5.0:1.5.999', when='jp2k=openjpeg') + depends_on('openjpeg@1.5.0:1.5', when='jp2k=openjpeg') depends_on('jasper', when='jp2k=jasper') depends_on('libpng', when='+png') depends_on('libaec', when='+aec') - depends_on('python@2.5:2.999', when='+python', + depends_on('python@2.5:2', when='+python', type=('build', 'link', 'run')) depends_on('py-numpy', when='+python+numpy', type=('build', 'run')) extends('python', when='+python') diff --git a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py index dc0d4ec37e..e36660aba4 100644 --- a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py +++ b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py @@ -58,7 +58,7 @@ class GromacsChainCoordinate(CMakePackage): depends_on('mpi', when='+mpi') depends_on('fftw-api@3') - depends_on('cmake@3.16.0:3.99.99', type='build') + depends_on('cmake@3.16.0:3', type='build') depends_on('cuda', when='+cuda') depends_on('sycl', when='+sycl') depends_on('lapack', when='+lapack') diff --git a/var/spack/repos/builtin/packages/gromacs/package.py b/var/spack/repos/builtin/packages/gromacs/package.py index 795fae429a..5a4b57590b 100644 --- a/var/spack/repos/builtin/packages/gromacs/package.py +++ b/var/spack/repos/builtin/packages/gromacs/package.py @@ -131,34 +131,34 @@ class Gromacs(CMakePackage): depends_on('plumed@2.5.3:2.6.0~mpi', when='@2019.4+plumed~mpi') depends_on('plumed@2.5.2+mpi', when='@2019.2+plumed+mpi') depends_on('plumed@2.5.2~mpi', when='@2019.2+plumed~mpi') - depends_on('plumed@2.5.3:2.6.99+mpi', when='@2018.8+plumed+mpi') - depends_on('plumed@2.5.3:2.6.99~mpi', when='@2018.8+plumed~mpi') + depends_on('plumed@2.5.3:2.6+mpi', when='@2018.8+plumed+mpi') + depends_on('plumed@2.5.3:2.6~mpi', when='@2018.8+plumed~mpi') depends_on('plumed@2.5.1:2.5.2+mpi', when='@2018.6+plumed+mpi') depends_on('plumed@2.5.1:2.5.2~mpi', when='@2018.6+plumed~mpi') depends_on('plumed@2.5.0+mpi', when='@2018.4+plumed+mpi') depends_on('plumed@2.5.0~mpi', when='@2018.4+plumed~mpi') - depends_on('plumed@2.5.1:2.5.99+mpi', when='@2016.6+plumed+mpi') - depends_on('plumed@2.5.1:2.5.99~mpi', when='@2016.6+plumed~mpi') + depends_on('plumed@2.5.1:2.5+mpi', when='@2016.6+plumed+mpi') + depends_on('plumed@2.5.1:2.5~mpi', when='@2016.6+plumed~mpi') depends_on('plumed@2.5.0+mpi', when='@2016.5+plumed+mpi') depends_on('plumed@2.5.0~mpi', when='@2016.5+plumed~mpi') depends_on('fftw-api@3') - depends_on('cmake@2.8.8:3.99.99', type='build') - depends_on('cmake@3.4.3:3.99.99', type='build', when='@2018:') - depends_on('cmake@3.9.6:3.99.99', type='build', when='@2020') - depends_on('cmake@3.13.0:3.99.99', type='build', when='@2021:') - depends_on('cmake@3.16.0:3.99.99', type='build', when='@master') - depends_on('cmake@3.16.0:3.99.99', type='build', when='%fj') + depends_on('cmake@2.8.8:3', type='build') + depends_on('cmake@3.4.3:3', type='build', when='@2018:') + depends_on('cmake@3.9.6:3', type='build', when='@2020') + depends_on('cmake@3.13.0:3', type='build', when='@2021:') + depends_on('cmake@3.16.0:3', type='build', when='@master') + depends_on('cmake@3.16.0:3', type='build', when='%fj') depends_on('cuda', when='+cuda') depends_on('sycl', when='+sycl') depends_on('lapack', when='+lapack') depends_on('blas', when='+blas') - depends_on('hwloc@1:1.999', when='+hwloc@2016:2018.999') + depends_on('hwloc@1.0:1', when='+hwloc@2016:2018') depends_on('hwloc', when='+hwloc@2019:') patch('gmxDetectCpu-cmake-3.14.patch', when='@2018:2019.3^cmake@3.14.0:') - patch('gmxDetectSimd-cmake-3.14.patch', when='@5.0:2017.99^cmake@3.14.0:') + patch('gmxDetectSimd-cmake-3.14.patch', when='@5.0:2017^cmake@3.14.0:') filter_compiler_wrappers( '*.cmake', @@ -198,7 +198,7 @@ class Gromacs(CMakePackage): filter_file(r'-gencode;arch=compute_20,code=compute_20;?', '', 'cmake/gmxManageNvccConfig.cmake') - if self.spec.satisfies('@4.6:5.0.999^cuda@9:'): + if self.spec.satisfies('@4.6:5.0^cuda@9:'): filter_file(r'-gencode;arch=compute_20,code=sm_21;?', '', 'cmake/gmxManageNvccConfig.cmake') diff --git a/var/spack/repos/builtin/packages/gsl/package.py b/var/spack/repos/builtin/packages/gsl/package.py index 0f67b8a9f3..af2d665210 100644 --- a/var/spack/repos/builtin/packages/gsl/package.py +++ b/var/spack/repos/builtin/packages/gsl/package.py @@ -30,10 +30,10 @@ class Gsl(AutotoolsPackage, GNUMirrorPackage): variant('external-cblas', default=False, description='Build against external blas') # from https://dev.gentoo.org/~mgorny/dist/gsl-2.3-cblas.patch.bz2 - patch('gsl-2.3-cblas.patch', when="@2.3:2.5.99+external-cblas") + patch('gsl-2.3-cblas.patch', when="@2.3:2.5+external-cblas") patch('gsl-2.6-cblas.patch', when="@2.6: +external-cblas") - conflicts('+external-cblas', when="@:2.2.99") + conflicts('+external-cblas', when="@:2.2") depends_on('m4', type='build', when='+external-cblas') depends_on('autoconf', type='build', when='+external-cblas') diff --git a/var/spack/repos/builtin/packages/gtkplus/package.py b/var/spack/repos/builtin/packages/gtkplus/package.py index a5db09d06c..8bb2a781eb 100644 --- a/var/spack/repos/builtin/packages/gtkplus/package.py +++ b/var/spack/repos/builtin/packages/gtkplus/package.py @@ -49,7 +49,7 @@ class Gtkplus(MesonPackage): depends_on('gettext', when='@3:') depends_on('cups', when='+cups') - patch('no-demos.patch', when='@2:2.99') + patch('no-demos.patch', when='@2.0:2') def url_for_version(self, version): url = 'https://download.gnome.org/sources/gtk+/{0}/gtk+-{1}.tar.xz' diff --git a/var/spack/repos/builtin/packages/h5bench/package.py b/var/spack/repos/builtin/packages/h5bench/package.py index 46fcc53021..a77fb965e2 100644 --- a/var/spack/repos/builtin/packages/h5bench/package.py +++ b/var/spack/repos/builtin/packages/h5bench/package.py @@ -16,7 +16,7 @@ class H5bench(CMakePackage): depends_on('cmake@3.10:', type='build') depends_on('mpi') - depends_on('hdf5+mpi@1.12.0:1.99.99,develop-1.12:') + depends_on('hdf5+mpi@1.12.0:1,develop-1.12:') @run_after('install') def install_config(self): diff --git a/var/spack/repos/builtin/packages/hc/package.py b/var/spack/repos/builtin/packages/hc/package.py index d197167bbe..764d23ef2c 100644 --- a/var/spack/repos/builtin/packages/hc/package.py +++ b/var/spack/repos/builtin/packages/hc/package.py @@ -16,7 +16,7 @@ class Hc(MakefilePackage): version('1.0.7', sha256='7499ea76ac4739a9c0941bd57d124fb681fd387c8d716ebb358e6af3395103ed') - depends_on('gmt@4.2.1:4.999') + depends_on('gmt@4.2.1:4') depends_on('netcdf-c') # Build phase fails in parallel with the following error messages: diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index f822797c3e..4fe7a8d0ae 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -93,13 +93,13 @@ class Hdf5(CMakePackage): # The compiler wrappers (h5cc, h5fc, etc.) run 'pkg-config'. depends_on('pkgconfig', type='run') - conflicts('api=v114', when='@1.6:1.12.99', + conflicts('api=v114', when='@1.6:1.12', msg='v114 is not compatible with this release') - conflicts('api=v112', when='@1.6:1.10.99', + conflicts('api=v112', when='@1.6:1.10', msg='v112 is not compatible with this release') - conflicts('api=v110', when='@1.6:1.8.99', + conflicts('api=v110', when='@1.6:1.8', msg='v110 is not compatible with this release') - conflicts('api=v18', when='@1.6:1.6.99', + conflicts('api=v18', when='@1.6.0:1.6', msg='v18 is not compatible with this release') # The Java wrappers and associated libhdf5_java library @@ -395,9 +395,9 @@ class Hdf5(CMakePackage): # 1.10.6 and 1.12.0. The current develop versions do not produce 'h5pfc' # at all. Here, we make sure that 'h5pfc' is available when Fortran and # MPI support are enabled (only for versions that generate 'h5fc'). - if self.spec.satisfies('@1.8.22:1.8.999,' - '1.10.6:1.10.999,' - '1.12.0:1.12.999,' + if self.spec.satisfies('@1.8.22:1.8,' + '1.10.6:1.10,' + '1.12.0:1.12,' 'develop:' '+fortran+mpi'): with working_dir(self.prefix.bin): diff --git a/var/spack/repos/builtin/packages/herwig3/package.py b/var/spack/repos/builtin/packages/herwig3/package.py index b7d74012fd..f80eb4d46a 100644 --- a/var/spack/repos/builtin/packages/herwig3/package.py +++ b/var/spack/repos/builtin/packages/herwig3/package.py @@ -31,7 +31,7 @@ class Herwig3(AutotoolsPackage): depends_on('vbfnlo@3:', type='link') depends_on('madgraph5amc', type='link') depends_on('njet', type='link') - depends_on('py-gosam', type='link', when='^python@2.7:2.7.99') + depends_on('py-gosam', type='link', when='^python@2.7.0:2.7') depends_on('gosam-contrib', type='link') depends_on('openloops', type='link') @@ -63,7 +63,7 @@ class Herwig3(AutotoolsPackage): '--with-njet=' + self.spec['njet'].prefix, '--with-vbfnlo=' + self.spec['vbfnlo'].prefix] - if self.spec.satisfies('^python@2.7:2.7.99'): + if self.spec.satisfies('^python@2.7.0:2.7'): args.append('--with-gosam=' + self.spec['gosam'].prefix) return args diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index e1ced78506..ab053d00e2 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -63,7 +63,7 @@ class Hiop(CMakePackage, CudaPackage): depends_on('mpi', when='+mpi') depends_on('magma', when='+cuda') - depends_on('magma@2.5.4:', when='@0.3.99.1:+cuda') + depends_on('magma@2.5.4:', when='@0.4:+cuda') depends_on('magma@2.6.1:', when='@0.4.6:+cuda') depends_on('raja', when='+raja') diff --git a/var/spack/repos/builtin/packages/hipsycl/package.py b/var/spack/repos/builtin/packages/hipsycl/package.py index c91d220bf2..d6b069becf 100644 --- a/var/spack/repos/builtin/packages/hipsycl/package.py +++ b/var/spack/repos/builtin/packages/hipsycl/package.py @@ -41,23 +41,23 @@ class Hipsycl(CMakePackage): ) depends_on("cmake@3.5:", type="build") - depends_on("boost +filesystem", when="@:0.8.99") + depends_on("boost +filesystem", when="@:0.8") depends_on("boost@1.67.0:1.69.0 +filesystem +fiber +context cxxstd=17", when='@0.9.1:') depends_on("python@3:") depends_on("llvm@8: +clang", when="~cuda") depends_on("llvm@9: +clang", when="+cuda") - # LLVM PTX backend requires cuda7:10.1.9999 (https://tinyurl.com/v82k5qq) - depends_on("cuda@9:10.1.9999", when="@0.8.1: +cuda") - # hipSYCL@:0.8.0 requires cuda@9:10.0.9999 due to a known bug - depends_on("cuda@9:10.0.9999", when="@:0.8.0 +cuda") + # LLVM PTX backend requires cuda7:10.1 (https://tinyurl.com/v82k5qq) + depends_on("cuda@9:10.1", when="@0.8.1: +cuda") + # hipSYCL@:0.8.0 requires cuda@9:10.0 due to a known bug + depends_on("cuda@9:10.0", when="@:0.8.0 +cuda") conflicts( - "%gcc@:4.9999", + "%gcc@:4", when='@:0.9.0', msg="hipSYCL needs proper C++14 support to be built, %gcc is too old", ) conflicts( - "%gcc@:8.9999", + "%gcc@:8", when='@0.9.1:', msg="hipSYCL needs proper C++17 support to be built, %gcc is too old") conflicts( diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 3472237097..32d03ba880 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -74,18 +74,18 @@ class Hpctoolkit(AutotoolsPackage): ) depends_on('binutils +libiberty', type='link', when='@2021.00:') - depends_on('binutils +libiberty~nls', type='link', when='@2020.04:2020.99') - depends_on('binutils@:2.33.1 +libiberty~nls', type='link', when='@:2020.03.99') + depends_on('binutils +libiberty~nls', type='link', when='@2020.04:2020') + depends_on('binutils@:2.33.1 +libiberty~nls', type='link', when='@:2020.03') depends_on('boost' + boost_libs) depends_on('bzip2+shared', type='link') depends_on('dyninst@10.2.0:', when='@2021.00:') - depends_on('dyninst@9.3.2:', when='@:2020.99') + depends_on('dyninst@9.3.2:', when='@:2020') depends_on('elfutils+bzip2+xz~nls', type='link') depends_on('gotcha@1.0.3:') depends_on('intel-tbb+shared') depends_on('libdwarf') depends_on('libmonitor+hpctoolkit~dlopen', when='@2021.00:') - depends_on('libmonitor+hpctoolkit+dlopen', when='@:2020.99') + depends_on('libmonitor+hpctoolkit+dlopen', when='@:2020') depends_on('libunwind@1.4: +xz+pic') depends_on('mbedtls+pic') depends_on('xerces-c transcoder=iconv') @@ -104,30 +104,30 @@ class Hpctoolkit(AutotoolsPackage): depends_on('rocm-dbgapi', when='+rocm') depends_on('roctracer-dev', when='+rocm') - conflicts('%gcc@:4.7.99', when='^dyninst@10.0.0:', + conflicts('%gcc@:4.7', when='^dyninst@10.0.0:', msg='hpctoolkit requires gnu gcc 4.8.x or later') - conflicts('%gcc@:4.99.99', when='@2020.03:2020.99', + conflicts('%gcc@:4', when='@2020.03:2020', msg='hpctoolkit requires gnu gcc 5.x or later') - conflicts('%gcc@:6.99.99', when='@2021.00:', + conflicts('%gcc@:6', when='@2021.00:', msg='hpctoolkit requires gnu gcc 7.x or later') - conflicts('+cuda', when='@:2019.99.99', + conflicts('+cuda', when='@:2019', msg='cuda requires 2020.03.01 or later') - conflicts('+rocm', when='@:2020.99.99', + conflicts('+rocm', when='@:2020', msg='rocm requires 2021.03.01 or later') conflicts('^binutils@2.35:2.35.1', msg='avoid binutils 2.35 and 2.35.1 (spews errors)') # Fix the build for old revs with gcc 10.x. - patch('gcc10-enum.patch', when='@2020.01.01:2020.08.99 %gcc@10.0:') + patch('gcc10-enum.patch', when='@2020.01.01:2020.08 %gcc@10.0:') patch('https://github.com/HPCToolkit/hpctoolkit/commit/511afd95b01d743edc5940c84e0079f462b2c23e.patch', sha256='fd0fd7419f66a1feba8046cff9df7f27abce8629ee2708b8a9daa12c1b51243c', - when='@2019.08.01:2021.03.99 %gcc@11.0:') + when='@2019.08.01:2021.03 %gcc@11.0:') flag_handler = AutotoolsPackage.build_system_flags diff --git a/var/spack/repos/builtin/packages/hpcviewer/package.py b/var/spack/repos/builtin/packages/hpcviewer/package.py index bed41bdc16..c0e075c4a5 100644 --- a/var/spack/repos/builtin/packages/hpcviewer/package.py +++ b/var/spack/repos/builtin/packages/hpcviewer/package.py @@ -134,7 +134,7 @@ class Hpcviewer(Package): when='@{0}'.format(key[0])) depends_on('java@11:', type=('build', 'run'), when='@2021.0:') - depends_on('java@8', type=('build', 'run'), when='@:2020.99') + depends_on('java@8', type=('build', 'run'), when='@:2020') conflicts('platform=darwin', msg='hpcviewer requires a manual install on MacOS, see homepage') diff --git a/var/spack/repos/builtin/packages/hwloc/package.py b/var/spack/repos/builtin/packages/hwloc/package.py index d3b1fe2ca8..9fcd556062 100644 --- a/var/spack/repos/builtin/packages/hwloc/package.py +++ b/var/spack/repos/builtin/packages/hwloc/package.py @@ -78,7 +78,7 @@ class Hwloc(AutotoolsPackage): description="Support ROCm devices") # netloc isn't available until version 2.0.0 - conflicts('+netloc', when="@:1.99.99") + conflicts('+netloc', when="@:1") # libudev isn't available until version 1.11.0 conflicts('+libudev', when="@:1.10") diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index ac284d90a5..03bb5b25c9 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -94,9 +94,9 @@ class Hydrogen(CMakePackage, CudaPackage, ROCmPackage): depends_on('cray-libsci +openmp', when='blas=libsci +openmp_blas') # Specify the correct version of Aluminum - depends_on('aluminum@:0.3.99', when='@:1.3.99 +al') - depends_on('aluminum@0.4:0.4.99', when='@1.4:1.4.99 +al') - depends_on('aluminum@0.6.0:0.6.99', when='@1.5.0:1.5.1 +al') + depends_on('aluminum@:0.3', when='@:1.3 +al') + depends_on('aluminum@0.4.0:0.4', when='@1.4.0:1.4 +al') + depends_on('aluminum@0.6.0:0.6', when='@1.5.0:1.5.1 +al') depends_on('aluminum@0.7.0:', when='@:1.0,1.5.2: +al') # Add Aluminum variants @@ -120,7 +120,7 @@ class Hydrogen(CMakePackage, CudaPackage, ROCmPackage): depends_on('mpfr', when='+mpfr') depends_on('cuda', when='+cuda') - depends_on('cub', when='^cuda@:10.99') + depends_on('cub', when='^cuda@:10') depends_on('hipcub', when='+rocm') depends_on('half', when='+half') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index e1d714d27a..d3257ae4b5 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -93,17 +93,17 @@ class Hypre(AutotoolsPackage, CudaPackage): # Patch to build shared libraries on Darwin does not apply to # versions before 2.13.0 - conflicts("+shared@:2.12.99 platform=darwin") + conflicts("+shared@:2.12 platform=darwin") # Conflicts # Option added in v2.13.0 - conflicts('+superlu-dist', when='@:2.12.99') + conflicts('+superlu-dist', when='@:2.12') # Internal SuperLU Option removed in v2.13.0 conflicts('+internal-superlu', when='@2.13.0:') # Option added in v2.16.0 - conflicts('+mixedint', when='@:2.15.99') + conflicts('+mixedint', when='@:2.15') configure_directory = 'src' diff --git a/var/spack/repos/builtin/packages/icedtea/package.py b/var/spack/repos/builtin/packages/icedtea/package.py index e2c3726128..0979efb78b 100644 --- a/var/spack/repos/builtin/packages/icedtea/package.py +++ b/var/spack/repos/builtin/packages/icedtea/package.py @@ -69,7 +69,7 @@ class Icedtea(AutotoolsPackage): depends_on('zlib') depends_on('alsa-lib', when='platform=linux') - provides('java@8', when='@3.4.0:3.99.99') + provides('java@8', when='@3.4.0:3') force_autoreconf = True diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index 17ddf29cc1..4478c8d84d 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -40,7 +40,7 @@ class Icu4c(AutotoolsPackage): patch('https://github.com/unicode-org/icu/commit/ddfc30860354cbcb78c2c0bcf800be5ab44a9e4f.patch', sha256='dfc501d78ddfabafe09dc1a7aa70f96b799164b18f6a57d616a9d48aaf989333', - level=2, when='@58.0:59.99') + level=2, when='@58.0:59') configure_directory = 'source' diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 98415daac6..5fdccc9d76 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -203,16 +203,16 @@ class IntelParallelStudio(IntelPackage): # https://www.threadingbuildingblocks.org/faq/there-version-tbb-provides-statically-linked-libraries conflicts('+tbb', when='~shared') - conflicts('+advisor', when='@composer.0:composer.9999') - conflicts('+clck', when='@composer.0:composer.9999') - conflicts('+inspector', when='@composer.0:composer.9999') - conflicts('+itac', when='@composer.0:composer.9999') - conflicts('+mpi', when='@composer.0:composer.9999') - conflicts('+vtune', when='@composer.0:composer.9999') - - conflicts('+clck', when='@professional.0:professional.9999') - conflicts('+itac', when='@professional.0:professional.9999') - conflicts('+mpi', when='@professional.0:professional.9999') + conflicts('+advisor', when='@composer.0:composer') + conflicts('+clck', when='@composer.0:composer') + conflicts('+inspector', when='@composer.0:composer') + conflicts('+itac', when='@composer.0:composer') + conflicts('+mpi', when='@composer.0:composer') + conflicts('+vtune', when='@composer.0:composer') + + conflicts('+clck', when='@professional.0:professional') + conflicts('+itac', when='@professional.0:professional') + conflicts('+mpi', when='@professional.0:professional') # The following components are not available before 2016 conflicts('+daal', when='@professional.0:professional.2015.7') diff --git a/var/spack/repos/builtin/packages/ispc/package.py b/var/spack/repos/builtin/packages/ispc/package.py index 2bfbab8aba..91b910b62e 100644 --- a/var/spack/repos/builtin/packages/ispc/package.py +++ b/var/spack/repos/builtin/packages/ispc/package.py @@ -40,14 +40,14 @@ class Ispc(CMakePackage): depends_on('zlib', type='link') depends_on('llvm+clang') depends_on('llvm@11:', when='@1.16:') - depends_on('llvm@10:11.999', when='@1.15:1.15.999') - depends_on('llvm@10:10.999', when='@1.13:1.14.999') + depends_on('llvm@10:11', when='@1.15.0:1.15') + depends_on('llvm@10.0:10', when='@1.13:1.14') patch('don-t-assume-that-ncurses-zlib-are-system-libraries.patch', - when='@1.14:1.14.999', + when='@1.14.0:1.14', sha256='d3ccf547d3ba59779fd375e10417a436318f2200d160febb9f830a26f0daefdc') - patch('fix-linking-against-llvm-10.patch', when='@1.13:1.13.999', + patch('fix-linking-against-llvm-10.patch', when='@1.13.0:1.13', sha256='d3ccf547d3ba59779fd375e10417a436318f2200d160febb9f830a26f0daefdc') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/iwyu/package.py b/var/spack/repos/builtin/packages/iwyu/package.py index 1f76225030..a430dacd6f 100644 --- a/var/spack/repos/builtin/packages/iwyu/package.py +++ b/var/spack/repos/builtin/packages/iwyu/package.py @@ -25,12 +25,12 @@ class Iwyu(CMakePackage): patch('iwyu-013-cmake.patch', when='@0.13:0.14') - depends_on('llvm+clang@12.0:12.999', when='@0.16') - depends_on('llvm+clang@11.0:11.999', when='@0.15') - depends_on('llvm+clang@10.0:10.999', when='@0.14') - depends_on('llvm+clang@9.0:9.999', when='@0.13') - depends_on('llvm+clang@8.0:8.999', when='@0.12') - depends_on('llvm+clang@7.0:7.999', when='@0.11') + depends_on('llvm+clang@12.0:12', when='@0.16') + depends_on('llvm+clang@11.0:11', when='@0.15') + depends_on('llvm+clang@10.0:10', when='@0.14') + depends_on('llvm+clang@9.0:9', when='@0.13') + depends_on('llvm+clang@8.0:8', when='@0.12') + depends_on('llvm+clang@7.0:7', when='@0.11') # Non-X86 CPU use all_targets variants because iwyu use X86AsmParser depends_on('llvm+all_targets', when='target=aarch64:') diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 1f8cb53499..00598410b3 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -60,14 +60,14 @@ class Jdk(Package): version('1.8.0_131-b11', sha256='62b215bdfb48bace523723cdbb2157c665e6a25429c73828a32f00e587301236', url='https://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz') - provides('java@14', when='@14.0:14.999') - provides('java@13', when='@13.0:13.999') - provides('java@12', when='@12.0:12.999') - provides('java@11', when='@11.0:11.999') - provides('java@10', when='@10.0:10.999') - provides('java@9', when='@9.0:9.999') - provides('java@8', when='@1.8.0:1.8.999') - provides('java@7', when='@1.7.0:1.7.999') + provides('java@14', when='@14.0:14') + provides('java@13', when='@13.0:13') + provides('java@12', when='@12.0:12') + provides('java@11', when='@11.0:11') + provides('java@10', when='@10.0:10') + provides('java@9', when='@9.0:9') + provides('java@8', when='@1.8.0:1.8') + provides('java@7', when='@1.7.0:1.7') conflicts('target=ppc64:', msg='jdk is only available for x86_64') conflicts('target=ppc64le:', msg='jdk is only available for x86_64') diff --git a/var/spack/repos/builtin/packages/kdiff3/package.py b/var/spack/repos/builtin/packages/kdiff3/package.py index 0813bd4f19..3425030929 100644 --- a/var/spack/repos/builtin/packages/kdiff3/package.py +++ b/var/spack/repos/builtin/packages/kdiff3/package.py @@ -13,7 +13,7 @@ class Kdiff3(Package): version('0.9.98', sha256='802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668') - depends_on("qt@:4.99,5.2.0:") + depends_on("qt@:4,5.2.0:") def install(self, spec, prefix): # make is done inside diff --git a/var/spack/repos/builtin/packages/kokkos-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-legacy/package.py index 87780d1b23..48e70e4a99 100644 --- a/var/spack/repos/builtin/packages/kokkos-legacy/package.py +++ b/var/spack/repos/builtin/packages/kokkos-legacy/package.py @@ -98,13 +98,13 @@ class KokkosLegacy(Package): ) # Checks on Kokkos version and Kokkos options - conflicts('+aggressive_vectorization', when='@:2.0.99',) - conflicts('+disable_profiling', when='@:2.0.99',) + conflicts('+aggressive_vectorization', when='@:2.0',) + conflicts('+disable_profiling', when='@:2.0',) conflicts('+disable_dualview_modify_check', when='@:2.03.04',) conflicts('+enable_profile_load_print', when='@:2.03.04',) conflicts('+compiler_warnings', when='@:2.03.14',) - conflicts('+disable_deprecated_code', when='@:2.5.99',) - conflicts('+enable_eti', when='@:2.6.99',) + conflicts('+disable_deprecated_code', when='@:2.5',) + conflicts('+enable_eti', when='@:2.6',) # Check that we haven't specified a gpu architecture # without specifying CUDA @@ -125,8 +125,8 @@ class KokkosLegacy(Package): # Check that we haven't asked for a GPU architecture that # the revision of kokkos does not support - conflicts('gpu_arch=Volta70', when='@:2.5.99') - conflicts('gpu_arch=Volta72', when='@:2.5.99') + conflicts('gpu_arch=Volta70', when='@:2.5') + conflicts('gpu_arch=Volta72', when='@:2.5') # conflicts on kokkos version and cuda enabled # see kokkos issue #1296 diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index 692226cae8..cc7fb73e11 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -179,7 +179,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): variant("pic", default=False, description="Build position independent code") # nvcc does not currently work with C++17 or C++20 - conflicts("+cuda", when="std=17 ^cuda@:10.99.99") + conflicts("+cuda", when="std=17 ^cuda@:10") conflicts("+cuda", when="std=20") # HPX should use the same C++ standard diff --git a/var/spack/repos/builtin/packages/laghos/package.py b/var/spack/repos/builtin/packages/laghos/package.py index 0082333cd8..1e5646b7a6 100644 --- a/var/spack/repos/builtin/packages/laghos/package.py +++ b/var/spack/repos/builtin/packages/laghos/package.py @@ -35,7 +35,7 @@ class Laghos(MakefilePackage): depends_on('mfem@develop', when='@develop') depends_on('mfem@4.2.0', when='@3.1') - depends_on('mfem@4.1.0:4.1.99', when='@3.0') + depends_on('mfem@4.1.0:4.1', when='@3.0') # Recommended mfem version for laghos v2.0 is: ^mfem@3.4.1-laghos-v2.0 depends_on('mfem@3.4.0:', when='@2.0') # Recommended mfem version for laghos v1.x is: ^mfem@3.3.1-laghos-v1.0 diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index 650351938e..4b500232c3 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -85,8 +85,8 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): # Variant Conflicts conflicts('@:0.90,0.99:', when='~conduit') - conflicts('@0.90:0.101.99', when='+fft') - conflicts('@:0.90,0.101.99:', when='~dihydrogen') + conflicts('@0.90:0.101', when='+fft') + conflicts('@:0.90,0.102:', when='~dihydrogen') conflicts('~cuda', when='+nvprof') conflicts('~hwloc', when='+al') conflicts('~cuda', when='+nvshmem') @@ -110,7 +110,7 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): # Specify the correct versions of Hydrogen depends_on('hydrogen@:1.3.4', when='@0.95:0.100') - depends_on('hydrogen@1.4.0:1.4.99', when='@0.101:0.101.99') + depends_on('hydrogen@1.4.0:1.4', when='@0.101:0.101.99') depends_on('hydrogen@1.5.0:', when='@:0.90,0.102:') # Add Hydrogen variants @@ -132,8 +132,8 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): when='build_type=Debug @0.91:0.94') # Specify the correct version of Aluminum - depends_on('aluminum@:0.3.99', when='@0.95:0.100 +al') - depends_on('aluminum@0.4:0.4.99', when='@0.101:0.101.99 +al') + depends_on('aluminum@:0.3', when='@0.95:0.100 +al') + depends_on('aluminum@0.4.0:0.4', when='@0.101:0.101.99 +al') depends_on('aluminum@0.5.0:', when='@:0.90,0.102: +al') # Add Aluminum variants @@ -171,13 +171,13 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on('aluminum amdgpu_target=%s' % val, when='+al amdgpu_target=%s' % val) depends_on('dihydrogen amdgpu_target=%s' % val, when='+dihydrogen amdgpu_target=%s' % val) - depends_on('cudnn', when='@0.90:0.100.99 +cuda') + depends_on('cudnn', when='@0.90:0.100 +cuda') depends_on('cudnn@8.0.2:', when='@:0.90,0.101: +cuda') - depends_on('cub', when='@0.94:0.98.2 +cuda ^cuda@:10.99') + depends_on('cub', when='@0.94:0.98.2 +cuda ^cuda@:10') depends_on('hipcub', when='+rocm') depends_on('mpi') depends_on('hwloc@1.11:', when='@:0.90,0.102: +hwloc') - depends_on('hwloc@1.11:1.11.99', when='@0.95:0.101.99 +hwloc') + depends_on('hwloc@1.11.0:1.11', when='@0.95:0.101 +hwloc') depends_on('hwloc +cuda +nvml', when='+cuda') depends_on('hwloc@2.3.0:', when='+rocm') @@ -198,8 +198,8 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on('cnpy', when='+numpy') depends_on('nccl', when='@0.94:0.98.2 +cuda') - depends_on('conduit@0.4.0: +hdf5~hdf5_compat', when='@0.94:0.99 +conduit') - depends_on('conduit@0.5.0:0.6.99 +hdf5~hdf5_compat', when='@0.100:0.101 +conduit') + depends_on('conduit@0.4.0: +hdf5~hdf5_compat', when='@0.94:0 +conduit') + depends_on('conduit@0.5.0:0.6 +hdf5~hdf5_compat', when='@0.100:0.101 +conduit') depends_on('conduit@0.6.0: +hdf5~hdf5_compat', when='@:0.90,0.99:') # LBANN can use Python in two modes 1) as part of an extensible framework @@ -377,7 +377,7 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): '-DcuDNN_DIR={0}'.format( spec['cudnn'].prefix)) if spec.satisfies('@0.94:0.98.2'): - if spec.satisfies('^cuda@:10.99'): + if spec.satisfies('^cuda@:10'): args.append('-DCUB_DIR={0}'.format( spec['cub'].prefix)) if '+nccl' in spec: @@ -441,7 +441,7 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): args.append('-DcuDNN_DIR={0}'.format( spec['cudnn'].prefix)) - if '+cub' in spec and spec.satisfies('^cuda@:10.99'): + if '+cub' in spec and spec.satisfies('^cuda@:10'): args.append('-DCUB_DIR={0}'.format( spec['cub'].prefix)) diff --git a/var/spack/repos/builtin/packages/lhapdf5/package.py b/var/spack/repos/builtin/packages/lhapdf5/package.py index ba3149c6bc..74a133e487 100644 --- a/var/spack/repos/builtin/packages/lhapdf5/package.py +++ b/var/spack/repos/builtin/packages/lhapdf5/package.py @@ -30,7 +30,7 @@ class Lhapdf5(AutotoolsPackage): variant('python2', default=False, description="Enable Python2 extension") - depends_on('python@2.3:2.7.99', when='+python2') + depends_on('python@2.3:2.7', when='+python2') def setup_build_environment(self, env): env.append_flags('FFLAGS', '-std=legacy') diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index b9eca56b97..a3d9e99d24 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -42,7 +42,7 @@ class Libarchive(AutotoolsPackage): depends_on('nettle', when='crypto=nettle') depends_on('openssl', when='crypto=openssl') - depends_on('mbedtls@2:2.999 +pic', when='crypto=mbedtls') + depends_on('mbedtls@2.0:2 +pic', when='crypto=mbedtls') depends_on('libxml2', when='xar=libxml2') depends_on('expat', when='xar=expat') diff --git a/var/spack/repos/builtin/packages/libbson/package.py b/var/spack/repos/builtin/packages/libbson/package.py index 99da85f08a..d62b9f5ff9 100644 --- a/var/spack/repos/builtin/packages/libbson/package.py +++ b/var/spack/repos/builtin/packages/libbson/package.py @@ -71,7 +71,7 @@ class Libbson(Package): # 1.6.1 tarball is broken return self.spec.satisfies('@1.6.1') - @when('@:1.9.99') + @when('@:1.9') def install(self, spec, prefix): configure('--prefix={0}'.format(prefix)) make() diff --git a/var/spack/repos/builtin/packages/libcumlprims/package.py b/var/spack/repos/builtin/packages/libcumlprims/package.py index 07bb1e6348..5d7ba000cb 100644 --- a/var/spack/repos/builtin/packages/libcumlprims/package.py +++ b/var/spack/repos/builtin/packages/libcumlprims/package.py @@ -16,9 +16,9 @@ class Libcumlprims(Package): version('0.15.0-cuda10.2_gdbd0d39_0', sha256='b7a8740de0d15380829f42fcb078567e73ab7d29b14be073376153bf2d8ec945') version('0.15.0-cuda10.1_gdbd0d39_0', sha256='f055f904b5ef67995869b0bc648d9fe30839b08e77cb335573bf9f1c816d4d9b') - depends_on('cuda@11.0.0:11.0.999', when='@0.15.0-cuda11.0_gdbd0d39_0') - depends_on('cuda@10.2.0:10.2.999', when='@0.15.0-cuda10.2_gdbd0d39_0') - depends_on('cuda@10.1.0:10.1.999', when='@0.15.0-cuda10.1_gdbd0d39_0') + depends_on('cuda@11.0.0:11.0', when='@0.15.0-cuda11.0_gdbd0d39_0') + depends_on('cuda@10.2.0:10.2', when='@0.15.0-cuda10.2_gdbd0d39_0') + depends_on('cuda@10.1.0:10.1', when='@0.15.0-cuda10.1_gdbd0d39_0') @property def headers(self): diff --git a/var/spack/repos/builtin/packages/libevent/package.py b/var/spack/repos/builtin/packages/libevent/package.py index 764eca3423..70fe512a2d 100644 --- a/var/spack/repos/builtin/packages/libevent/package.py +++ b/var/spack/repos/builtin/packages/libevent/package.py @@ -37,7 +37,7 @@ class Libevent(AutotoolsPackage): variant('openssl', default=True, description="Build with encryption enabled at the libevent level.") # Versions before 2.1 do not build with OpenSSL 1.1 - depends_on('openssl@:1.0', when='@:2.0.99+openssl') + depends_on('openssl@:1.0', when='@:2.0+openssl') depends_on('openssl', when='+openssl') def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index 5a24da6071..8f6ecfec17 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -60,7 +60,7 @@ class Libint(AutotoolsPackage): depends_on('gmp', when='@2:') for tvariant in TUNE_VARIANTS[1:]: - conflicts('tune={0}'.format(tvariant), when='@:2.5.99', + conflicts('tune={0}'.format(tvariant), when='@:2.5', msg=('for versions prior to 2.6, tuning for specific' 'codes/configurations is not supported')) diff --git a/var/spack/repos/builtin/packages/libmesh/package.py b/var/spack/repos/builtin/packages/libmesh/package.py index 8a19a00fe6..3b125c1726 100644 --- a/var/spack/repos/builtin/packages/libmesh/package.py +++ b/var/spack/repos/builtin/packages/libmesh/package.py @@ -73,7 +73,7 @@ class Libmesh(AutotoolsPackage): 'scheduler, in the case of openmp and tbb)', values=('none', 'pthreads', 'tbb', 'openmp'), multi=False) - conflicts('+metaphysicl', when='@:1.2.999', + conflicts('+metaphysicl', when='@:1.2', msg='The interface to metaphysicl is not available in libMesh ' 'versions older than 1.3.0. Please explicitly disable this ' 'variant.') diff --git a/var/spack/repos/builtin/packages/libproxy/package.py b/var/spack/repos/builtin/packages/libproxy/package.py index ab33c26c1d..eacbc37804 100644 --- a/var/spack/repos/builtin/packages/libproxy/package.py +++ b/var/spack/repos/builtin/packages/libproxy/package.py @@ -21,4 +21,4 @@ class Libproxy(CMakePackage): depends_on('zlib') depends_on('python', type=('build', 'run'), when='@0.4.16:') - depends_on('python@:3.6.99', type=('build', 'run'), when='@:0.4.15') + depends_on('python@:3.6', type=('build', 'run'), when='@:0.4.15') diff --git a/var/spack/repos/builtin/packages/libsakura/package.py b/var/spack/repos/builtin/packages/libsakura/package.py index 20bf879a0d..94f531bc14 100644 --- a/var/spack/repos/builtin/packages/libsakura/package.py +++ b/var/spack/repos/builtin/packages/libsakura/package.py @@ -21,7 +21,7 @@ class Libsakura(CMakePackage): depends_on('cmake@2.8:', type='build') depends_on('eigen@3.2:') - depends_on('fftw@3.3.2: precision=float', when='@:3.99') + depends_on('fftw@3.3.2: precision=float', when='@:3') depends_on('fftw@3.3.2: precision=double', when='@4.0.0:') depends_on('log4cxx') diff --git a/var/spack/repos/builtin/packages/libspatialite/package.py b/var/spack/repos/builtin/packages/libspatialite/package.py index a1dc87b77f..09bef51747 100644 --- a/var/spack/repos/builtin/packages/libspatialite/package.py +++ b/var/spack/repos/builtin/packages/libspatialite/package.py @@ -32,7 +32,7 @@ class Libspatialite(AutotoolsPackage): depends_on('pkgconfig', type='build') depends_on('sqlite+rtree') - depends_on('proj@:5', when='@:4.999.999') + depends_on('proj@:5', when='@:4') # PROJ.6 is OK w/ newer versions # https://www.gaia-gis.it/fossil/libspatialite/wiki?name=PROJ.6 depends_on('proj') diff --git a/var/spack/repos/builtin/packages/libxext/package.py b/var/spack/repos/builtin/packages/libxext/package.py index a9e8f4871d..50a466906d 100644 --- a/var/spack/repos/builtin/packages/libxext/package.py +++ b/var/spack/repos/builtin/packages/libxext/package.py @@ -17,7 +17,7 @@ class Libxext(AutotoolsPackage, XorgPackage): depends_on('libx11@1.6:') depends_on('xproto@7.0.13:') - depends_on('xextproto@7.1.99:') + depends_on('xextproto@7.2:') depends_on('pkgconfig', type='build') depends_on('util-macros', type='build') diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 72c9d92cef..c8017c719e 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -35,7 +35,7 @@ class LlvmAmdgpu(CMakePackage): variant('rocm-device-libs', default=True, description='Build ROCm device libs as external LLVM project instead of a standalone spack package.') variant('openmp', default=True, description='Enable OpenMP') - depends_on('cmake@3.4.3:', type='build', when='@:3.8.99') + depends_on('cmake@3.4.3:', type='build', when='@:3.8') depends_on('cmake@3.13.4:', type='build', when='@3.9.0:') depends_on('python', type='build') depends_on('z3', type='link') diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py index 5e5412be2e..c384210561 100644 --- a/var/spack/repos/builtin/packages/llvm-doe/package.py +++ b/var/spack/repos/builtin/packages/llvm-doe/package.py @@ -154,7 +154,7 @@ class LlvmDoe(CMakePackage, CudaPackage): conflicts("+internal_unwind", when="~clang") conflicts("+compiler-rt", when="~clang") - conflicts("%gcc@:5.0.999") + conflicts("%gcc@:5.0") # cuda_arch value must be specified conflicts("cuda_arch=none", when="+cuda", msg="A value for cuda_arch must be specified.") @@ -188,7 +188,7 @@ class LlvmDoe(CMakePackage, CudaPackage): # https://github.com/spack/spack/issues/19625, # merged in llvm-11.0.0_rc2 - patch("lldb_external_ncurses-10.patch", when="@10.0.0:10.99+lldb") + patch("lldb_external_ncurses-10.patch", when="@10.0.0:10+lldb") # https://github.com/spack/spack/issues/19908 # merged in llvm main prior to 12.0.0 diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 66eba92721..9356158efb 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -152,12 +152,12 @@ class Llvm(CMakePackage, CudaPackage): # Build dependency depends_on("cmake@3.4.3:", type="build") - depends_on("python@2.7:2.8", when="@:4.999 ~python", type="build") + depends_on("python@2.7:2.8", when="@:4 ~python", type="build") depends_on("python", when="@5: ~python", type="build") depends_on("pkgconfig", type="build") # Universal dependency - depends_on("python@2.7:2.8", when="@:4.999+python") + depends_on("python@2.7:2.8", when="@:4+python") depends_on("python", when="@5:+python") depends_on("z3", when="@9:") @@ -179,8 +179,8 @@ class Llvm(CMakePackage, CudaPackage): depends_on("binutils+gold+ld+plugins", when="+gold") # polly plugin - depends_on("gmp", when="@:3.6.999 +polly") - depends_on("isl", when="@:3.6.999 +polly") + depends_on("gmp", when="@:3.6 +polly") + depends_on("isl", when="@:3.6 +polly") conflicts("+llvm_dylib", when="+shared_libs") conflicts("+lldb", when="~clang") @@ -189,15 +189,15 @@ class Llvm(CMakePackage, CudaPackage): conflicts("+compiler-rt", when="~clang") conflicts("+flang", when="~clang") # Introduced in version 11 as a part of LLVM and not a separate package. - conflicts("+flang", when="@:10.999") + conflicts("+flang", when="@:10") # Older LLVM do not build with newer GCC conflicts("%gcc@11:", when="@:7") conflicts("%gcc@8:", when="@:5") - conflicts("%gcc@:5.0.999", when="@8:") + conflicts("%gcc@:5.0", when="@8:") # OMP TSAN exists in > 5.x - conflicts("+omp_tsan", when="@:5.99") + conflicts("+omp_tsan", when="@:5") # cuda_arch value must be specified conflicts("cuda_arch=none", when="+cuda", msg="A value for cuda_arch must be specified.") diff --git a/var/spack/repos/builtin/packages/m4/package.py b/var/spack/repos/builtin/packages/m4/package.py index d15be408ac..8f1e7e1281 100644 --- a/var/spack/repos/builtin/packages/m4/package.py +++ b/var/spack/repos/builtin/packages/m4/package.py @@ -89,7 +89,7 @@ class M4(AutotoolsPackage, GNUMirrorPackage): spec.satisfies('%fj')) and not spec.satisfies('platform=darwin'): args.append('LDFLAGS=-rtlib=compiler-rt') - if spec.satisfies('%intel@:18.999'): + if spec.satisfies('%intel@:18'): args.append('CFLAGS=-no-gcc') if '+sigsegv' in spec: diff --git a/var/spack/repos/builtin/packages/manta/package.py b/var/spack/repos/builtin/packages/manta/package.py index 7dfcc39722..3e1e58b708 100644 --- a/var/spack/repos/builtin/packages/manta/package.py +++ b/var/spack/repos/builtin/packages/manta/package.py @@ -20,7 +20,7 @@ class Manta(CMakePackage): version('1.3.0', sha256='3db4b5475c33e3aeeb5435969c74364af9d2d77dd3bcf8dc70bf44a851e450dd') depends_on('cmake@2.8.12:', type='build') - depends_on('python@2.7.0:2.7.999', type=('build', 'run')) + depends_on('python@2.7.0:2.7', type=('build', 'run')) depends_on('zlib') patch('for_aarch64.patch', when='target=aarch64:') diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 2041f79eef..90f0b979b0 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -31,8 +31,8 @@ class Mercurial(PythonPackage): version('3.8.2', sha256='cb78b16956140625266a8a6d1fadc7c868969d994086e1ec60279a66bf20bffd') version('3.8.1', sha256='face1f058de5530b56b0dfd3b4d0b23d89590c588605c06f3d18b79e8c30d594') - depends_on('python+bz2+ssl+zlib@2.6:2.8', when='@:4.2.99', type=('build', 'run')) - depends_on('python+bz2+ssl+zlib@2.7:2.8,3.5.3:3.5.999,3.6.2:', when='@4.3:', type=('build', 'run')) + depends_on('python+bz2+ssl+zlib@2.6:2.8', when='@:4.2', type=('build', 'run')) + depends_on('python+bz2+ssl+zlib@2.7:2.8,3.5.3:3.5,3.6.2:', when='@4.3:', type=('build', 'run')) depends_on('py-setuptools', when='@3.6:', type='build') depends_on('py-docutils', type='build') depends_on('py-pygments', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index 193b41a6e2..0c74c566b6 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -38,11 +38,11 @@ class Metis(Package): # Prior to version 5, the (non-cmake) build system only knows about # 'build_type=Debug|Release'. - conflicts('@:4.999', when='build_type=RelWithDebInfo') - conflicts('@:4.999', when='build_type=MinSizeRel') - conflicts('@:4.999', when='+gdb') - conflicts('@:4.999', when='+int64') - conflicts('@:4.999', when='+real64') + conflicts('@:4', when='build_type=RelWithDebInfo') + conflicts('@:4', when='build_type=MinSizeRel') + conflicts('@:4', when='+gdb') + conflicts('@:4', when='+int64') + conflicts('@:4', when='+real64') depends_on('cmake@2.8:', when='@5:', type='build') diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index ebd8c2cbaf..f1acb85db8 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -160,34 +160,34 @@ class Mfem(Package, CudaPackage, ROCmPackage): conflicts('+shared', when='@:3.3.2') conflicts('~static~shared') - conflicts('~threadsafe', when='@:3.99.99+openmp') + conflicts('~threadsafe', when='@:3+openmp') - conflicts('+cuda', when='@:3.99.99') - conflicts('+rocm', when='@:4.1.99') + conflicts('+cuda', when='@:3') + conflicts('+rocm', when='@:4.1') conflicts('+cuda+rocm') conflicts('+netcdf', when='@:3.1') conflicts('+superlu-dist', when='@:3.1') # STRUMPACK support was added in mfem v3.3.2, however, here we allow only # strumpack v3+ support for which is available starting with mfem v4.0: - conflicts('+strumpack', when='@:3.99.99') + conflicts('+strumpack', when='@:3') conflicts('+gnutls', when='@:3.1') conflicts('+zlib', when='@:3.2') conflicts('+mpfr', when='@:3.2') conflicts('+petsc', when='@:3.2') - conflicts('+slepc', when='@:4.1.99') + conflicts('+slepc', when='@:4.1') conflicts('+sundials', when='@:3.2') conflicts('+pumi', when='@:3.3.2') - conflicts('+gslib', when='@:4.0.99') + conflicts('+gslib', when='@:4.0') conflicts('timer=mac', when='@:3.3.0') conflicts('timer=mpi', when='@:3.3.0') conflicts('~metis+mpi', when='@:3.3.0') conflicts('+metis~mpi', when='@:3.3.0') conflicts('+conduit', when='@:3.3.2') - conflicts('+occa', when='mfem@:3.99.99') - conflicts('+raja', when='mfem@:3.99.99') - conflicts('+libceed', when='mfem@:4.0.99') - conflicts('+umpire', when='mfem@:4.0.99') - conflicts('+amgx', when='mfem@:4.1.99') + conflicts('+occa', when='mfem@:3') + conflicts('+raja', when='mfem@:3') + conflicts('+libceed', when='mfem@:4.0') + conflicts('+umpire', when='mfem@:4.0') + conflicts('+amgx', when='mfem@:4.1') conflicts('+amgx', when='~cuda') conflicts('+superlu-dist', when='~mpi') @@ -198,8 +198,8 @@ class Mfem(Package, CudaPackage, ROCmPackage): conflicts('timer=mpi', when='~mpi') depends_on('mpi', when='+mpi') - depends_on('hypre@2.10.0:2.13.99', when='@:3.3.99+mpi') - depends_on('hypre@:2.20.0', when='@3.4:4.2.99+mpi') + depends_on('hypre@2.10.0:2.13', when='@:3.3+mpi') + depends_on('hypre@:2.20.0', when='@3.4:4.2+mpi') depends_on('hypre@:2.22.0', when='@4.3.0+mpi') depends_on('hypre', when='+mpi') @@ -248,14 +248,14 @@ class Mfem(Package, CudaPackage, ROCmPackage): # superlu-dist@6.1.1. See https://github.com/mfem/mfem/issues/983. # This issue was resolved in v4.1. conflicts('+superlu-dist', - when='mfem@:4.0.99 ^hypre@2.16.0: ^superlu-dist@6:') + when='mfem@:4.0 ^hypre@2.16.0: ^superlu-dist@6:') # The STRUMPACK v3 interface in MFEM seems to be broken as of MFEM v4.1 # when using hypre version >= 2.16.0. # This issue is resolved in v4.2. - conflicts('+strumpack', when='mfem@4.0.0:4.1.99 ^hypre@2.16.0:') + conflicts('+strumpack', when='mfem@4.0.0:4.1 ^hypre@2.16.0:') conflicts('+strumpack ^strumpack+cuda', when='~cuda') - depends_on('occa@1.0.8:', when='@:4.1.99+occa') + depends_on('occa@1.0.8:', when='@:4.1+occa') depends_on('occa@1.1.0:', when='@4.2.0:+occa') depends_on('occa+cuda', when='+occa+cuda') # TODO: propagate '+rocm' variant to occa when it is supported @@ -269,7 +269,7 @@ class Mfem(Package, CudaPackage, ROCmPackage): depends_on('raja+rocm amdgpu_target={0}'.format(gfx), when='+raja+rocm amdgpu_target={0}'.format(gfx)) - depends_on('libceed@0.6:', when='@:4.1.99+libceed') + depends_on('libceed@0.6:', when='@:4.1+libceed') depends_on('libceed@0.7:', when='@4.2.0:+libceed') for sm_ in CudaPackage.cuda_arch_values: depends_on('libceed+cuda cuda_arch={0}'.format(sm_), diff --git a/var/spack/repos/builtin/packages/mfem/test_builds.sh b/var/spack/repos/builtin/packages/mfem/test_builds.sh index fd6624eaf5..ed6a8fde49 100755 --- a/var/spack/repos/builtin/packages/mfem/test_builds.sh +++ b/var/spack/repos/builtin/packages/mfem/test_builds.sh @@ -11,7 +11,7 @@ backends='+occa+raja+libceed' backends_specs='^occa~cuda ^raja~openmp' # help the concrtizer find suitable hdf5 version (conduit constraint) -hdf5_spec='^hdf5@1.8.19:1.8.999' +hdf5_spec='^hdf5@1.8.19:1.8' # petsc spec petsc_spec='^petsc+suite-sparse+mumps' # strumpack spec without cuda diff --git a/var/spack/repos/builtin/packages/modern-wheel/package.py b/var/spack/repos/builtin/packages/modern-wheel/package.py index 1ad4623343..99123fbd3b 100644 --- a/var/spack/repos/builtin/packages/modern-wheel/package.py +++ b/var/spack/repos/builtin/packages/modern-wheel/package.py @@ -34,8 +34,8 @@ class ModernWheel(CMakePackage): # https://gitlab.kitware.com/cmake/cmake/issues/17575 # Until then, just assume that we cannot correctly configure # ModernWheel with Boost >= 1.66.0. - depends_on('boost +system +filesystem', when='@:1.1.999') - depends_on('boost@:1.65.999 +system +filesystem', when='@1.2:') + depends_on('boost +system +filesystem', when='@:1.1') + depends_on('boost@:1.65 +system +filesystem', when='@1.2:') # add virtual destructor to BaseMultiParms class. patch('add_virtual_destructor.patch') diff --git a/var/spack/repos/builtin/packages/mongo-c-driver/package.py b/var/spack/repos/builtin/packages/mongo-c-driver/package.py index 2e8ce0a4d4..85e7f200c6 100644 --- a/var/spack/repos/builtin/packages/mongo-c-driver/package.py +++ b/var/spack/repos/builtin/packages/mongo-c-driver/package.py @@ -46,12 +46,12 @@ class MongoCDriver(Package): depends_on('pkgconfig', type='build') # When updating mongo-c-driver, libbson has to be kept in sync. - depends_on('libbson@1.17.0:1.17.99', when='@1.17') - depends_on('libbson@1.16.0:1.16.99', when='@1.16') - depends_on('libbson@1.9.0:1.9.99', when='@1.9') - depends_on('libbson@1.8.0:1.8.99', when='@1.8') - depends_on('libbson@1.7.0:1.7.99', when='@1.7') - depends_on('libbson@1.6.0:1.6.99', when='@1.6') + depends_on('libbson@1.17.0:1.17', when='@1.17') + depends_on('libbson@1.16.0:1.16', when='@1.16') + depends_on('libbson@1.9.0:1.9', when='@1.9') + depends_on('libbson@1.8.0:1.8', when='@1.8') + depends_on('libbson@1.7.0:1.7', when='@1.7') + depends_on('libbson@1.6.0:1.6', when='@1.6') depends_on('openssl', when='+ssl') depends_on('snappy', when='+snappy') @@ -133,7 +133,7 @@ class MongoCDriver(Package): return args - @when('@:1.9.99') + @when('@:1.9') def install(self, spec, prefix): configure('--prefix={0}'.format(prefix), *self.configure_args()) make() diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py index a689bbb102..a4cbd2d116 100644 --- a/var/spack/repos/builtin/packages/motioncor2/package.py +++ b/var/spack/repos/builtin/packages/motioncor2/package.py @@ -25,9 +25,9 @@ class Motioncor2(Package): 'c75738160ac18d3f27c33677e78e63313d8ec2b023b5a46173428c3fa0451a94', url='http://msg.ucsf.edu/MotionCor2/MotionCor2-1.0.4.tar.gz') - depends_on('cuda@8.0:8.99', type='run') + depends_on('cuda@8.0:8', type='run') # libtiff.so.3 is required - depends_on('libtiff@3.0:3.99', type='run') + depends_on('libtiff@3.0:3', type='run') def install(self, spec, prefix): mkdirp(prefix.bin) diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index 46eaf8235e..9bb880ba02 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -59,7 +59,7 @@ class Mxnet(CMakePackage, CudaPackage): depends_on('ninja', type='build') depends_on('pkgconfig', when='@1.6.0', type='build') depends_on('blas') - depends_on('cuda@:10.2.999', when='@:1.8.0 +cuda') + depends_on('cuda@:10.2', when='@:1.8.0 +cuda') depends_on('cuda@:11.3', when='@2.0.0: +cuda') depends_on('cudnn', when='+cudnn') depends_on('nccl', when='+nccl') @@ -71,15 +71,15 @@ class Mxnet(CMakePackage, CudaPackage): extends('python', when='+python') depends_on('python@2.7:2.8,3.4:', when='@:1.8.0+python', type=('build', 'run')) depends_on('python@3.6:', when='@2.0.0:+python', type=('build', 'run')) - depends_on('py-contextvars', when='@2.0.0:+python ^python@3.6.0:3.6.999', type=('build', 'run')) + depends_on('py-contextvars', when='@2.0.0:+python ^python@3.6.0:3.6', type=('build', 'run')) depends_on('py-setuptools', when='+python', type='build') depends_on('py-cython', when='+python', type='build') depends_on('py-numpy@1.17:', when='@2.0.0:+python', type=('build', 'run')) - depends_on('py-numpy@1.16.1:1.999', when='@1.6:1.8.0+python', type=('build', 'run')) + depends_on('py-numpy@1.16.1:1', when='@1.6:1.8.0+python', type=('build', 'run')) depends_on('py-numpy@1.8.2:1.15.0', when='@1.3.0+python', type=('build', 'run')) - depends_on('py-requests@2.20.0:2.999', when='@1.6:+python', type=('build', 'run')) - depends_on('py-requests@2.18.4:2.18.999', when='@1.3.0+python', type=('build', 'run')) - depends_on('py-graphviz@0.8.1:0.8.999', when='+python', type=('build', 'run')) + depends_on('py-requests@2.20.0:2', when='@1.6:+python', type=('build', 'run')) + depends_on('py-requests@2.18.4:2.18', when='@1.3.0+python', type=('build', 'run')) + depends_on('py-graphviz@0.8.1:0.8', when='+python', type=('build', 'run')) conflicts('+cudnn', when='~cuda') conflicts('+nccl', when='~cuda') diff --git a/var/spack/repos/builtin/packages/mysql/package.py b/var/spack/repos/builtin/packages/mysql/package.py index 945b191c70..81c2634c9a 100644 --- a/var/spack/repos/builtin/packages/mysql/package.py +++ b/var/spack/repos/builtin/packages/mysql/package.py @@ -55,7 +55,7 @@ class Mysql(CMakePackage): description='Use the specified C++ standard when building.') # 5.7.X cannot be compiled client-only. - conflicts('+client_only', when='@5.7.0:5.7.999') + conflicts('+client_only', when='@5.7.0:5.7') # Server code has a macro 'byte', which conflicts with C++17's # std::byte. conflicts('cxxstd=17', when='@8.0.0:~client_only') @@ -65,12 +65,12 @@ class Mysql(CMakePackage): # https://dev.mysql.com/doc/refman/8.0/en/source-installation.html # See CMAKE_MINIMUM_REQUIRED in CMakeLists.txt - depends_on('cmake@3.1.0:', type='build', when='@5.7.0:5.7.999 platform=win32') + depends_on('cmake@3.1.0:', type='build', when='@5.7.0:5.7 platform=win32') depends_on('cmake@3.8.0:', type='build', when='@8.0.0: platform=win32') depends_on('cmake@3.9.2:', type='build', when='@8.0.0: platform=darwin') depends_on('cmake@3.4.0:', type='build', when='@8.0.0: platform=solaris') - depends_on('cmake@2.6:', type='build', when='@:5.6.999') - depends_on('cmake@2.8.9:', type='build', when='@5.7.0:5.7.999') + depends_on('cmake@2.6:', type='build', when='@:5.6') + depends_on('cmake@2.8.9:', type='build', when='@5.7.0:5.7') depends_on('cmake@2.8.12:', type='build', when='@8.0.0:') depends_on('gmake@3.75:', type='build') @@ -105,22 +105,22 @@ class Mysql(CMakePackage): depends_on('boost@1.66.0 cxxstd=14', type='build', when='@8.0.11 cxxstd=14') depends_on('boost@1.66.0 cxxstd=17', type='build', when='@8.0.11 cxxstd=17') # 5.7.X - depends_on('boost@1.59.0 cxxstd=98', when='@5.7.0:5.7.999 cxxstd=98') - depends_on('boost@1.59.0 cxxstd=11', when='@5.7.0:5.7.999 cxxstd=11') - depends_on('boost@1.59.0 cxxstd=14', when='@5.7.0:5.7.999 cxxstd=14') - depends_on('boost@1.59.0 cxxstd=17', when='@5.7.0:5.7.999 cxxstd=17') + depends_on('boost@1.59.0 cxxstd=98', when='@5.7.0:5.7 cxxstd=98') + depends_on('boost@1.59.0 cxxstd=11', when='@5.7.0:5.7 cxxstd=11') + depends_on('boost@1.59.0 cxxstd=14', when='@5.7.0:5.7 cxxstd=14') + depends_on('boost@1.59.0 cxxstd=17', when='@5.7.0:5.7 cxxstd=17') depends_on('rpcsvc-proto') depends_on('ncurses') depends_on('openssl') depends_on('libtirpc', when='@5.7.0: platform=linux') depends_on('libedit', type=['build', 'run']) - depends_on('perl', type=['build', 'test'], when='@:7.99.99') + depends_on('perl', type=['build', 'test'], when='@:7') depends_on('bison@2.1:', type='build') depends_on('m4', type='build', when='@develop platform=solaris') - depends_on('cyrus-sasl', when='@:5.7.999') + depends_on('cyrus-sasl', when='@:5.7') - patch('fix-no-server-5.5.patch', level=1, when='@5.5.0:5.5.999') + patch('fix-no-server-5.5.patch', level=1, when='@5.5.0:5.5') def url_for_version(self, version): url = "https://dev.mysql.com/get/Downloads/MySQL-{0}/mysql-{1}.tar.gz" @@ -174,5 +174,5 @@ class Mysql(CMakePackage): env.append_flags('CXXFLAGS', '-Wno-error=register') if 'python' in self.spec.flat_dependencies() and \ - self.spec.satisfies('@:7.99.99'): + self.spec.satisfies('@:7'): self._fix_dtrace_shebang(env) diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index db75d470f2..afd20ec847 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -44,7 +44,7 @@ class Namd(MakefilePackage, CudaPackage): depends_on('charmpp@6.8.2', when="@2.13") depends_on('charmpp@6.7.1', when="@2.12") - depends_on('fftw@:2.99', when="fftw=2") + depends_on('fftw@:2', when="fftw=2") depends_on('fftw@3:', when="fftw=3") depends_on('amdfftw', when="fftw=amdfftw") diff --git a/var/spack/repos/builtin/packages/nest/package.py b/var/spack/repos/builtin/packages/nest/package.py index 4bb0058de5..8332a29fd0 100644 --- a/var/spack/repos/builtin/packages/nest/package.py +++ b/var/spack/repos/builtin/packages/nest/package.py @@ -38,11 +38,11 @@ class Nest(CMakePackage): description="Build shared libraries") # TODO add variants for neurosim and music when these are in spack - conflicts('~gsl', when='@:2.10.99', + conflicts('~gsl', when='@:2.10', msg='Option only introduced for non-ancient versions.') - conflicts('~shared', when='@:2.10.99', + conflicts('~shared', when='@:2.10', msg='Option only introduced for non-ancient versions.') - conflicts('~openmp', when='@:2.10.99', + conflicts('~openmp', when='@:2.10', msg='Option only introduced for non-ancient versions.') depends_on('python@2.6:', when='+python', type=('build', 'run')) @@ -64,15 +64,15 @@ class Nest(CMakePackage): extends('python', when='+python') # Before 2.12.0 it was an autotools package - @when('@:2.10.99') + @when('@:2.10') def cmake(self, spec, prefix): pass - @when('@:2.10.99') + @when('@:2.10') def build(self, spec, prefix): pass - @when('@:2.10.99') + @when('@:2.10') def install(self, spec, prefix): configure_args = ["CXXFLAGS=-std=c++03", "--prefix=" + prefix, diff --git a/var/spack/repos/builtin/packages/netcdf-c/package.py b/var/spack/repos/builtin/packages/netcdf-c/package.py index aa133a8def..f5f65960cc 100644 --- a/var/spack/repos/builtin/packages/netcdf-c/package.py +++ b/var/spack/repos/builtin/packages/netcdf-c/package.py @@ -107,7 +107,7 @@ class NetcdfC(AutotoolsPackage): # NetCDF 4.4.0 and prior have compatibility issues with HDF5 1.10 and later # https://github.com/Unidata/netcdf-c/issues/250 - depends_on('hdf5@:1.8.999', when='@:4.4.0') + depends_on('hdf5@:1.8', when='@:4.4.0') # The feature was introduced in version 4.1.2 # and was removed in version 4.4.0 diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 71135fc18b..1bd8177aa5 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -50,10 +50,10 @@ class NetlibLapack(CMakePackage): patch('ibm-xl-3.9.1.patch', when='@3.9.1 %xl_r') # https://github.com/Reference-LAPACK/lapack/issues/228 - patch('undefined_declarations.patch', when='@3.8.0:3.8.9999') + patch('undefined_declarations.patch', when='@3.8.0:3.8') # https://github.com/Reference-LAPACK/lapack/pull/268 - patch('testing.patch', when='@3.7.0:3.8.9999') + patch('testing.patch', when='@3.7.0:3.8') # virtual dependency provides('blas', when='~external-blas') diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index c0ba649553..4cc3a0b064 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -37,9 +37,9 @@ class ScalapackBase(CMakePackage): depends_on('cmake', when='@2.0.0:', type='build') # See: https://github.com/Reference-ScaLAPACK/scalapack/issues/9 - patch("cmake_fortran_mangle.patch", when='@2.0.2:2.0.99') + patch("cmake_fortran_mangle.patch", when='@2.0.2:2.0') # See: https://github.com/Reference-ScaLAPACK/scalapack/pull/10 - patch("mpi2-compatibility.patch", when='@2.0.2:2.0.99') + patch("mpi2-compatibility.patch", when='@2.0.2:2.0') # See: https://github.com/Reference-ScaLAPACK/scalapack/pull/16 patch("int_overflow.patch", when='@2.0.0:2.1.0') # See: https://github.com/Reference-ScaLAPACK/scalapack/pull/23 diff --git a/var/spack/repos/builtin/packages/neuron/package.py b/var/spack/repos/builtin/packages/neuron/package.py index 0934e1834f..b6f78d873b 100644 --- a/var/spack/repos/builtin/packages/neuron/package.py +++ b/var/spack/repos/builtin/packages/neuron/package.py @@ -112,7 +112,7 @@ class Neuron(CMakePackage): "./bin/nrnmech_makefile") # assign_operator is changed to fix wheel support - if self.spec.satisfies("@:7.99"): + if self.spec.satisfies("@:7"): assign_operator = "?=" else: assign_operator = "=" diff --git a/var/spack/repos/builtin/packages/nix/package.py b/var/spack/repos/builtin/packages/nix/package.py index e8cc1337bb..23a4691f7d 100644 --- a/var/spack/repos/builtin/packages/nix/package.py +++ b/var/spack/repos/builtin/packages/nix/package.py @@ -56,7 +56,7 @@ class Nix(AutotoolsPackage): depends_on('xz') # gcc 4.9+ and higher supported with c++14 - conflicts('%gcc@:4.8.99') + conflicts('%gcc@:4.8') def configure_args(self): args = [] diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index 3b5902bef8..a38b8f3b53 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -53,7 +53,7 @@ class NodeJs(Package): depends_on('python@2.7:2.8', when='@:11', type='build') # depends_on('bash-completion', when="+bash-completion") depends_on('icu4c', when='+icu4c') - depends_on('openssl@1.0.2d:1.0.99', when='@:9+openssl') + depends_on('openssl@1.0.2d:1.0', when='@:9+openssl') depends_on('openssl@1.1:', when='@10:+openssl') depends_on('zlib', when='+zlib') diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index 20236119ad..825fdf4512 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -35,12 +35,12 @@ class Octopus(Package, CudaPackage): depends_on('blas') depends_on('gsl@1.9:') depends_on('lapack') - depends_on('libxc@2:2.99', when='@:5.99') - depends_on('libxc@2:3.99', when='@6:7.99') - depends_on('libxc@2:4.99', when='@8:9.99') + depends_on('libxc@2.0:2', when='@:5') + depends_on('libxc@2.0:3', when='@6:7') + depends_on('libxc@2.0:4', when='@8:9') depends_on('libxc@3:5.0.0', when='@10:') depends_on('mpi') - depends_on('fftw@3:+mpi+openmp', when='@8:9.99') + depends_on('fftw@3:+mpi+openmp', when='@8:9') depends_on('fftw-api@3:', when='@10:') depends_on('metis@5:', when='+metis') depends_on('parmetis', when='+parmetis') diff --git a/var/spack/repos/builtin/packages/omega-h/package.py b/var/spack/repos/builtin/packages/omega-h/package.py index 41872a53ed..81c1f6e221 100644 --- a/var/spack/repos/builtin/packages/omega-h/package.py +++ b/var/spack/repos/builtin/packages/omega-h/package.py @@ -46,7 +46,7 @@ class OmegaH(CMakePackage): depends_on('zlib', when='+zlib') # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86610 - conflicts('%gcc@8:8.2.99', when='@:9.22.1') + conflicts('%gcc@8:8.2', when='@:9.22.1') def _bob_options(self): cmake_var_prefix = 'Omega_h_CXX_' diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py index e920701550..34e9dd09e6 100644 --- a/var/spack/repos/builtin/packages/ont-albacore/package.py +++ b/var/spack/repos/builtin/packages/ont-albacore/package.py @@ -20,7 +20,7 @@ class OntAlbacore(Package): extends('python') - depends_on('python@3.5.0:3.5.999', type=('build', 'run')) + depends_on('python@3.5.0:3.5', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('py-numpy@1.13.0', type=('build', 'run')) depends_on('py-python-dateutil', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/openblas/package.py b/var/spack/repos/builtin/packages/openblas/package.py index 199d7a1079..1785b5105d 100644 --- a/var/spack/repos/builtin/packages/openblas/package.py +++ b/var/spack/repos/builtin/packages/openblas/package.py @@ -126,10 +126,10 @@ class Openblas(MakefilePackage): patch('0001-use-usr-bin-env-perl.patch', when='@:0.3.13') # See https://github.com/spack/spack/issues/19932#issuecomment-733452619 - conflicts('%gcc@7.0.0:7.3.99,8.0.0:8.2.99', when='@0.3.11:') + conflicts('%gcc@7.0.0:7.3,8.0.0:8.2', when='@0.3.11:') # See https://github.com/xianyi/OpenBLAS/issues/3074 - conflicts('%gcc@:10.1.99', when='@0.3.13 target=ppc64le:') + conflicts('%gcc@:10.1', when='@0.3.13 target=ppc64le:') # See https://github.com/spack/spack/issues/3036 conflicts('%intel@16', when='@0.2.15:0.2.19') diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index f7b0e0663f..146b8a838b 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -319,7 +319,7 @@ class Openfoam(Package): depends_on('fftw-api') depends_on('boost') # OpenFOAM does not play nice with CGAL 5.X - depends_on('cgal@:4.99') + depends_on('cgal@:4') # The flex restriction is ONLY to deal with a spec resolution clash # introduced by the restriction within scotch! depends_on('flex@:2.6.1,2.6.4:') diff --git a/var/spack/repos/builtin/packages/openjdk/package.py b/var/spack/repos/builtin/packages/openjdk/package.py index 836042753b..97bec7cebc 100644 --- a/var/spack/repos/builtin/packages/openjdk/package.py +++ b/var/spack/repos/builtin/packages/openjdk/package.py @@ -74,12 +74,12 @@ class Openjdk(Package): is_preferred = preferred_version == ver version(ver, sha256=pkg[0], url=pkg[1], preferred=is_preferred) - provides('java@17', when='@17.0:17.99') - provides('java@16', when='@16.0:16.99') - provides('java@11', when='@11.0:11.99') - provides('java@10', when='@10.0:10.99') - provides('java@9', when='@9.0:9.99') - provides('java@8', when='@1.8.0:1.8.999') + provides('java@17', when='@17.0:17') + provides('java@16', when='@16.0:16') + provides('java@11', when='@11.0:11') + provides('java@10', when='@10.0:10') + provides('java@9', when='@9.0:9') + provides('java@8', when='@1.8.0:1.8') conflicts('target=ppc64:', msg='openjdk is not available for ppc64 (big endian)') diff --git a/var/spack/repos/builtin/packages/openloops/package.py b/var/spack/repos/builtin/packages/openloops/package.py index 2b1dfd199c..dbd1cce576 100644 --- a/var/spack/repos/builtin/packages/openloops/package.py +++ b/var/spack/repos/builtin/packages/openloops/package.py @@ -107,11 +107,11 @@ class Openloops(Package): else: f.write('-mcmodel=medium\n') - if self.spec.satisfies('@:1.999.999 processes=lcg.coll'): + if self.spec.satisfies('@:1 processes=lcg.coll'): copy(join_path(os.path.dirname(__file__), 'sft1.coll'), 'lcg.coll') elif self.spec.satisfies('@2:2.1.2 processes=lcg.coll'): copy(join_path(os.path.dirname(__file__), 'sft2.coll'), 'lcg.coll') - elif self.spec.satisfies('@2.1.2:2.99.99 processes=lcg.coll'): + elif self.spec.satisfies('@2.1.2:2 processes=lcg.coll'): copy(join_path(os.path.dirname(__file__), 'sft3.coll'), 'lcg.coll') def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index c612e009df..c43b0578bb 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -173,10 +173,10 @@ class Openmpi(AutotoolsPackage): # Make NAG compiler pass the -pthread option to the linker: # https://github.com/open-mpi/ompi/pull/6378 # We support only versions based on Libtool 2.4.6. - patch('nag_pthread/2.1.4_2.1.999_3.0.1_4.patch', when='@2.1.4:2.1.999,3.0.1:4%nag') + patch('nag_pthread/2.1.4_2.1.999_3.0.1_4.patch', when='@2.1.4:2.1,3.0.1:4%nag') patch('nag_pthread/2.1.2_2.1.3_3.0.0.patch', when='@2.1.2:2.1.3,3.0.0%nag') patch('nag_pthread/2.0.0_2.1.1.patch', when='@2.0.0:2.1.1%nag') - patch('nag_pthread/1.10.4_1.10.999.patch', when='@1.10.4:1.10.999%nag') + patch('nag_pthread/1.10.4_1.10.999.patch', when='@1.10.4:1.10%nag') patch('nvhpc-libtool.patch', when='@master %nvhpc') patch('nvhpc-configure.patch', when='%nvhpc') @@ -189,7 +189,7 @@ class Openmpi(AutotoolsPackage): # The first one was applied starting version v3.0.0 and backported to # v1.10. A subset with relevant modifications is applicable starting # version 1.8.4. - patch('use_mpi_tkr_sizeof/step_1.patch', when='@1.8.4:1.10.6,2:2.999') + patch('use_mpi_tkr_sizeof/step_1.patch', when='@1.8.4:1.10.6,2.0:2') # The second patch was applied starting version v4.0.0 and backported to # v2.x, v3.0.x, and v3.1.x. patch('use_mpi_tkr_sizeof/step_2.patch', when='@1.8.4:2.1.3,3:3.0.1') @@ -285,7 +285,7 @@ class Openmpi(AutotoolsPackage): # "configure: error: OMPI does not currently support hwloc v2 API" # Future ompi releases may support it, needs to be verified. # See #7483 for context. - depends_on('hwloc@:1.999', when='@:3.999.999 ~internal-hwloc') + depends_on('hwloc@:1', when='@:3 ~internal-hwloc') depends_on('hwloc +cuda', when='+cuda ~internal-hwloc') depends_on('cuda', when='+cuda') @@ -348,7 +348,7 @@ class Openmpi(AutotoolsPackage): # knem support was added in 1.5 conflicts('fabrics=knem', when='@:1.4') - conflicts('schedulers=slurm ~pmi', when='@1.5.4:2.999.999', + conflicts('schedulers=slurm ~pmi', when='@1.5.4:2', msg='+pmi is required for openmpi(>=1.5.5) to work with SLURM.') conflicts('schedulers=loadleveler', when='@3.0.0:', msg='The loadleveler scheduler is not supported with ' @@ -727,19 +727,19 @@ class Openmpi(AutotoolsPackage): ]) # SQLite3 support - if spec.satisfies('@1.7.3:1.999'): + if spec.satisfies('@1.7.3:1'): if '+sqlite3' in spec: config_args.append('--with-sqlite3') else: config_args.append('--without-sqlite3') # VampirTrace support - if spec.satisfies('@1.3:1.999'): + if spec.satisfies('@1.3:1'): if '+vt' not in spec: config_args.append('--enable-contrib-no-build=vt') # Multithreading support - if spec.satisfies('@1.5.4:2.999'): + if spec.satisfies('@1.5.4:2'): if '+thread_multiple' in spec: config_args.append('--enable-mpi-thread-multiple') else: @@ -761,7 +761,7 @@ class Openmpi(AutotoolsPackage): if spec.satisfies('@1.7.2'): # There was a bug in 1.7.2 when --enable-static is used config_args.append('--enable-mca-no-build=pml-bfo') - if spec.satisfies('%pgi^cuda@7.0:7.999'): + if spec.satisfies('%pgi^cuda@7.0:7'): # OpenMPI has problems with CUDA 7 and PGI config_args.append( '--with-wrapper-cflags=-D__LP64__ -ta:tesla') diff --git a/var/spack/repos/builtin/packages/openpmd-api/package.py b/var/spack/repos/builtin/packages/openpmd-api/package.py index e1ce714245..d19c5889f7 100644 --- a/var/spack/repos/builtin/packages/openpmd-api/package.py +++ b/var/spack/repos/builtin/packages/openpmd-api/package.py @@ -74,7 +74,7 @@ class OpenpmdApi(CMakePackage): # Fix breaking HDF5 1.12.0 API when build with legacy api options # https://github.com/openPMD/openPMD-api/pull/1012 - patch('hdf5-1.12.0.patch', when='@:0.13.99 +hdf5') + patch('hdf5-1.12.0.patch', when='@:0.13 +hdf5') extends('python', when='+python') diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py index 56f6d3e488..9d25e04201 100644 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py @@ -93,7 +93,7 @@ class OpenspeedshopUtils(CMakePackage): depends_on("dyninst@develop", when='@develop') depends_on("dyninst@10:", when='@2.4.0:9999') - depends_on("python@2.7.14:2.7.99", type=('build', 'run')) + depends_on("python@2.7.14:2.7", type=('build', 'run')) depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 3d5a34857c..22f94196e6 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -89,7 +89,7 @@ class Openspeedshop(CMakePackage): depends_on("dyninst@develop", when='@develop') depends_on("dyninst@10:", when='@2.4.0:9999') - depends_on("python@2.7.14:2.7.99", type=('build', 'run')) + depends_on("python@2.7.14:2.7", type=('build', 'run')) depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/opensubdiv/package.py b/var/spack/repos/builtin/packages/opensubdiv/package.py index bc1a7ccc96..1d31496f62 100644 --- a/var/spack/repos/builtin/packages/opensubdiv/package.py +++ b/var/spack/repos/builtin/packages/opensubdiv/package.py @@ -34,7 +34,7 @@ class Opensubdiv(CMakePackage, CudaPackage): depends_on('graphviz', type='build', when='+doc') depends_on('doxygen', type='build', when='+doc') depends_on('py-docutils', type='build', when='+doc') - depends_on('python@2.6:2.999', type='build', when='+doc') + depends_on('python@2.6:2', type='build', when='+doc') depends_on('gl') depends_on('glew@1.9.0:') depends_on('glfw@3.0.0:') diff --git a/var/spack/repos/builtin/packages/pajeng/package.py b/var/spack/repos/builtin/packages/pajeng/package.py index c0d3be4104..eb342e2bb3 100644 --- a/var/spack/repos/builtin/packages/pajeng/package.py +++ b/var/spack/repos/builtin/packages/pajeng/package.py @@ -40,7 +40,7 @@ class Pajeng(CMakePackage): depends_on('boost') depends_on('flex') depends_on('bison') - depends_on('qt@:4.999+opengl', when='@:1.3.2+gui') + depends_on('qt@:4+opengl', when='@:1.3.2+gui') depends_on('freeglut', when='@:1.3.2+gui') depends_on('fmt', when='@develop') diff --git a/var/spack/repos/builtin/packages/papi/package.py b/var/spack/repos/builtin/packages/papi/package.py index a71251aa7b..eb93446058 100644 --- a/var/spack/repos/builtin/packages/papi/package.py +++ b/var/spack/repos/builtin/packages/papi/package.py @@ -63,11 +63,11 @@ class Papi(AutotoolsPackage): # This is the only way to match exactly version 6.0.0 without also # including version 6.0.0.1 due to spack version matching logic - conflicts('@5.9.99999:6.0.0.a', when='+static_tools', msg='Static tools cannot build on version 6.0.0') + conflicts('@6.0:6.0.0.a', when='+static_tools', msg='Static tools cannot build on version 6.0.0') # Does not build with newer versions of gcc, see # https://bitbucket.org/icl/papi/issues/46/cannot-compile-on-arch-linux - patch('https://bitbucket.org/icl/papi/commits/53de184a162b8a7edff48fed01a15980664e15b1/raw', sha256='64c57b3ad4026255238cc495df6abfacc41de391a0af497c27d0ac819444a1f8', when='@5.4.0:5.6.99%gcc@8:') + patch('https://bitbucket.org/icl/papi/commits/53de184a162b8a7edff48fed01a15980664e15b1/raw', sha256='64c57b3ad4026255238cc495df6abfacc41de391a0af497c27d0ac819444a1f8', when='@5.4.0:5.6%gcc@8:') patch('crayftn-fixes.patch', when='@6.0.0:%cce@9:') configure_directory = 'src' diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 4ee8f7b8c7..3b5ad20390 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -144,11 +144,11 @@ class Paraview(CMakePackage, CudaPackage): # Older builds of pugi export their symbols differently, # and pre-5.9 is unable to handle that. - depends_on('pugixml@:1.10', when='@:5.8.99') + depends_on('pugixml@:1.10', when='@:5.8') depends_on('pugixml', when='@5.9:') # Can't contretize with python2 and py-setuptools@45.0.0: - depends_on('py-setuptools@:44.99.99', when='+python') + depends_on('py-setuptools@:44', when='+python') # Can't contretize with python2 and py-pillow@7.0.0: depends_on('pil@:6', when='+python') @@ -168,7 +168,7 @@ class Paraview(CMakePackage, CudaPackage): patch('vtkm-catalyst-pv551.patch', when='@5.5.0:5.5.2') # Broken H5Part with external parallel HDF5 - patch('h5part-parallel.patch', when='@5.7:5.7.999') + patch('h5part-parallel.patch', when='@5.7.0:5.7') # Broken downstream FindMPI patch('vtkm-findmpi-downstream.patch', when='@5.9.0') diff --git a/var/spack/repos/builtin/packages/partitionfinder/package.py b/var/spack/repos/builtin/packages/partitionfinder/package.py index 6ef6d5ef65..6583022a94 100644 --- a/var/spack/repos/builtin/packages/partitionfinder/package.py +++ b/var/spack/repos/builtin/packages/partitionfinder/package.py @@ -16,7 +16,7 @@ class Partitionfinder(Package): version('2.1.1', sha256='ccf3718996ee6ca496909b4b97d2b075028e0543eba3bc47a8c14b689c84e061') - depends_on('python@2.7.10:2.999', type=('build', 'run')) + depends_on('python@2.7.10:2', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-pandas', type=('build', 'run')) depends_on('py-tables', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py index 3b37c51c6f..5c956f186f 100644 --- a/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py +++ b/var/spack/repos/builtin/packages/perl-perl6-slurp/package.py @@ -14,4 +14,4 @@ class PerlPerl6Slurp(PerlPackage): version('0.051005', sha256='0e0ceb30495ecf64dc6cacd12113d604871104c0cfe153487b8d68bc9393d78f') - depends_on('perl@5.8:5.999', type=('build', 'run')) + depends_on('perl@5.8:5', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py index 879088ed59..ddd732c5dd 100644 --- a/var/spack/repos/builtin/packages/perl/package.py +++ b/var/spack/repos/builtin/packages/perl/package.py @@ -97,8 +97,8 @@ class Perl(Package): # Perl doesn't use Autotools, it should subclass Package # Enable builds with the NVIDIA compiler # The Configure script assumes some gcc specific behavior, and use # the mini Perl environment to bootstrap installation. - patch('nvhpc-5.30.patch', when='@5.30.0:5.30.99 %nvhpc') - patch('nvhpc-5.32.patch', when='@5.32.0:5.32.99 %nvhpc') + patch('nvhpc-5.30.patch', when='@5.30.0:5.30 %nvhpc') + patch('nvhpc-5.32.patch', when='@5.32.0:5.32 %nvhpc') conflicts('@5.32.0:', when='%nvhpc@:20.11', msg='The NVIDIA compilers are incompatible with version 5.32 and later') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index f0529e61a6..c079aca0fa 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -184,7 +184,7 @@ class Petsc(Package, CudaPackage, ROCmPackage): conflicts('+trilinos', when='~mpi', msg=mpi_msg) # older versions of petsc did not support mumps when +int64 - conflicts('+mumps', when='@:3.12.99+int64') + conflicts('+mumps', when='@:3.12+int64') filter_compiler_wrappers( 'petscvariables', relative_root='lib/petsc/conf' @@ -217,14 +217,14 @@ class Petsc(Package, CudaPackage, ROCmPackage): depends_on('hipsparse', when='+rocm') # Build dependencies - depends_on('python@2.6:2.8', type='build', when='@:3.10.99') + depends_on('python@2.6:2.8', type='build', when='@:3.10') depends_on('python@2.6:2.8,3.4:', type='build', when='@3.11:') # Other dependencies - depends_on('metis@5:~int64+real64', when='@:3.7.99+metis~int64+double') - depends_on('metis@5:~int64', when='@:3.7.99+metis~int64~double') - depends_on('metis@5:+int64+real64', when='@:3.7.99+metis+int64+double') - depends_on('metis@5:+int64', when='@:3.7.99+metis+int64~double') + depends_on('metis@5:~int64+real64', when='@:3.7+metis~int64+double') + depends_on('metis@5:~int64', when='@:3.7+metis~int64~double') + depends_on('metis@5:+int64+real64', when='@:3.7+metis+int64+double') + depends_on('metis@5:+int64', when='@:3.7+metis+int64~double') # petsc-3.8+ uses default (float) metis with any (petsc) precision depends_on('metis@5:~int64', when='@3.8:+metis~int64') depends_on('metis@5:+int64', when='@3.8:+metis+int64') @@ -234,7 +234,7 @@ class Petsc(Package, CudaPackage, ROCmPackage): depends_on('scotch+esmumps~metis+mpi', when='+ptscotch') depends_on('scotch+int64', when='+ptscotch+int64') - depends_on('hdf5@:1.10.99+mpi', when='@:3.12.99+hdf5+mpi') + depends_on('hdf5@:1.10+mpi', when='@:3.12+hdf5+mpi') depends_on('hdf5+mpi', when='@3.13:+hdf5+mpi') depends_on('hdf5+mpi', when='+exodusii+mpi') depends_on('hdf5+mpi', when='+cgns+mpi') @@ -251,12 +251,12 @@ class Petsc(Package, CudaPackage, ROCmPackage): # Also PETSc prefer to build it without internal superlu, likely due to # conflict in headers see # https://bitbucket.org/petsc/petsc/src/90564b43f6b05485163c147b464b5d6d28cde3ef/config/BuildSystem/config/packages/hypre.py - depends_on('hypre@:2.13.99+mpi~internal-superlu~int64', when='@:3.8.99+hypre+mpi~complex~int64') - depends_on('hypre@:2.13.99+mpi~internal-superlu+int64', when='@:3.8.99+hypre+mpi~complex+int64') - depends_on('hypre@2.14:2.18.2+mpi~internal-superlu~int64', when='@3.9:3.13.99+hypre+mpi~complex~int64') - depends_on('hypre@2.14:2.18.2+mpi~internal-superlu+int64', when='@3.9:3.13.99+hypre+mpi~complex+int64') - depends_on('hypre@2.14:2.22.0+mpi~internal-superlu~int64', when='@3.14:3.15.99+hypre+mpi~complex~int64') - depends_on('hypre@2.14:2.22.0+mpi~internal-superlu+int64', when='@3.14:3.15.99+hypre+mpi~complex+int64') + depends_on('hypre@:2.13+mpi~internal-superlu~int64', when='@:3.8+hypre+mpi~complex~int64') + depends_on('hypre@:2.13+mpi~internal-superlu+int64', when='@:3.8+hypre+mpi~complex+int64') + depends_on('hypre@2.14:2.18.2+mpi~internal-superlu~int64', when='@3.9:3.13+hypre+mpi~complex~int64') + depends_on('hypre@2.14:2.18.2+mpi~internal-superlu+int64', when='@3.9:3.13+hypre+mpi~complex+int64') + 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: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') @@ -265,14 +265,14 @@ class Petsc(Package, CudaPackage, ROCmPackage): 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') depends_on('superlu-dist@:4.3+int64', when='@3.4.4:3.6.4+superlu-dist+mpi+int64') - depends_on('superlu-dist@5.0.0:5.1.3~int64', when='@3.7:3.7.99+superlu-dist+mpi~int64') - depends_on('superlu-dist@5.0.0:5.1.3+int64', when='@3.7:3.7.99+superlu-dist+mpi+int64') - depends_on('superlu-dist@5.2:5.2.99~int64', when='@3.8:3.9.99+superlu-dist+mpi~int64') - depends_on('superlu-dist@5.2:5.2.99+int64', when='@3.8:3.9.99+superlu-dist+mpi+int64') - depends_on('superlu-dist@5.4:5.4.99~int64', when='@3.10:3.10.2+superlu-dist+mpi~int64') - depends_on('superlu-dist@5.4:5.4.99+int64', when='@3.10:3.10.2+superlu-dist+mpi+int64') - depends_on('superlu-dist@6.1:6.1.99~int64', when='@3.10.3:3.12.99+superlu-dist+mpi~int64') - depends_on('superlu-dist@6.1:6.1.99+int64', when='@3.10.3:3.12.99+superlu-dist+mpi+int64') + depends_on('superlu-dist@5.0.0:5.1.3~int64', when='@3.7.0:3.7+superlu-dist+mpi~int64') + depends_on('superlu-dist@5.0.0:5.1.3+int64', when='@3.7.0:3.7+superlu-dist+mpi+int64') + depends_on('superlu-dist@5.2.0:5.2~int64', when='@3.8:3.9+superlu-dist+mpi~int64') + depends_on('superlu-dist@5.2.0:5.2+int64', when='@3.8:3.9+superlu-dist+mpi+int64') + depends_on('superlu-dist@5.4.0:5.4~int64', when='@3.10:3.10.2+superlu-dist+mpi~int64') + depends_on('superlu-dist@5.4.0:5.4+int64', when='@3.10:3.10.2+superlu-dist+mpi+int64') + 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.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') diff --git a/var/spack/repos/builtin/packages/pexsi/package.py b/var/spack/repos/builtin/packages/pexsi/package.py index e3803b8b98..37169ea232 100644 --- a/var/spack/repos/builtin/packages/pexsi/package.py +++ b/var/spack/repos/builtin/packages/pexsi/package.py @@ -32,9 +32,9 @@ class Pexsi(MakefilePackage): version('0.9.0', sha256='e5efe0c129013392cdac3234e37f1f4fea641c139b1fbea47618b4b839d05029') depends_on('parmetis') - depends_on('superlu-dist@3.3:3.999', when='@:0.9.0') - depends_on('superlu-dist@4.3:4.999', when='@0.9.2') - depends_on('superlu-dist@5.1.2:5.3.999', when='@0.10.2:') + 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( 'fortran', default=False, description='Builds the Fortran interface' diff --git a/var/spack/repos/builtin/packages/pfunit/package.py b/var/spack/repos/builtin/packages/pfunit/package.py index 16738f4d2f..3cf6f1c0bf 100644 --- a/var/spack/repos/builtin/packages/pfunit/package.py +++ b/var/spack/repos/builtin/packages/pfunit/package.py @@ -50,7 +50,7 @@ class Pfunit(CMakePackage): # See https://github.com/Goddard-Fortran-Ecosystem/pFUnit/pull/179 conflicts("+shared", when="@4.0.0:") conflicts("+use_comm_world", when="~mpi") - patch("mpi-test.patch", when="@:3.99.99 +use_comm_world") + patch("mpi-test.patch", when="@:3 +use_comm_world") def patch(self): # The package tries to put .mod files in directory ./mod; diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 4c4ddfad1c..0027e2ba4c 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -103,7 +103,7 @@ class Phist(CMakePackage): # ###################### Patches ########################## - patch('update_tpetra_gotypes.patch', when='@:1.8.99') + patch('update_tpetra_gotypes.patch', when='@:1.8') patch('sbang.patch', when='+fortran') @@ -132,7 +132,7 @@ class Phist(CMakePackage): # Fortran 2003 bindings were included in version 1.7, previously they # required a separate package - conflicts('+fortran', when='@:1.6.99') + conflicts('+fortran', when='@:1.6') # older gcc's may produce incorrect SIMD code and fail # to compile some OpenMP statements diff --git a/var/spack/repos/builtin/packages/pinentry/package.py b/var/spack/repos/builtin/packages/pinentry/package.py index 7b226f2cbe..81962e3352 100644 --- a/var/spack/repos/builtin/packages/pinentry/package.py +++ b/var/spack/repos/builtin/packages/pinentry/package.py @@ -38,7 +38,7 @@ class Pinentry(AutotoolsPackage): depends_on('gtkplus@2:', when='gui=gtk2') # depends_on('gnome@3:', when='gui=gnome3') # GNOME depends_on('qt@4.4.0:', when='gui=qt') - depends_on('qt@5.0:5.999', when='gui=qt5') + depends_on('qt@5.0:5', when='gui=qt5') # depends_on('tqt', when='gui=tqt') # Trinity QT depends_on('fltk@1.3:', when='gui=fltk') diff --git a/var/spack/repos/builtin/packages/plasma/package.py b/var/spack/repos/builtin/packages/plasma/package.py index cc8fb62ca5..215e45e25b 100644 --- a/var/spack/repos/builtin/packages/plasma/package.py +++ b/var/spack/repos/builtin/packages/plasma/package.py @@ -48,7 +48,7 @@ class Plasma(CMakePackage): conflicts("^atlas") # does not have LAPACKE interface # missing LAPACKE features and/or CBLAS headers - conflicts("^netlib-lapack@:3.5.999") + conflicts("^netlib-lapack@:3.5") # clashes with OpenBLAS declarations and has a problem compiling on its own conflicts("^cblas") @@ -57,9 +57,9 @@ class Plasma(CMakePackage): conflicts("^veclibfort") # only GCC 4.9+ and higher have sufficient support for OpenMP 4+ tasks+deps - conflicts("%gcc@:4.8.99", when='@:17.1') + conflicts("%gcc@:4.8", when='@:17.1') # only GCC 6.0+ and higher have for OpenMP 4+ Clause "priority" - conflicts("%gcc@:5.99", when='@17.2:') + conflicts("%gcc@:5", when='@17.2:') conflicts("%cce") conflicts('%apple-clang') diff --git a/var/spack/repos/builtin/packages/plink-ng/package.py b/var/spack/repos/builtin/packages/plink-ng/package.py index 11a44f5f1c..112bb03131 100644 --- a/var/spack/repos/builtin/packages/plink-ng/package.py +++ b/var/spack/repos/builtin/packages/plink-ng/package.py @@ -20,7 +20,7 @@ class PlinkNg(Package): depends_on('blas') depends_on('lapack') - conflicts('%gcc@:4.99') + conflicts('%gcc@:4') def url_for_version(self, ver): template = 'https://www.cog-genomics.org/static/bin/plink2_src_{0}.zip' diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index 6408c15225..1073ffe682 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -72,7 +72,7 @@ class Plumed(AutotoolsPackage): depends_on('lapack') # For libmatheval support through the 'function' module # which is enabled by default (or when optional_modules=all) - depends_on('libmatheval', when='@:2.4.99') + depends_on('libmatheval', when='@:2.4') depends_on('arrayfire', when='arrayfire=cpu') depends_on('arrayfire+cuda', when='arrayfire=cuda') depends_on('arrayfire+opencl', when='arrayfire=opencl') diff --git a/var/spack/repos/builtin/packages/pmerge/package.py b/var/spack/repos/builtin/packages/pmerge/package.py index 91411de322..681a7c17d5 100644 --- a/var/spack/repos/builtin/packages/pmerge/package.py +++ b/var/spack/repos/builtin/packages/pmerge/package.py @@ -19,7 +19,7 @@ class Pmerge(AutotoolsPackage): version('master', branch='master') - depends_on('automake@1.14:1.14.99', type='build') + depends_on('automake@1.14.0:1.14', type='build') depends_on('autoconf', type='build') depends_on('m4', type='build') depends_on('perl', type='build') diff --git a/var/spack/repos/builtin/packages/pmix/package.py b/var/spack/repos/builtin/packages/pmix/package.py index cc6099d41b..44aa3740d7 100644 --- a/var/spack/repos/builtin/packages/pmix/package.py +++ b/var/spack/repos/builtin/packages/pmix/package.py @@ -64,7 +64,7 @@ class Pmix(AutotoolsPackage): description='Build manpages') depends_on('libevent@2.0.20:2.0.22,2.1.8') - depends_on('hwloc@1.11.0:1.11.99,2.0.1:', when='@3.0.0:') + depends_on('hwloc@1.11.0:1.11,2.0.1:', when='@3.0.0:') depends_on("m4", type=("build"), when="@master") depends_on("autoconf", type=("build"), when="@master") depends_on("automake", type=("build"), when="@master") diff --git a/var/spack/repos/builtin/packages/pocl/package.py b/var/spack/repos/builtin/packages/pocl/package.py index e148b4b554..47e884793d 100644 --- a/var/spack/repos/builtin/packages/pocl/package.py +++ b/var/spack/repos/builtin/packages/pocl/package.py @@ -47,7 +47,7 @@ class Pocl(CMakePackage): depends_on("cmake @2.8.12:", type="build") depends_on("hwloc") - depends_on("hwloc@:1.99.99", when="@:1.1.99") + depends_on("hwloc@:1", when="@:1.1") depends_on("libtool", type=("build", "link", "run")) depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index fd6d8da504..a004e330c5 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -61,7 +61,7 @@ class Poppler(CMakePackage): depends_on('libtiff', when='+tiff') depends_on('qt@5.0:', when='@0.62.0:+qt') - depends_on('qt@4.0:4.8.6', when='@:0.61.999+qt') + depends_on('qt@4.0:4.8.6', when='@:0.61+qt') # Splash is unconditionally disabled. Unfortunately there's # a small section of code in the QT5 wrappers that expects it diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index d6a3f33d22..452ba8bc00 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -49,8 +49,8 @@ class Precice(CMakePackage): depends_on('pkgconfig', type='build', when='@2.2:') depends_on('boost@1.60.0:') depends_on('boost@1.65.1:', when='@1.4:') - depends_on('boost@:1.72.99', when='@:2.0.2') - depends_on('boost@:1.74.99', when='@:2.1.1') + depends_on('boost@:1.72', when='@:2.0.2') + depends_on('boost@:1.74', when='@:2.1.1') depends_on('eigen@3.2:') depends_on('eigen@:3.3.7', type='build', when='@:1.5') # bug in prettyprint depends_on('libxml2') diff --git a/var/spack/repos/builtin/packages/py-absl-py/package.py b/var/spack/repos/builtin/packages/py-absl-py/package.py index bf7fbb8c57..4b7f033dd0 100644 --- a/var/spack/repos/builtin/packages/py-absl-py/package.py +++ b/var/spack/repos/builtin/packages/py-absl-py/package.py @@ -27,4 +27,4 @@ class PyAbslPy(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type=('build')) depends_on('py-six', type=('build', 'run')) - depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3') diff --git a/var/spack/repos/builtin/packages/py-aiodns/package.py b/var/spack/repos/builtin/packages/py-aiodns/package.py index d6494e57e8..80542f878a 100644 --- a/var/spack/repos/builtin/packages/py-aiodns/package.py +++ b/var/spack/repos/builtin/packages/py-aiodns/package.py @@ -18,5 +18,5 @@ class PyAiodns(PythonPackage): version('1.1.1', sha256='d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea') depends_on('py-setuptools', type='build') - depends_on('py-typing', when='^python@:3.6.999', type=('build', 'run')) + depends_on('py-typing', when='^python@:3.6', type=('build', 'run')) depends_on('py-pycares@3.0.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-aiohttp/package.py b/var/spack/repos/builtin/packages/py-aiohttp/package.py index a94fed955f..d0b2e0c717 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp/package.py @@ -18,9 +18,9 @@ class PyAiohttp(PythonPackage): depends_on('py-setuptools', type='build') depends_on('python@3.5.3:', type=('build', 'run')) depends_on('py-attrs@17.3.0:', type=('build', 'run')) - depends_on('py-chardet@2.0:3.999', type=('build', 'run')) - depends_on('py-multidict@4.5:4.999', type=('build', 'run')) - depends_on('py-async-timeout@3.0:3.999', type=('build', 'run')) - depends_on('py-yarl@1.0:1.999', type=('build', 'run')) + depends_on('py-chardet@2.0:3', type=('build', 'run')) + depends_on('py-multidict@4.5:4', type=('build', 'run')) + depends_on('py-async-timeout@3.0:3', type=('build', 'run')) + depends_on('py-yarl@1.0:1', type=('build', 'run')) depends_on('py-idna-ssl@1.0:', type=('build', 'run'), when='^python@:3.6') depends_on('py-typing-extensions@3.6.5:', type=('build', 'run'), when='^python@:3.6') diff --git a/var/spack/repos/builtin/packages/py-alembic/package.py b/var/spack/repos/builtin/packages/py-alembic/package.py index b03bf6d5e6..2c9257c3c0 100644 --- a/var/spack/repos/builtin/packages/py-alembic/package.py +++ b/var/spack/repos/builtin/packages/py-alembic/package.py @@ -17,7 +17,7 @@ class PyAlembic(PythonPackage): depends_on('python@2.7:2.8,3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-sqlalchemy@1.3.0:', type=('build', 'run'), when='@1.5:') - depends_on('py-sqlalchemy@1.1.0:', type=('build', 'run'), when='@:1.4.999') + depends_on('py-sqlalchemy@1.1.0:', type=('build', 'run'), when='@:1.4') depends_on('py-mako', type=('build', 'run')) depends_on('py-python-dateutil', type=('build', 'run')) depends_on('py-python-editor@0.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-amqp/package.py b/var/spack/repos/builtin/packages/py-amqp/package.py index ddd3a4dc7c..36e8cb3f26 100644 --- a/var/spack/repos/builtin/packages/py-amqp/package.py +++ b/var/spack/repos/builtin/packages/py-amqp/package.py @@ -20,5 +20,5 @@ class PyAmqp(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-vine@1.1.3:4.999', when="@2.999", type=('build', 'run')) - depends_on('py-vine@5.0.0:5.999', when="@5.0.0:5.999", type=('build', 'run')) + depends_on('py-vine@1.1.3:4', when="@2", type=('build', 'run')) + depends_on('py-vine@5.0.0:5', when="@5.0.0:5", type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-anyio/package.py b/var/spack/repos/builtin/packages/py-anyio/package.py index c7838e8228..f8e5445ffa 100644 --- a/var/spack/repos/builtin/packages/py-anyio/package.py +++ b/var/spack/repos/builtin/packages/py-anyio/package.py @@ -18,8 +18,8 @@ class PyAnyio(PythonPackage): depends_on('python@3.6.2:', type=('build', 'run')) depends_on('py-setuptools@42:', type='build') depends_on('py-setuptools-scm+toml@3.4:', type='build') - depends_on('py-async-generator', when='^python@:3.6.999', type=('build', 'run')) - depends_on('py-dataclasses', when='^python@:3.6.999', type=('build', 'run')) + depends_on('py-async-generator', when='^python@:3.6', type=('build', 'run')) + depends_on('py-dataclasses', when='^python@:3.6', type=('build', 'run')) depends_on('py-idna@2.8:', type=('build', 'run')) depends_on('py-sniffio@1.1:', type=('build', 'run')) - depends_on('py-typing-extensions', when='^python@:3.7.999', type=('build', 'run')) + depends_on('py-typing-extensions', when='^python@:3.7', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-archspec/package.py b/var/spack/repos/builtin/packages/py-archspec/package.py index 0d63a036bc..3a79c0c4b6 100644 --- a/var/spack/repos/builtin/packages/py-archspec/package.py +++ b/var/spack/repos/builtin/packages/py-archspec/package.py @@ -16,7 +16,7 @@ class PyArchspec(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) - depends_on('py-click@7.1.2:7.999.0', type=('build', 'run')) - depends_on('py-six@1.13.0:1.999.0', type=('build', 'run')) + depends_on('py-click@7.1.2:7', type=('build', 'run')) + depends_on('py-six@1.13.0:1', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-argcomplete/package.py b/var/spack/repos/builtin/packages/py-argcomplete/package.py index b86c516613..3fe22bb766 100644 --- a/var/spack/repos/builtin/packages/py-argcomplete/package.py +++ b/var/spack/repos/builtin/packages/py-argcomplete/package.py @@ -17,5 +17,5 @@ class PyArgcomplete(PythonPackage): version('1.1.1', sha256='cca45b5fe07000994f4f06a0b95bd71f7b51b04f81c3be0b4ea7b666e4f1f084') depends_on('py-setuptools', type='build') - depends_on('py-importlib-metadata@0.23:4.999', when='@1.12.3: ^python@:3.7', type=('build', 'run')) - depends_on('py-importlib-metadata@0.23:1.999', when='@1.12: ^python@:3.7', type=('build', 'run')) + depends_on('py-importlib-metadata@0.23:4', when='@1.12.3: ^python@:3.7', type=('build', 'run')) + depends_on('py-importlib-metadata@0.23:1', when='@1.12: ^python@:3.7', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-argh/package.py b/var/spack/repos/builtin/packages/py-argh/package.py index 3ea2908dba..4458435a3b 100644 --- a/var/spack/repos/builtin/packages/py-argh/package.py +++ b/var/spack/repos/builtin/packages/py-argh/package.py @@ -23,4 +23,4 @@ class PyArgh(PythonPackage): version('0.26.2', sha256='e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65') depends_on('py-setuptools', type='build') - depends_on('py-argparse', when='^python@:2.6.999', type=('build', 'run')) + depends_on('py-argparse', when='^python@:2.6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-asdf/package.py b/var/spack/repos/builtin/packages/py-asdf/package.py index 51b0859025..8bb0b87843 100644 --- a/var/spack/repos/builtin/packages/py-asdf/package.py +++ b/var/spack/repos/builtin/packages/py-asdf/package.py @@ -21,6 +21,6 @@ class PyAsdf(PythonPackage): depends_on('py-setuptools-scm', type='build') depends_on('py-semantic-version@2.3.1:2.6.0', type=('build', 'run')) depends_on('py-pyyaml@3.10:', type=('build', 'run')) - depends_on('py-jsonschema@2.3:3.999', type=('build', 'run')) + depends_on('py-jsonschema@2.3:3', type=('build', 'run')) depends_on('py-six@1.9.0:', type=('build', 'run')) depends_on('py-numpy@1.8:', 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 15526117c1..76bd89f7df 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -31,21 +31,21 @@ class PyAstroid(PythonPackage): patch('PR546.patch', when='@1.6.6') # Dependencies taken from astroid/__pkginfo__.py - depends_on('python@2.7:2.8,3.4:', when='@:1.999', type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:', when='@:1', type=('build', 'run')) depends_on('python@3.4:', when='@2.0.0:', type=('build', 'run')) depends_on('python@3.5:', when='@2.3.3:', type=('build', 'run')) depends_on('python@3.6:', when='@2.5.6:', type=('build', 'run')) depends_on('py-lazy-object-proxy', type=('build', 'run')) # Starting with astroid 2.3.1, astroid's dependencies were restricted # to a given minor version, c.f. commit e1b4e11. - depends_on('py-lazy-object-proxy@1.4:1.4.999', when='@2.3.1:', type=('build', 'run')) + depends_on('py-lazy-object-proxy@1.4.0:1.4', when='@2.3.1:', type=('build', 'run')) depends_on('py-six', type=('build', 'run')) - depends_on('py-six@1.12:1.999', when='@2.3.3:', type=('build', 'run')) - depends_on('py-wrapt', when='@:2.2.999', type=('build', 'run')) - depends_on('py-wrapt@1.11:1.12.999', when='@2.3.3:', type=('build', 'run')) - depends_on('py-enum34@1.1.3:', when='^python@:3.3.99', type=('build', 'run')) - depends_on('py-singledispatch', when='^python@:3.3.99', type=('build', 'run')) - depends_on('py-backports-functools-lru-cache', when='^python@:3.2.99', type=('build', 'run')) - depends_on('py-typed-ast@1.3.0:1.3.999', when='@2.2.5:2.3.0 ^python@3.7.0:3.7.999') - depends_on('py-typed-ast@1.4.0:1.4.999', when='@2.3.1: ^python@:3.7.999', type=('build', 'run')) + depends_on('py-six@1.12:1', when='@2.3.3:', type=('build', 'run')) + depends_on('py-wrapt', when='@:2.2', type=('build', 'run')) + depends_on('py-wrapt@1.11:1.12', when='@2.3.3:', type=('build', 'run')) + 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.4.0:1.4', when='@2.3.1: ^python@:3.7', type=('build', 'run')) depends_on('py-setuptools@17.1:', type='build') diff --git a/var/spack/repos/builtin/packages/py-astunparse/package.py b/var/spack/repos/builtin/packages/py-astunparse/package.py index c411120ed7..5e53492f42 100644 --- a/var/spack/repos/builtin/packages/py-astunparse/package.py +++ b/var/spack/repos/builtin/packages/py-astunparse/package.py @@ -18,5 +18,5 @@ class PyAstunparse(PythonPackage): version('1.6.2', sha256='dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67') depends_on('py-setuptools', type='build') - depends_on('py-wheel@0.23.0:0.99.99', type=('build', 'run')) - depends_on('py-six@1.6.1:1.99.99', type=('build', 'run')) + depends_on('py-wheel@0.23.0:0', type=('build', 'run')) + depends_on('py-six@1.6.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-atpublic/package.py b/var/spack/repos/builtin/packages/py-atpublic/package.py index b32564285a..7ffb594580 100644 --- a/var/spack/repos/builtin/packages/py-atpublic/package.py +++ b/var/spack/repos/builtin/packages/py-atpublic/package.py @@ -19,4 +19,4 @@ class PyAtpublic(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-typing-extensions', when='^python@:3.7.999', type=('build', 'run')) + depends_on('py-typing-extensions', when='^python@:3.7', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-awesome-slugify/package.py b/var/spack/repos/builtin/packages/py-awesome-slugify/package.py index 1db30c5296..dc5f67cbbd 100644 --- a/var/spack/repos/builtin/packages/py-awesome-slugify/package.py +++ b/var/spack/repos/builtin/packages/py-awesome-slugify/package.py @@ -17,4 +17,4 @@ class PyAwesomeSlugify(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-regex', type=('build', 'run')) - depends_on('py-unidecode@0.04.14:0.04.99', type=('build', 'run')) + depends_on('py-unidecode@0.04.14:0.04', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-batch/package.py b/var/spack/repos/builtin/packages/py-azure-batch/package.py index f2bc719c30..44c923c3db 100644 --- a/var/spack/repos/builtin/packages/py-azure-batch/package.py +++ b/var/spack/repos/builtin/packages/py-azure-batch/package.py @@ -14,6 +14,6 @@ class PyAzureBatch(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-cli-core/package.py b/var/spack/repos/builtin/packages/py-azure-cli-core/package.py index c638326957..177cea0585 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-core/package.py @@ -13,22 +13,22 @@ class PyAzureCliCore(PythonPackage): version('2.9.1', sha256='8618a30f7ea2188506f29801220c06396d731c26e4de92c327e6b0e8cc790db5') depends_on('py-setuptools', type='build') - depends_on('py-adal@1.2.3:1.2.999', type=('build', 'run')) - depends_on('py-argcomplete@1.8:1.999', type=('build', 'run')) + depends_on('py-adal@1.2.3:1.2', type=('build', 'run')) + depends_on('py-argcomplete@1.8:1', type=('build', 'run')) depends_on('py-azure-cli-telemetry', type=('build', 'run')) - depends_on('py-colorama@0.4.1:0.4.999', type=('build', 'run')) + depends_on('py-colorama@0.4.1:0.4', type=('build', 'run')) depends_on('py-humanfriendly@4.7:8', type=('build', 'run')) depends_on('py-jmespath', type=('build', 'run')) depends_on('py-knack@0.7.1', type=('build', 'run')) - depends_on('py-msal@1.0.0:1.0.999', type=('build', 'run')) - depends_on('py-msal-extensions@0.1.3:0.1.999', type=('build', 'run')) + depends_on('py-msal@1.0.0:1.0', type=('build', 'run')) + depends_on('py-msal-extensions@0.1.3:0.1', type=('build', 'run')) depends_on('py-msrest@0.4.4:', type=('build', 'run')) depends_on('py-msrestazure@0.6.3:', type=('build', 'run')) - depends_on('py-paramiko@2.0.8:2.999', type=('build', 'run')) + depends_on('py-paramiko@2.0.8:2', type=('build', 'run')) depends_on('py-pyjwt', type=('build', 'run')) depends_on('py-pyopenssl@17.1.0:', type=('build', 'run')) - depends_on('py-requests@2.22:2.999', type=('build', 'run')) - depends_on('py-six@1.12:1.999', type=('build', 'run')) + depends_on('py-requests@2.22:2', type=('build', 'run')) + depends_on('py-six@1.12:1', type=('build', 'run')) depends_on('py-pkginfo@1.5.0.1:', type=('build', 'run')) depends_on('py-azure-mgmt-resource@10.0.0', type=('build', 'run')) depends_on('py-azure-mgmt-core@1.0.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py b/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py index 327c3e4688..4fef494d14 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli-telemetry/package.py @@ -13,5 +13,5 @@ class PyAzureCliTelemetry(PythonPackage): version('1.0.4', sha256='1f239d544d309c29e827982cc20113eb57037dba16db6cdd2e0283e437e0e577') depends_on('py-setuptools', type='build') - depends_on('py-applicationinsights@0.11.1:0.11.999', type=('build', 'run')) - depends_on('py-portalocker@1.2:1.999', type=('build', 'run')) + depends_on('py-applicationinsights@0.11.1:0.11', type=('build', 'run')) + depends_on('py-portalocker@1.2:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-cli/package.py b/var/spack/repos/builtin/packages/py-azure-cli/package.py index cc5ed8aeef..1db7a808f6 100644 --- a/var/spack/repos/builtin/packages/py-azure-cli/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cli/package.py @@ -13,89 +13,89 @@ class PyAzureCli(PythonPackage): version('2.9.1', sha256='749d850f73ea8956ab510288c1061dd7066180a8583081a6d560fdc7ac8314d6') depends_on('py-setuptools', type='build') - depends_on('py-antlr4-python3-runtime@4.7.2:4.7.999', type=('build', 'run')) - depends_on('py-azure-batch@9.0:9.999', type=('build', 'run')) - depends_on('py-azure-cli-command-modules-nspkg@2.0:2.999', type=('build', 'run')) + depends_on('py-antlr4-python3-runtime@4.7.2:4.7', type=('build', 'run')) + depends_on('py-azure-batch@9.0:9', type=('build', 'run')) + depends_on('py-azure-cli-command-modules-nspkg@2.0:2', type=('build', 'run')) depends_on('py-azure-cli-core@2.9.1', type=('build', 'run')) - depends_on('py-azure-cli-nspkg@3.0.3:3.999', type=('build', 'run')) - depends_on('py-azure-cosmos@3.0.2:3.999', type=('build', 'run')) - depends_on('py-azure-datalake-store@0.0.48:0.0.999', type=('build', 'run')) - depends_on('py-azure-functions-devops-build@0.0.22:0.0.999', type=('build', 'run')) - depends_on('py-azure-graphrbac@0.60.0:0.60.999', type=('build', 'run')) - depends_on('py-azure-keyvault@1.1:1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-advisor@2.0.1:2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-apimanagement@0.1.0:0.1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-applicationinsights@0.1.1:0.1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-appconfiguration@0.4.0:0.4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-authorization@0.52.0:0.52.999', type=('build', 'run')) - depends_on('py-azure-mgmt-batch@9.0.0:9.0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-batchai@2.0:2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-billing@0.2:0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-botservice@0.2.0:0.2.999', type=('build', 'run')) + depends_on('py-azure-cli-nspkg@3.0.3:3', type=('build', 'run')) + depends_on('py-azure-cosmos@3.0.2:3', type=('build', 'run')) + depends_on('py-azure-datalake-store@0.0.48:0.0', type=('build', 'run')) + depends_on('py-azure-functions-devops-build@0.0.22:0.0', type=('build', 'run')) + depends_on('py-azure-graphrbac@0.60.0:0.60', type=('build', 'run')) + depends_on('py-azure-keyvault@1.1:1', type=('build', 'run')) + depends_on('py-azure-mgmt-advisor@2.0.1:2', type=('build', 'run')) + depends_on('py-azure-mgmt-apimanagement@0.1.0:0.1', type=('build', 'run')) + depends_on('py-azure-mgmt-applicationinsights@0.1.1:0.1', type=('build', 'run')) + depends_on('py-azure-mgmt-appconfiguration@0.4.0:0.4', type=('build', 'run')) + depends_on('py-azure-mgmt-authorization@0.52.0:0.52', type=('build', 'run')) + depends_on('py-azure-mgmt-batch@9.0.0:9.0', type=('build', 'run')) + depends_on('py-azure-mgmt-batchai@2.0:2', type=('build', 'run')) + depends_on('py-azure-mgmt-billing@0.2:0', type=('build', 'run')) + depends_on('py-azure-mgmt-botservice@0.2.0:0.2', type=('build', 'run')) depends_on('py-azure-mgmt-cdn@4.1.0rc1', type=('build', 'run')) - depends_on('py-azure-mgmt-cognitiveservices@6.2.0:6.2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-compute@13.0:13.999', type=('build', 'run')) - depends_on('py-azure-mgmt-consumption@2.0:2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-containerinstance@1.4:1.999', type=('build', 'run')) + depends_on('py-azure-mgmt-cognitiveservices@6.2.0:6.2', type=('build', 'run')) + depends_on('py-azure-mgmt-compute@13.0:13', type=('build', 'run')) + depends_on('py-azure-mgmt-consumption@2.0:2', type=('build', 'run')) + depends_on('py-azure-mgmt-containerinstance@1.4:1', type=('build', 'run')) depends_on('py-azure-mgmt-containerregistry@3.0.0rc14', type=('build', 'run')) - depends_on('py-azure-mgmt-containerservice@9.0.1:9.0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-cosmosdb@0.15.0:0.15.999', type=('build', 'run')) - depends_on('py-azure-mgmt-datalake-analytics@0.2.1:0.2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-datalake-store@0.5.0:0.5.999', type=('build', 'run')) - depends_on('py-azure-mgmt-datamigration@0.1.0:0.1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-deploymentmanager@0.2.0:0.2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-devtestlabs@4.0:4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-dns@2.1:2.999', type=('build', 'run')) + depends_on('py-azure-mgmt-containerservice@9.0.1:9.0', type=('build', 'run')) + depends_on('py-azure-mgmt-cosmosdb@0.15.0:0.15', type=('build', 'run')) + depends_on('py-azure-mgmt-datalake-analytics@0.2.1:0.2', type=('build', 'run')) + depends_on('py-azure-mgmt-datalake-store@0.5.0:0.5', type=('build', 'run')) + depends_on('py-azure-mgmt-datamigration@0.1.0:0.1', type=('build', 'run')) + depends_on('py-azure-mgmt-deploymentmanager@0.2.0:0.2', type=('build', 'run')) + depends_on('py-azure-mgmt-devtestlabs@4.0:4', type=('build', 'run')) + depends_on('py-azure-mgmt-dns@2.1:2', type=('build', 'run')) depends_on('py-azure-mgmt-eventgrid@3.0.0rc7', type=('build', 'run')) - depends_on('py-azure-mgmt-eventhub@4.0.0:4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-hdinsight@1.5.1:1.5.999', type=('build', 'run')) - depends_on('py-azure-mgmt-imagebuilder@0.4.0:0.4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-iotcentral@3.0.0:3.0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-iothub@0.12.0:0.12.999', type=('build', 'run')) - depends_on('py-azure-mgmt-iothubprovisioningservices@0.2.0:0.2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-keyvault@2.2.0:2.2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-kusto@0.3.0:0.3.999', type=('build', 'run')) - depends_on('py-azure-mgmt-loganalytics@0.7.0:0.7.999', type=('build', 'run')) - depends_on('py-azure-mgmt-managedservices@1.0:1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-managementgroups@0.1:0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-maps@0.1.0:0.1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-marketplaceordering@0.1:0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-media@2.1:2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-monitor@0.10.0:0.10.999', type=('build', 'run')) - depends_on('py-azure-mgmt-msi@0.2:0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-netapp@0.8.0:0.8.999', type=('build', 'run')) - depends_on('py-azure-mgmt-network@11.0.0:11.0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-policyinsights@0.5.0:0.5.999', type=('build', 'run')) - depends_on('py-azure-mgmt-privatedns@0.1.0:0.1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-rdbms@2.2.0:2.2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-recoveryservices@0.4.0:0.4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-recoveryservicesbackup@0.6.0:0.6.999', type=('build', 'run')) + depends_on('py-azure-mgmt-eventhub@4.0.0:4', type=('build', 'run')) + depends_on('py-azure-mgmt-hdinsight@1.5.1:1.5', type=('build', 'run')) + depends_on('py-azure-mgmt-imagebuilder@0.4.0:0.4', type=('build', 'run')) + depends_on('py-azure-mgmt-iotcentral@3.0.0:3.0', type=('build', 'run')) + depends_on('py-azure-mgmt-iothub@0.12.0:0.12', type=('build', 'run')) + depends_on('py-azure-mgmt-iothubprovisioningservices@0.2.0:0.2', type=('build', 'run')) + depends_on('py-azure-mgmt-keyvault@2.2.0:2.2', type=('build', 'run')) + depends_on('py-azure-mgmt-kusto@0.3.0:0.3', type=('build', 'run')) + depends_on('py-azure-mgmt-loganalytics@0.7.0:0.7', type=('build', 'run')) + depends_on('py-azure-mgmt-managedservices@1.0:1', type=('build', 'run')) + depends_on('py-azure-mgmt-managementgroups@0.1:0', type=('build', 'run')) + depends_on('py-azure-mgmt-maps@0.1.0:0.1', type=('build', 'run')) + depends_on('py-azure-mgmt-marketplaceordering@0.1:0', type=('build', 'run')) + depends_on('py-azure-mgmt-media@2.1:2', type=('build', 'run')) + depends_on('py-azure-mgmt-monitor@0.10.0:0.10', type=('build', 'run')) + depends_on('py-azure-mgmt-msi@0.2:0', type=('build', 'run')) + depends_on('py-azure-mgmt-netapp@0.8.0:0.8', type=('build', 'run')) + depends_on('py-azure-mgmt-network@11.0.0:11.0', type=('build', 'run')) + depends_on('py-azure-mgmt-policyinsights@0.5.0:0.5', type=('build', 'run')) + depends_on('py-azure-mgmt-privatedns@0.1.0:0.1', type=('build', 'run')) + depends_on('py-azure-mgmt-rdbms@2.2.0:2.2', type=('build', 'run')) + depends_on('py-azure-mgmt-recoveryservices@0.4.0:0.4', type=('build', 'run')) + depends_on('py-azure-mgmt-recoveryservicesbackup@0.6.0:0.6', type=('build', 'run')) depends_on('py-azure-mgmt-redhatopenshift@0.1.0', type=('build', 'run')) - depends_on('py-azure-mgmt-redis@7.0.0:7.0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-relay@0.1.0:0.1.999', type=('build', 'run')) + depends_on('py-azure-mgmt-redis@7.0.0:7.0', type=('build', 'run')) + depends_on('py-azure-mgmt-relay@0.1.0:0.1', type=('build', 'run')) depends_on('py-azure-mgmt-reservations@0.6.0', type=('build', 'run')) - depends_on('py-azure-mgmt-search@2.0:2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-security@0.4.1:0.4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-servicebus@0.6.0:0.6.999', type=('build', 'run')) - depends_on('py-azure-mgmt-servicefabric@0.4.0:0.4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-signalr@0.4.0:0.4.999', type=('build', 'run')) - depends_on('py-azure-mgmt-sql@0.19.0:0.19.999', type=('build', 'run')) - depends_on('py-azure-mgmt-sqlvirtualmachine@0.5.0:0.5.999', type=('build', 'run')) - depends_on('py-azure-mgmt-storage@11.1.0:11.1.999', type=('build', 'run')) - depends_on('py-azure-mgmt-trafficmanager@0.51.0:0.51.999', type=('build', 'run')) - depends_on('py-azure-mgmt-web@0.47.0:0.47.999', type=('build', 'run')) - depends_on('py-azure-multiapi-storage@0.3.2:0.3.999', type=('build', 'run')) - depends_on('py-azure-loganalytics@0.1.0:0.1.999', type=('build', 'run')) - depends_on('py-azure-storage-common@1.4:1.999', type=('build', 'run')) - depends_on('py-cryptography@2.3.1:2.999', type=('build', 'run')) - depends_on('py-fabric@2.4:2.999', type=('build', 'run')) - depends_on('py-jsmin@2.2.2:2.2.999', type=('build', 'run')) + depends_on('py-azure-mgmt-search@2.0:2', type=('build', 'run')) + depends_on('py-azure-mgmt-security@0.4.1:0.4', type=('build', 'run')) + depends_on('py-azure-mgmt-servicebus@0.6.0:0.6', type=('build', 'run')) + depends_on('py-azure-mgmt-servicefabric@0.4.0:0.4', type=('build', 'run')) + depends_on('py-azure-mgmt-signalr@0.4.0:0.4', type=('build', 'run')) + depends_on('py-azure-mgmt-sql@0.19.0:0.19', type=('build', 'run')) + depends_on('py-azure-mgmt-sqlvirtualmachine@0.5.0:0.5', type=('build', 'run')) + depends_on('py-azure-mgmt-storage@11.1.0:11.1', type=('build', 'run')) + depends_on('py-azure-mgmt-trafficmanager@0.51.0:0.51', type=('build', 'run')) + depends_on('py-azure-mgmt-web@0.47.0:0.47', type=('build', 'run')) + depends_on('py-azure-multiapi-storage@0.3.2:0.3', type=('build', 'run')) + depends_on('py-azure-loganalytics@0.1.0:0.1', type=('build', 'run')) + depends_on('py-azure-storage-common@1.4:1', type=('build', 'run')) + depends_on('py-cryptography@2.3.1:2', type=('build', 'run')) + depends_on('py-fabric@2.4:2', type=('build', 'run')) + depends_on('py-jsmin@2.2.2:2.2', type=('build', 'run')) depends_on('py-pytz@2019.1', type=('build', 'run')) - depends_on('py-scp@0.13.2:0.13.999', type=('build', 'run')) - depends_on('py-sshtunnel@0.1.4:0.1.999', type=('build', 'run')) - depends_on('py-urllib3@1.18:1.999+secure', type=('build', 'run')) - depends_on('py-vsts-cd-manager@1.0.2:1.0.999', type=('build', 'run')) - depends_on('py-websocket-client@0.56.0:0.56.999', type=('build', 'run')) - depends_on('py-xmltodict@0.12:0.999', type=('build', 'run')) + depends_on('py-scp@0.13.2:0.13', type=('build', 'run')) + depends_on('py-sshtunnel@0.1.4:0.1', type=('build', 'run')) + depends_on('py-urllib3@1.18:1+secure', type=('build', 'run')) + depends_on('py-vsts-cd-manager@1.0.2:1.0', type=('build', 'run')) + depends_on('py-websocket-client@0.56.0:0.56', type=('build', 'run')) + depends_on('py-xmltodict@0.12:0', type=('build', 'run')) depends_on('py-javaproperties@0.5.1', type=('build', 'run')) depends_on('py-jsondiff@1.2.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-cosmos/package.py b/var/spack/repos/builtin/packages/py-azure-cosmos/package.py index 3d8ce9a111..a360243d8d 100644 --- a/var/spack/repos/builtin/packages/py-azure-cosmos/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cosmos/package.py @@ -16,7 +16,7 @@ class PyAzureCosmos(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-six@1.6:', type=('build', 'run')) - depends_on('py-azure-core@1.0.0:1.999', when='@4:', type=('build', 'run')) + depends_on('py-azure-core@1.0.0:1', when='@4:', type=('build', 'run')) depends_on('py-enum34@1.0.4:', when='@4: ^python@:3.3', type=('build', 'run')) depends_on('py-azure-nspkg', when='^python@:2', type=('build', 'run')) depends_on('py-typing', when='@4: ^python@:3.4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py b/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py index d051d5f68a..55f28de11f 100644 --- a/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py +++ b/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py @@ -15,6 +15,6 @@ class PyAzureGraphrbac(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-identity/package.py b/var/spack/repos/builtin/packages/py-azure-identity/package.py index 76ad461663..3a0f0ccaea 100644 --- a/var/spack/repos/builtin/packages/py-azure-identity/package.py +++ b/var/spack/repos/builtin/packages/py-azure-identity/package.py @@ -20,10 +20,10 @@ class PyAzureIdentity(PythonPackage): version('1.2.0', sha256='b32acd1cdb6202bfe10d9a0858dc463d8960295da70ae18097eb3b85ab12cb91') depends_on('py-setuptools', type='build') - depends_on('py-azure-core@1.0.0:1.999', type=('build', 'run')) + depends_on('py-azure-core@1.0.0:1', type=('build', 'run')) depends_on('py-cryptography@2.1.4:', type=('build', 'run')) - depends_on('py-msal@1.0.0:1.999', type=('build', 'run')) - depends_on('py-msal-extensions@0.1.3:0.1.999', type=('build', 'run')) + depends_on('py-msal@1.0.0:1', type=('build', 'run')) + depends_on('py-msal-extensions@0.1.3:0.1', type=('build', 'run')) depends_on('py-six@1.6:', type=('build', 'run')) depends_on('py-azure-nspkg', when='^python@:2', type=('build', 'run')) depends_on('py-mock', when='^python@:3.2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py index 0a3142140c..5c46ef19f5 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-certificates/package.py @@ -13,7 +13,7 @@ class PyAzureKeyvaultCertificates(PythonPackage): version('4.1.0', sha256='544f56480619e1db350f2e7b117b22af778e02174bd6bcb0af9ae00c50353419') depends_on('py-setuptools', type='build') - depends_on('py-azure-core@1.2.1:1.999', type=('build', 'run')) + depends_on('py-azure-core@1.2.1:1', type=('build', 'run')) depends_on('py-msrest@0.6.0:', type=('build', 'run')) depends_on('py-azure-keyvault-nspkg', when='^python@:2', type=('build', 'run')) depends_on('py-enum34@1.0.4:', when='^python@:3.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py index ce910ec577..14ca4c768a 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-keys/package.py @@ -13,7 +13,7 @@ class PyAzureKeyvaultKeys(PythonPackage): version('4.1.0', sha256='f9967b4deb48e619f6c40558f69e48978779cc09c8a7fad33d536cfc41cd68f9') depends_on('py-setuptools', type='build') - depends_on('py-azure-core@1.2.1:1.999', type=('build', 'run')) + depends_on('py-azure-core@1.2.1:1', type=('build', 'run')) depends_on('py-cryptography@2.1.4:', type=('build', 'run')) depends_on('py-msrest@0.6.0:', type=('build', 'run')) depends_on('py-azure-keyvault-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py index 5761fd83f5..d51a3c5d42 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault-secrets/package.py @@ -13,7 +13,7 @@ class PyAzureKeyvaultSecrets(PythonPackage): version('4.1.0', sha256='4f3bfac60e025e01dd1c1998b73649d45d706975356c0cf147174cf5a6ddf8be') depends_on('py-setuptools', type='build') - depends_on('py-azure-core@1.2.1:1.999', type=('build', 'run')) + depends_on('py-azure-core@1.2.1:1', type=('build', 'run')) depends_on('py-msrest@0.6.0:', type=('build', 'run')) depends_on('py-azure-keyvault-nspkg', when='^python@:2', type=('build', 'run')) depends_on('py-enum34@1.0.4:', when='^python@:3.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-keyvault/package.py b/var/spack/repos/builtin/packages/py-azure-keyvault/package.py index 7ab2dfb767..13555c207f 100644 --- a/var/spack/repos/builtin/packages/py-azure-keyvault/package.py +++ b/var/spack/repos/builtin/packages/py-azure-keyvault/package.py @@ -14,11 +14,11 @@ class PyAzureKeyvault(PythonPackage): version('1.1.0', sha256='37a8e5f376eb5a304fcd066d414b5d93b987e68f9212b0c41efa37d429aadd49') depends_on('py-setuptools', type='build') - depends_on('py-azure-keyvault-certificates@4.1:4.999', when='@4:', type=('build', 'run')) - depends_on('py-azure-keyvault-secrets@4.1:4.999', when='@4:', type=('build', 'run')) - depends_on('py-azure-keyvault-keys@4.1:4.999', when='@4:', type=('build', 'run')) + depends_on('py-azure-keyvault-certificates@4.1:4', when='@4:', type=('build', 'run')) + depends_on('py-azure-keyvault-secrets@4.1:4', when='@4:', type=('build', 'run')) + depends_on('py-azure-keyvault-keys@4.1:4', when='@4:', type=('build', 'run')) depends_on('py-msrest@0.5.0:', when='@:1', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', when='@:1', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', when='@:1', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', when='@:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', when='@:1', type=('build', 'run')) depends_on('py-cryptography@2.1.4:', when='@:1', type=('build', 'run')) depends_on('py-requests@2.18.4:', when='@:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py b/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py index 606c5ee879..8535621604 100644 --- a/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-loganalytics/package.py @@ -13,5 +13,5 @@ class PyAzureLoganalytics(PythonPackage): version('0.1.0', sha256='3ceb350def677a351f34b0a0d1637df6be0c6fe87ff32a5270b17f540f6da06e') depends_on('py-setuptools', type='build') - depends_on('py-msrest@0.4.29:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrest@0.4.29:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py index ab5cb79d26..bc29fe76a3 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-advisor/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtAdvisor(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py index f816f5fade..bee6e87530 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-apimanagement/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtApimanagement(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py index 9fd889dc10..b5d445ea59 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-appconfiguration/package.py @@ -16,6 +16,6 @@ class PyAzureMgmtAppconfiguration(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py index 8289b7a2aa..1a087bb904 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-applicationinsights/package.py @@ -16,7 +16,7 @@ class PyAzureMgmtApplicationinsights(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', when='@0.3:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', when='@0.3:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.20:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', when='@0.3:', type=('build', 'run')) + depends_on('py-msrestazure@0.4.20:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='@0.3: ^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py index 6990814ac1..c7704e10d7 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-authorization/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtAuthorization(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py index e4a9a7682c..7bd6d1059c 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-batch/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtBatch(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py index 301398f80f..3357698637 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-batchai/package.py @@ -13,5 +13,5 @@ class PyAzureMgmtBatchai(PythonPackage): version('2.0.0', sha256='f1870b0f97d5001cdb66208e5a236c9717a0ed18b34dbfdb238a828f3ca2a683') depends_on('py-setuptools', type='build') - depends_on('py-msrestazure@0.4.20:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.20:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py index a4ceadbe96..9ad12cbd87 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-billing/package.py @@ -13,5 +13,5 @@ class PyAzureMgmtBilling(PythonPackage): version('0.2.0', sha256='85f73bb3808a7d0d2543307e8f41e5b90a170ad6eeedd54fe7fcaac61b5b22d2') depends_on('py-setuptools', type='build') - depends_on('py-msrestazure@0.4.20:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.20:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py index 10f403f43f..50fa2ab919 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtBotservice(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py index 7d181e5c3e..c71679980d 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cdn/package.py @@ -16,6 +16,6 @@ class PyAzureMgmtCdn(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py index 8d27014d96..d134ebe681 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cognitiveservices/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtCognitiveservices(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py index 732010eb3d..7002081a35 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-compute/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtCompute(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py index eb9e8d1e39..cc4682725a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-consumption/package.py @@ -15,7 +15,7 @@ class PyAzureMgmtConsumption(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', when='@3:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', when='@3:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.20:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', when='@3:', type=('build', 'run')) + depends_on('py-msrestazure@0.4.20:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='@3: ^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py index 035b88f33c..b5e4712377 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerinstance/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtContainerinstance(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py index 947ee794ac..f33a772634 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerregistry/package.py @@ -16,6 +16,6 @@ class PyAzureMgmtContainerregistry(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py index 6c4daf4775..6b03175d99 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-containerservice/package.py @@ -16,6 +16,6 @@ class PyAzureMgmtContainerservice(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py index 07b9620797..0ee3ce63dc 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-core/package.py @@ -14,7 +14,7 @@ class PyAzureMgmtCore(PythonPackage): version('1.0.0', sha256='510faf49a10daec8346cc086143d8e667ef3b4f8c8022a8e710091027631a55e') depends_on('py-setuptools', type='build') - depends_on('py-azure-core@1.7.0:1.999', when='@1.2:', type=('build', 'run')) - depends_on('py-azure-core@1.4.0:1.999', type=('build', 'run')) + depends_on('py-azure-core@1.7.0:1', when='@1.2:', type=('build', 'run')) + depends_on('py-azure-core@1.4.0:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) depends_on('py-typing', when='^python@:3.4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py index 903fd1963c..6c4dd96327 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-cosmosdb/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtCosmosdb(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py index a96112a8b3..9090629d94 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-analytics/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtDatalakeAnalytics(PythonPackage): version('0.2.1', sha256='4c7960d094f5847d9a456c18b8a3c8e60c428e3080a3905f1c943d81ba6351a4') depends_on('py-setuptools', type='build') - depends_on('py-msrestazure@0.4.27:1.999', when='@0.6:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.7:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.27:1', when='@0.6:', type=('build', 'run')) + depends_on('py-msrestazure@0.4.7:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py index 7e1cf9bd11..136ecc42ef 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datalake-store/package.py @@ -13,5 +13,5 @@ class PyAzureMgmtDatalakeStore(PythonPackage): version('0.5.0', sha256='9376d35495661d19f8acc5604f67b0bc59493b1835bbc480f9a1952f90017a4c') depends_on('py-setuptools', type='build') - depends_on('py-msrestazure@0.4.27:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.27:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py index e774c3a15d..12e80286fd 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py @@ -15,7 +15,7 @@ class PyAzureMgmtDatamigration(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', when='@4:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', when='@4:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.27:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', when='@4:', type=('build', 'run')) + depends_on('py-msrestazure@0.4.27:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='@4: ^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py index fa28bd3a97..880433071a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-deploymentmanager/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtDeploymentmanager(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py index 9a556a713d..2f1e47fb29 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-devtestlabs/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtDevtestlabs(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py index 35dc48f3e2..bf1ca45fcc 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-dns/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtDns(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py index 93ad191352..9bf65841c8 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-eventgrid/package.py @@ -16,6 +16,6 @@ class PyAzureMgmtEventgrid(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py index a5b9a45639..aa14153e04 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-eventhub/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtEventhub(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py index c35ed71e9d..912bcca9a7 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-hdinsight/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtHdinsight(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py index ae171d1b92..d11b435a8b 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-imagebuilder/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtImagebuilder(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py index 7f18068803..443773e8e6 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iotcentral/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtIotcentral(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py index bcd3c93b88..8ddd2615b4 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iothub/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtIothub(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py index e9adf65bb9..b3b23dee4c 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-iothubprovisioningservices/package.py @@ -14,5 +14,5 @@ class PyAzureMgmtIothubprovisioningservices(PythonPackage): version('0.2.0', sha256='8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d') depends_on('py-setuptools', type='build') - depends_on('py-msrestazure@0.4.20:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.20:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py index 7a8f3bef2f..829e627168 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtKeyvault(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py index 46a66a3ce0..dfb755a71b 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-kusto/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtKusto(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py index c3b68318dc..3a28966b59 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-loganalytics/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtLoganalytics(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py index c031eade9d..2dd0d2940f 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-managedservices/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtManagedservices(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py index 2ac5535384..0dcd531ab7 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-managementgroups/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtManagementgroups(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py index 60f3ec3909..7206ad660a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-maps/package.py @@ -13,5 +13,5 @@ class PyAzureMgmtMaps(PythonPackage): version('0.1.0', sha256='c120e210bb61768da29de24d28b82f8d42ae24e52396eb6569b499709e22f006') depends_on('py-setuptools', type='build') - depends_on('py-msrestazure@0.4.27:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.27:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py index 1e83ee1596..b312d0fcc4 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtMarketplaceordering(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py index 9cbd96be7d..f9efbd7645 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-media/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtMedia(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py index 013d79c517..c252c73c71 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-monitor/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtMonitor(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py index ddc265158b..4fab1aded6 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-msi/package.py @@ -15,7 +15,7 @@ class PyAzureMgmtMsi(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', when='@1:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', when='@1:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.27:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', when='@1:', type=('build', 'run')) + depends_on('py-msrestazure@0.4.27:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='@1: ^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py index e8422694cc..6c2ca6a514 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-netapp/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtNetapp(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py index b4f0403f54..576d5a5647 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-network/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtNetwork(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py index 95ac19a79e..9fbae9eafe 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-policyinsights/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtPolicyinsights(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py index 5d18ecef62..016959a814 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-privatedns/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtPrivatedns(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py index 3d0e8ca4fa..146da434f7 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-rdbms/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtRdbms(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py index ec590b3a56..d2e43856dc 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservices/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtRecoveryservices(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py index 2a03def283..758429895d 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-recoveryservicesbackup/package.py @@ -16,6 +16,6 @@ class PyAzureMgmtRecoveryservicesbackup(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py index 1056c043e1..b11a8216c6 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-redhatopenshift/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtRedhatopenshift(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py index 99875a7902..c034215a78 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-redis/package.py @@ -16,6 +16,6 @@ class PyAzureMgmtRedis(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py index 7eea1a44f0..bb32460303 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-relay/package.py @@ -15,7 +15,7 @@ class PyAzureMgmtRelay(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', when='@0.2:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', when='@0.2:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.20:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', when='@0.2:', type=('build', 'run')) + depends_on('py-msrestazure@0.4.20:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='@0.2: ^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py index 303e51db0a..c145200ca7 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-reservations/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtReservations(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py index 4fd05cf350..7bf8d9350b 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-resource/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtResource(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py index 1444f58443..c68d48b32a 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-search/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtSearch(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py index 191dcd3345..8e12899cef 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-security/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtSecurity(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py index 8890fab404..7f9cfb9b2f 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-servicebus/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtServicebus(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py index d8a6de79d4..93f203fcc1 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-servicefabric/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtServicefabric(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py index 19797f4d56..0eaf543deb 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-signalr/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtSignalr(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py index 524886b480..9bc54fa3bc 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-sql/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtSql(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py index c5ac853281..e21f703a08 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-sqlvirtualmachine/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtSqlvirtualmachine(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py index 47f7bd3b57..e8ba9a00d9 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-storage/package.py @@ -15,6 +15,6 @@ class PyAzureMgmtStorage(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py index 2890197a95..334bd2ac63 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-trafficmanager/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtTrafficmanager(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py index 2fbee188d1..68c48c897c 100644 --- a/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py +++ b/var/spack/repos/builtin/packages/py-azure-mgmt-web/package.py @@ -14,6 +14,6 @@ class PyAzureMgmtWeb(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-msrest@0.5.0:', type=('build', 'run')) - depends_on('py-msrestazure@0.4.32:1.999', type=('build', 'run')) - depends_on('py-azure-common@1.1:1.999', type=('build', 'run')) + depends_on('py-msrestazure@0.4.32:1', type=('build', 'run')) + depends_on('py-azure-common@1.1:1', type=('build', 'run')) depends_on('py-azure-mgmt-nspkg', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py index 15000c3ce4..f139559c96 100644 --- a/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-automl-core/package.py @@ -16,17 +16,17 @@ class PyAzuremlAutomlCore(Package): version('1.8.0', sha256='58ce54b01570996cda860c0c80693b8db19324785a356573f105afeaa31cae6c', expand=False) extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-dataset-runtime@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-dataset-runtime@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-dataset-runtime@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-dataset-runtime@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-dataprep@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-dataprep@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-core/package.py b/var/spack/repos/builtin/packages/py-azureml-core/package.py index caa3786dd4..e990b4848f 100644 --- a/var/spack/repos/builtin/packages/py-azureml-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-core/package.py @@ -24,14 +24,14 @@ class PyAzuremlCore(Package): depends_on('py-pytz', type=('build', 'run')) depends_on('py-backports-tempfile', type=('build', 'run')) depends_on('py-pathspec', type=('build', 'run')) - depends_on('py-requests@2.19.1:2.999', type=('build', 'run')) - depends_on('py-azure-mgmt-resource@1.2.1:14.999', type=('build', 'run')) + depends_on('py-requests@2.19.1:2', type=('build', 'run')) + depends_on('py-azure-mgmt-resource@1.2.1:14', type=('build', 'run')) depends_on('py-azure-mgmt-containerregistry@2.0.0:', type=('build', 'run')) - depends_on('py-azure-mgmt-storage@1.5.0:15.999', type=('build', 'run')) - depends_on('py-azure-mgmt-keyvault@0.40.0:6.999', type=('build', 'run')) - depends_on('py-azure-mgmt-authorization@0.40.0:0.999', type=('build', 'run')) - depends_on('py-azure-mgmt-network@10.0:10.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azure-graphrbac@0.40.0:0.999', type=('build', 'run')) + depends_on('py-azure-mgmt-storage@1.5.0:15', type=('build', 'run')) + depends_on('py-azure-mgmt-keyvault@0.40.0:6', type=('build', 'run')) + depends_on('py-azure-mgmt-authorization@0.40.0:0', type=('build', 'run')) + depends_on('py-azure-mgmt-network@10.0:10', when='@1.8.0', type=('build', 'run')) + depends_on('py-azure-graphrbac@0.40.0:0', type=('build', 'run')) depends_on('py-azure-common@1.1.12:', type=('build', 'run')) depends_on('py-msrest@0.5.1:', type=('build', 'run')) depends_on('py-msrestazure@0.4.33:', type=('build', 'run')) @@ -44,9 +44,9 @@ class PyAzuremlCore(Package): depends_on('py-jsonpickle', type=('build', 'run')) depends_on('py-contextlib2', type=('build', 'run')) depends_on('py-docker', type=('build', 'run')) - depends_on('py-pyjwt@:2.999', type=('build', 'run')) + depends_on('py-pyjwt@:2', type=('build', 'run')) depends_on('py-adal@1.2.0:', type=('build', 'run')) - depends_on('py-pyopenssl@:20.999', type=('build', 'run')) + depends_on('py-pyopenssl@:20', type=('build', 'run')) depends_on('py-jmespath', type=('build', 'run')) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py index 3e4d4164ec..79ab6be499 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-native/package.py @@ -43,13 +43,13 @@ class PyAzuremlDataprepNative(Package): extends('python') depends_on('py-pip', type='build') - depends_on('python@3.9.0:3.9.999', when='@30.0.0-py3.9', type=('build', 'run')) - depends_on('python@3.8.0:3.8.999', when='@30.0.0-py3.8', type=('build', 'run')) - depends_on('python@3.7.0:3.7.999', when='@30.0.0-py3.7', type=('build', 'run')) - depends_on('python@3.6.0:3.6.999', when='@30.0.0-py3.6', type=('build', 'run')) - depends_on('python@3.5.0:3.5.999', when='@30.0.0-py3.5', type=('build', 'run')) + depends_on('python@3.9.0:3.9', when='@30.0.0-py3.9', type=('build', 'run')) + depends_on('python@3.8.0:3.8', when='@30.0.0-py3.8', type=('build', 'run')) + depends_on('python@3.7.0:3.7', when='@30.0.0-py3.7', type=('build', 'run')) + depends_on('python@3.6.0:3.6', when='@30.0.0-py3.6', type=('build', 'run')) + depends_on('python@3.5.0:3.5', when='@30.0.0-py3.5', type=('build', 'run')) - depends_on('python@3.7.0:3.7.999', when='@14.2.1-py3.7', type=('build', 'run')) + depends_on('python@3.7.0:3.7', when='@14.2.1-py3.7', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py index e3b43b29a9..0dfe28c4d5 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep-rslex/package.py @@ -64,11 +64,11 @@ class PyAzuremlDataprepRslex(Package): extends('python') depends_on('py-pip', type='build') - depends_on('python@3.9.0:3.9.999', when='@1.9.0-py3.9,1.8.0-py3.9', type=('build', 'run')) - depends_on('python@3.8.0:3.8.999', when='@1.9.0-py3.8,1.8.0-py3.8', type=('build', 'run')) - depends_on('python@3.7.0:3.7.999', when='@1.9.0-py3.7,1.8.0-py3.7', type=('build', 'run')) - depends_on('python@3.6.0:3.6.999', when='@1.9.0-py3.6,1.8.0-py3.6', type=('build', 'run')) - depends_on('python@3.5.0:3.5.999', when='@1.9.0-py3.5,1.8.0-py3.5', type=('build', 'run')) + depends_on('python@3.9.0:3.9', when='@1.9.0-py3.9,1.8.0-py3.9', type=('build', 'run')) + depends_on('python@3.8.0:3.8', when='@1.9.0-py3.8,1.8.0-py3.8', type=('build', 'run')) + depends_on('python@3.7.0:3.7', when='@1.9.0-py3.7,1.8.0-py3.7', type=('build', 'run')) + depends_on('python@3.6.0:3.6', when='@1.9.0-py3.6,1.8.0-py3.6', type=('build', 'run')) + depends_on('python@3.5.0:3.5', when='@1.9.0-py3.5,1.8.0-py3.5', type=('build', 'run')) for t in set([str(x.family) for x in archspec.cpu.TARGETS.values() if str(x.family) != 'x86_64']): diff --git a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py index 94be3ecfd6..d1fbcefd90 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataprep/package.py @@ -21,15 +21,15 @@ class PyAzuremlDataprep(Package): depends_on('python@3:', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-dotnetcore2@2.1.14:2.999', type=('build', 'run')) - depends_on('py-azureml-dataprep-native@30.0.0:30.999', when='@2.10.0:', type=('build', 'run')) - depends_on('py-azureml-dataprep-native@14.2.1:14.999', when='@:2.0.2', type=('build', 'run')) - depends_on('py-azureml-dataprep-rslex@1.9.0:1.9.999', when='@2.11.0:', type=('build', 'run')) - depends_on('py-azureml-dataprep-rslex@1.8.0:1.8.999', when='@2.10.1', type=('build', 'run')) - depends_on('py-cloudpickle@1.1.0:1.999', type=('build', 'run')) - depends_on('py-azure-identity@1.2.0:1.4.999', when='@2.10.0:', type=('build', 'run')) - depends_on('py-azure-identity@1.2.0:1.2.999', when='@:2.0.2', type=('build', 'run')) - depends_on('py-fusepy@3.0.1:3.999', when='+fuse', type=('build', 'run')) + depends_on('py-dotnetcore2@2.1.14:2', type=('build', 'run')) + depends_on('py-azureml-dataprep-native@30.0.0:30', when='@2.10.0:', type=('build', 'run')) + depends_on('py-azureml-dataprep-native@14.2.1:14', when='@:2.0.2', type=('build', 'run')) + depends_on('py-azureml-dataprep-rslex@1.9.0:1.9', when='@2.11.0:', type=('build', 'run')) + depends_on('py-azureml-dataprep-rslex@1.8.0:1.8', when='@2.10.1', type=('build', 'run')) + depends_on('py-cloudpickle@1.1.0:1', type=('build', 'run')) + depends_on('py-azure-identity@1.2.0:1.4', when='@2.10.0:', type=('build', 'run')) + depends_on('py-azure-identity@1.2.0:1.2', when='@:2.0.2', type=('build', 'run')) + depends_on('py-fusepy@3.0.1:3', when='+fuse', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py index 6005b50ba4..261bf8f483 100644 --- a/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-dataset-runtime/package.py @@ -17,14 +17,14 @@ class PyAzuremlDatasetRuntime(Package): variant('fuse', default=False, description='Build with FUSE support') extends('python') - depends_on('python@3.0:3.999', type=('build', 'run')) + depends_on('python@3.0:3', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-dataprep@2.10.0:2.10.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-dataprep@2.0.1:2.0.999', when='@1.11.0.post1', type=('build', 'run')) - depends_on('py-pyarrow@0.17.0:1.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-pyarrow@0.17.0:0.999', when='@1.11.0.post1', type=('build', 'run')) + depends_on('py-azureml-dataprep@2.10.0:2.10', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-dataprep@2.0.1:2.0', when='@1.11.0.post1', type=('build', 'run')) + depends_on('py-pyarrow@0.17.0:1', when='@1.23.0', type=('build', 'run')) + depends_on('py-pyarrow@0.17.0:0', when='@1.11.0.post1', type=('build', 'run')) depends_on('py-numpy@:1.19.2,1.19.4:', when='@1.23.0:', type=('build', 'run')) - depends_on('py-fusepy@3.0.1:3.999', when='+fuse', type=('build', 'run')) + depends_on('py-fusepy@3.0.1:3', when='+fuse', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py index 14ba81928b..2e4fe801ec 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline-core/package.py @@ -15,14 +15,14 @@ class PyAzuremlPipelineCore(Package): version('1.8.0', sha256='24e1c57a57e75f9d74ea6f45fa4e93c1ee3114c8ed9029d538f9cc8e4f8945b2', expand=False) extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py index 5ce52e7312..dd6d2acc4a 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline-steps/package.py @@ -18,17 +18,17 @@ class PyAzuremlPipelineSteps(Package): depends_on('python@3:', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-train-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-train-automl-client@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-train-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-train-automl-client@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-train-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-train-automl-client@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-train-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-train-automl-client@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-train-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-train-automl-client@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-train-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-train-automl-client@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py index 902b197e90..6c526fc3a5 100644 --- a/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-pipeline/package.py @@ -19,14 +19,14 @@ class PyAzuremlPipeline(Package): depends_on('python@3:', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-pipeline-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-steps@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-steps@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-steps@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-steps@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-pipeline-steps@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-pipeline-steps@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py index 730e4e5ffe..13dd9985c2 100644 --- a/var/spack/repos/builtin/packages/py-azureml-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-sdk/package.py @@ -18,26 +18,26 @@ class PyAzuremlSdk(Package): extends('python') # https://github.com/Azure/MachineLearningNotebooks/issues/1285 - depends_on('python@3.5:3.8.999', type=('build', 'run')) + depends_on('python@3.5:3.8', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-dataset-runtime@1.23.0:1.23.999 +fuse', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-train@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-train-automl-client@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-pipeline@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - - depends_on('py-azureml-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-dataset-runtime@1.11.0:1.11.999 +fuse', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-train@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-train-automl-client@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-pipeline@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - - depends_on('py-azureml-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-train@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-train-automl-client@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-pipeline@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-dataprep@1.8.0:1.8.999 +fuse', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-dataset-runtime@1.23.0:1.23 +fuse', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-train@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-train-automl-client@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-pipeline@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + + depends_on('py-azureml-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-dataset-runtime@1.11.0:1.11 +fuse', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-train@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-train-automl-client@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-pipeline@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + + depends_on('py-azureml-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-train@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-train-automl-client@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-pipeline@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-dataprep@1.8.0:1.8 +fuse', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py b/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py index 6e838c0eba..2d0c6388eb 100644 --- a/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-telemetry/package.py @@ -16,15 +16,15 @@ class PyAzuremlTelemetry(Package): version('1.8.0', sha256='de657efe9773bea0de76c432cbab34501ac28606fe1b380d6883562ebda3d804', expand=False) extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-pip', type='build') depends_on('py-applicationinsights', type=('build', 'run')) - depends_on('py-azureml-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py index dec7a98dbf..3b770292dd 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-automl-client/package.py @@ -17,23 +17,23 @@ class PyAzuremlTrainAutomlClient(Package): version('1.8.0', sha256='562300095db6c4dea7b052e255c53dd95c4c3d0589a828b545497fe1ca7e9677', expand=False) extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-automl-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-dataset-runtime@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-automl-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-dataset-runtime@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-automl-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-dataset-runtime@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-automl-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-dataset-runtime@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-dataprep@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-automl-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-dataprep@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-automl-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-azureml-train-core/package.py b/var/spack/repos/builtin/packages/py-azureml-train-core/package.py index 0109a28056..6333f988f0 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-core/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-core/package.py @@ -16,20 +16,20 @@ class PyAzuremlTrainCore(Package): version('1.8.0', sha256='5a8d90a08d4477527049d793feb40d07dc32fafc0e4e57b4f0729d3c50b408a2', expand=False) extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-train-restclients-hyperdrive@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-train-restclients-hyperdrive@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-train-restclients-hyperdrive@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-train-restclients-hyperdrive@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-train-restclients-hyperdrive@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) - depends_on('py-azureml-telemetry@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-train-restclients-hyperdrive@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-telemetry@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) depends_on('py-flake8@3.1.0:3.7.9', when='@1.8.0 ^python@3.6:', type=('build', 'run')) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py b/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py index a7159acaf9..50a866cd37 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train-restclients-hyperdrive/package.py @@ -16,7 +16,7 @@ class PyAzuremlTrainRestclientsHyperdrive(Package): version('1.8.0', sha256='1633c7eb0fd96714f54f72072ccf1c5ee1ef0a8ba52680793f20d27e0fd43c87', expand=False) extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-pip', type='build') depends_on('py-requests@2.19.1:', type=('build', 'run')) depends_on('py-msrest@0.5.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-azureml-train/package.py b/var/spack/repos/builtin/packages/py-azureml-train/package.py index 8f9f868d8f..1702bdfd24 100644 --- a/var/spack/repos/builtin/packages/py-azureml-train/package.py +++ b/var/spack/repos/builtin/packages/py-azureml-train/package.py @@ -17,14 +17,14 @@ class PyAzuremlTrain(Package): version('1.8.0', sha256='124e5b7d8d64bac61db022f305bd31c25e57fdcb4be93eefd4244a04a13deab3', expand=False) extends('python') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-pip', type='build') - depends_on('py-azureml-train-core@1.23.0:1.23.999', when='@1.23.0', type=('build', 'run')) + depends_on('py-azureml-train-core@1.23.0:1.23', when='@1.23.0', type=('build', 'run')) - depends_on('py-azureml-train-core@1.11.0:1.11.999', when='@1.11.0', type=('build', 'run')) + depends_on('py-azureml-train-core@1.11.0:1.11', when='@1.11.0', type=('build', 'run')) - depends_on('py-azureml-train-core@1.8.0:1.8.999', when='@1.8.0', type=('build', 'run')) + depends_on('py-azureml-train-core@1.8.0:1.8', when='@1.8.0', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py b/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py index ec52ccfb20..f4fe359e64 100644 --- a/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py +++ b/var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py @@ -16,6 +16,6 @@ class PyBackportsEntryPointsSelectable(PythonPackage): version('1.1.0', sha256='988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a') - depends_on('python@2.7:2.7.999,3.0:3.10', type=('build', 'run')) + depends_on('python@2.7.0:2.7,3.0:3.10', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-importlib-metadata@:3.8', type='build') diff --git a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py index ec8b9c9de0..74b54eab7e 100644 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ b/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py @@ -21,4 +21,4 @@ class PyBackportsFunctoolsLruCache(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm@1.15.0:', type='build') - depends_on('python@2.6.0:3.3.99', type=('build', 'run')) + depends_on('python@2.6.0:3.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py index 64da7c3c9e..e64459652b 100644 --- a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py +++ b/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py @@ -18,5 +18,5 @@ class PyBackportsShutilGetTerminalSize(PythonPackage): # newer setuptools version mess with "namespace" packages in an # incompatible way cf. https://github.com/pypa/setuptools/issues/900 - depends_on('py-setuptools@:30.999.999,41:', type='build') + depends_on('py-setuptools@:30,41:', type='build') depends_on('python@:3.2') diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index 6ad56883d6..84df9e3221 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -25,7 +25,7 @@ class PyBasemap(PythonPackage): depends_on('py-setuptools', type=('build', 'run')) depends_on('py-numpy@1.2.1:', type=('build', 'run')) depends_on('py-matplotlib@1.0.0:3.0.0,3.0.2:', type=('build', 'run')) - depends_on('py-pyproj@1.9.3:1.99', type=('build', 'run'), when='@:1.2.0') + depends_on('py-pyproj@1.9.3:1', type=('build', 'run'), when='@:1.2.0') # 1.2.1 is PROJ6 compatible # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939022 depends_on('py-pyproj@1.9.3:', type=('build', 'run'), when='@1.2.1:') diff --git a/var/spack/repos/builtin/packages/py-batchspawner/package.py b/var/spack/repos/builtin/packages/py-batchspawner/package.py index 5169641049..822aa5a7fd 100644 --- a/var/spack/repos/builtin/packages/py-batchspawner/package.py +++ b/var/spack/repos/builtin/packages/py-batchspawner/package.py @@ -15,7 +15,7 @@ class PyBatchspawner(PythonPackage): version('1.1.0', sha256='9bae72f7c1bd9bb11aa58ecc3bc9fae5475a10fdd92dc0c0d67fa7eb95c9dd3a') - depends_on('python@3.3:3.999', type=('build', 'run')) + depends_on('python@3.3:3', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-async-generator@1.8:', type=('build', 'run')) depends_on('py-jinja2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py index ac89f255f5..a29691b7c9 100644 --- a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py +++ b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py @@ -25,7 +25,7 @@ class PyBeautifulsoup4(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-soupsieve@1.3:', when='@4.9.0: ^python@3:', type=('build', 'run')) - depends_on('py-soupsieve@1.3:1.99', when='@4.9.0: ^python@:2.8', type=('build', 'run')) + depends_on('py-soupsieve@1.3:1', when='@4.9.0: ^python@:2.8', type=('build', 'run')) depends_on('py-soupsieve@1.2:', when='@4.7.0:', type=('build', 'run')) depends_on('py-lxml', when='+lxml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-beniget/package.py b/var/spack/repos/builtin/packages/py-beniget/package.py index a9a58e5ca0..31d48ace8e 100644 --- a/var/spack/repos/builtin/packages/py-beniget/package.py +++ b/var/spack/repos/builtin/packages/py-beniget/package.py @@ -18,6 +18,6 @@ class PyBeniget(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-gast@0.5.0:0.5.999', when='@0.4.0:', type=('build', 'run')) - depends_on('py-gast@0.4.0:0.4.999', when='@0.3.0:0.3.999', type=('build', 'run')) - depends_on('py-gast@0.3.3:0.3.999', when='@:0.2.999', type=('build', 'run')) + depends_on('py-gast@0.5.0:0.5', when='@0.4.0:', type=('build', 'run')) + depends_on('py-gast@0.4.0:0.4', when='@0.3.0:0.3', type=('build', 'run')) + depends_on('py-gast@0.3.3:0.3', when='@:0.2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py index 872ab07b39..03c0ab139a 100644 --- a/var/spack/repos/builtin/packages/py-black/package.py +++ b/var/spack/repos/builtin/packages/py-black/package.py @@ -40,15 +40,15 @@ class PyBlack(PythonPackage): depends_on('py-appdirs', type=('build', 'run')) depends_on('py-toml@0.9.4:', when='@:19', type=('build', 'run')) depends_on('py-toml@0.10.1:', when='@20:21.6', type=('build', 'run')) - depends_on('py-tomli@0.2.6:1.999', when='@21.7:', type=('build', 'run')) + depends_on('py-tomli@0.2.6:1', when='@21.7:', type=('build', 'run')) depends_on('py-typed-ast@1.4.0:', when='@19.10b0:20', type=('build', 'run')) - depends_on('py-typed-ast@1.4.2:', when='@21: ^python@:3.7.999', type=('build', 'run')) + depends_on('py-typed-ast@1.4.2:', when='@21: ^python@:3.7', type=('build', 'run')) depends_on('py-regex@2020.1.8:', when='@20.8b0:', type=('build', 'run')) - depends_on('py-pathspec@0.6:0.999', when='@19.10b0:', type=('build', 'run')) - depends_on('py-pathspec@0.8.1:0.999', when='@21.6:', type=('build', 'run')) + depends_on('py-pathspec@0.6:0', when='@19.10b0:', type=('build', 'run')) + depends_on('py-pathspec@0.8.1:0', when='@21.6:', type=('build', 'run')) depends_on('py-dataclasses@0.6:', when='@20.8b0:^python@:3.6', type=('build', 'run')) - depends_on('py-typing-extensions@3.7.4:', when='@20.8b0:20.999', type=('build', 'run')) - depends_on('py-typing-extensions@3.7.4:', when='@21: ^python@:3.7.999', type=('build', 'run')) + depends_on('py-typing-extensions@3.7.4:', when='@20.8b0:20', type=('build', 'run')) + depends_on('py-typing-extensions@3.7.4:', when='@21: ^python@:3.7', type=('build', 'run')) depends_on('py-mypy-extensions@0.4.3:', when='@20.8b0:', type=('build', 'run')) depends_on('py-colorama@0.4.3:', when='+colorama', type=('build', 'run')) depends_on('py-aiohttp@3.3.2:', when='+d', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-boto3/package.py b/var/spack/repos/builtin/packages/py-boto3/package.py index 29b679bb59..07388367d2 100644 --- a/var/spack/repos/builtin/packages/py-boto3/package.py +++ b/var/spack/repos/builtin/packages/py-boto3/package.py @@ -22,14 +22,14 @@ class PyBoto3(PythonPackage): depends_on('python@2.7:2.8,3.6:', when='@1.17.27', type=('build', 'run')) depends_on('python@2.6:', when='@1.9:1.10', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-botocore@1.21.12:1.21.999', when='@1.18.12:', type=('build', 'run')) - depends_on('py-botocore@1.20.27:1.20.999', when='@1.17.27', type=('build', 'run')) - depends_on('py-botocore@1.13.44:1.13.999', when='@1.10.44', type=('build', 'run')) - depends_on('py-botocore@1.13.38:1.13.999', when='@1.10.38', type=('build', 'run')) - depends_on('py-botocore@1.12.169:1.12.999', when='@1.9.169', type=('build', 'run')) + depends_on('py-botocore@1.21.12:1.21', when='@1.18.12:', type=('build', 'run')) + depends_on('py-botocore@1.20.27:1.20', when='@1.17.27', type=('build', 'run')) + depends_on('py-botocore@1.13.44:1.13', when='@1.10.44', type=('build', 'run')) + depends_on('py-botocore@1.13.38:1.13', when='@1.10.38', type=('build', 'run')) + depends_on('py-botocore@1.12.169:1.12', when='@1.9.169', type=('build', 'run')) - depends_on('py-jmespath@0.7.1:0.999', type=('build', 'run')) + depends_on('py-jmespath@0.7.1:0', type=('build', 'run')) - depends_on('py-s3transfer@0.5.0:0.5.999', when='@1.18.12:', type=('build', 'run')) - depends_on('py-s3transfer@0.3.0:0.3.999', when='@1.17.27', type=('build', 'run')) - depends_on('py-s3transfer@0.2.0:0.2.999', when='@:1.10', type=('build', 'run')) + depends_on('py-s3transfer@0.5.0:0.5', when='@1.18.12:', type=('build', 'run')) + depends_on('py-s3transfer@0.3.0:0.3', when='@1.17.27', type=('build', 'run')) + depends_on('py-s3transfer@0.2.0:0.2', when='@:1.10', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-botocore/package.py b/var/spack/repos/builtin/packages/py-botocore/package.py index 1d8fa81362..61ddb9ee2d 100644 --- a/var/spack/repos/builtin/packages/py-botocore/package.py +++ b/var/spack/repos/builtin/packages/py-botocore/package.py @@ -25,17 +25,17 @@ class PyBotocore(PythonPackage): depends_on('python@3.6:', when='@1.21:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-jmespath@0.7.1:0.999', type=('build', 'run')) - depends_on('py-docutils@0.10:0.15', type=('build', 'run'), when='@:1.17.999') - depends_on('py-ordereddict@1.1', type=('build', 'run'), when='^python@2.6.0:2.6.999') - depends_on('py-simplejson@3.3.0', type=('build', 'run'), when='^python@2.6.0:2.6.999') - depends_on('py-python-dateutil@2.1:2.999', type=('build', 'run')) - depends_on('py-python-dateutil@2.1:2.6', type=('build', 'run'), when='^python@2.6.0:2.6.999') + depends_on('py-jmespath@0.7.1:0', type=('build', 'run')) + depends_on('py-docutils@0.10:0.15', type=('build', 'run'), when='@:1.17') + depends_on('py-ordereddict@1.1', type=('build', 'run'), when='^python@2.6.0:2.6') + depends_on('py-simplejson@3.3.0', type=('build', 'run'), when='^python@2.6.0:2.6') + depends_on('py-python-dateutil@2.1:2', type=('build', 'run')) + depends_on('py-python-dateutil@2.1:2.6', type=('build', 'run'), when='^python@2.6.0:2.6') depends_on('py-urllib3@1.20:1.25', type=('build', 'run'), when='@:1.14.11') - depends_on('py-urllib3@1.20:1.23', type=('build', 'run'), when='@:1.13.999 ^python@2.6.0:2.6.999') - depends_on('py-urllib3@1.20:1.22', type=('build', 'run'), when='@:1.13.999 ^python@3.3.0:3.3.999') - depends_on('py-urllib3@1.20:1.25.7', type=('build', 'run'), when='@1.14.12:1.18.999 ^python@3.4.0:3.4.999') - depends_on('py-urllib3@1.20:1.25.999', type=('build', 'run'), when='@1.14.12:1.18.999') - depends_on('py-urllib3@1.25.4:1.25.7', type=('build', 'run'), when='@1.19.0: ^python@3.4.0:3.4.999') - depends_on('py-urllib3@1.25.4:1.25.999', type=('build', 'run'), when='@1.19.0:1.19.15') - depends_on('py-urllib3@1.25.4:1.26.999', type=('build', 'run'), when='@1.19.16:') + depends_on('py-urllib3@1.20:1.23', type=('build', 'run'), when='@:1.13 ^python@2.6.0:2.6') + depends_on('py-urllib3@1.20:1.22', type=('build', 'run'), when='@:1.13 ^python@3.3.0:3.3') + depends_on('py-urllib3@1.20:1.25.7', type=('build', 'run'), when='@1.14.12:1.18 ^python@3.4.0:3.4') + depends_on('py-urllib3@1.20:1.25', type=('build', 'run'), when='@1.14.12:1.18') + depends_on('py-urllib3@1.25.4:1.25.7', type=('build', 'run'), when='@1.19.0: ^python@3.4.0:3.4') + depends_on('py-urllib3@1.25.4:1.25', type=('build', 'run'), when='@1.19.0:1.19.15') + depends_on('py-urllib3@1.25.4:1.26', type=('build', 'run'), when='@1.19.16:') diff --git a/var/spack/repos/builtin/packages/py-brotlipy/package.py b/var/spack/repos/builtin/packages/py-brotlipy/package.py index e4e288b7a3..42d0e435e7 100644 --- a/var/spack/repos/builtin/packages/py-brotlipy/package.py +++ b/var/spack/repos/builtin/packages/py-brotlipy/package.py @@ -16,7 +16,7 @@ class PyBrotlipy(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-cffi@1.0.0:', type=('build', 'run')) - depends_on('py-enum34@1.0.4:1.999', when='^python@:3.3', type=('build', 'run')) + depends_on('py-enum34@1.0.4:1', when='^python@:3.3', type=('build', 'run')) # TODO: Builds against internal copy of headers, doesn't seem to be a way # to use external brotli installation diff --git a/var/spack/repos/builtin/packages/py-celery/package.py b/var/spack/repos/builtin/packages/py-celery/package.py index ae99dcf6a1..8e805ee0d6 100644 --- a/var/spack/repos/builtin/packages/py-celery/package.py +++ b/var/spack/repos/builtin/packages/py-celery/package.py @@ -53,12 +53,12 @@ class PyCelery(PythonPackage): depends_on('py-redis@3.2.0:', when='+redis', type=('build', 'run')) depends_on('py-sqlalchemy', when='+sqlalchemy', type=('build', 'run')) - depends_on('py-click@7.0:7.999', when="@5.0.0:5.999", type=('build', 'run')) - depends_on('py-click-didyoumean@:0.0.3', when="@5.0.0:5.999", type=('build', 'run')) - depends_on('py-click-repl@:0.1.6', when="@5.0.0:5.999", type=('build', 'run')) + depends_on('py-click@7.0:7', when="@5.0.0:5", type=('build', 'run')) + depends_on('py-click-didyoumean@:0.0.3', when="@5.0.0:5", type=('build', 'run')) + depends_on('py-click-repl@:0.1.6', when="@5.0.0:5", type=('build', 'run')) depends_on('py-pytz@2019.3:', type=('build', 'run')) - depends_on('py-billiard@3.6.3:3.999', type=('build', 'run')) - depends_on('py-kombu@4.6.11', when="@4.3.0:4.999", type=('build', 'run')) - depends_on('py-kombu@5.0.0:', when="@5.0.0:5.999", type=('build', 'run')) - depends_on('py-vine@1.3.0', when="@4.3.0:4.999", type=('build', 'run')) - depends_on('py-vine@5.0.0:', when="@5.0.0:5.999", type=('build', 'run')) + depends_on('py-billiard@3.6.3:3', type=('build', 'run')) + depends_on('py-kombu@4.6.11', when="@4.3.0:4", type=('build', 'run')) + depends_on('py-kombu@5.0.0:', when="@5.0.0:5", type=('build', 'run')) + depends_on('py-vine@1.3.0', when="@4.3.0:4", type=('build', 'run')) + depends_on('py-vine@5.0.0:', when="@5.0.0:5", type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-chalice/package.py b/var/spack/repos/builtin/packages/py-chalice/package.py index 527f6cd9a1..ee9088dda2 100644 --- a/var/spack/repos/builtin/packages/py-chalice/package.py +++ b/var/spack/repos/builtin/packages/py-chalice/package.py @@ -27,7 +27,7 @@ class PyChalice(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-click@7.0:8.0', type=('build', 'run')) depends_on('py-botocore@1.12.86:2.0.0', type=('build', 'run')) - depends_on('py-typing@3.6.4', type=('build', 'run'), when='^python@:3.6.999') + depends_on('py-typing@3.6.4', type=('build', 'run'), when='^python@:3.6') depends_on('py-mypy-extensions@0.4.3', type=('build', 'run')) depends_on('py-six@1.10.0:2.0.0', type=('build', 'run')) depends_on('py-pip@9:20.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-checkm-genome/package.py b/var/spack/repos/builtin/packages/py-checkm-genome/package.py index d50f03bcf5..cf8762bd94 100644 --- a/var/spack/repos/builtin/packages/py-checkm-genome/package.py +++ b/var/spack/repos/builtin/packages/py-checkm-genome/package.py @@ -19,8 +19,8 @@ class PyCheckmGenome(PythonPackage): depends_on('hmmer@3.1b1:', type=('build', 'run')) depends_on('pplacer', type=('build', 'run')) depends_on('prodigal@2.6.1:', type=('build', 'run')) - depends_on('python@2.7.0:2.7.999', type=('build', 'run')) - depends_on('py-backports-functools-lru-cache', type=('build', 'run'), when='^python@:3.2.99') + depends_on('python@2.7.0:2.7', type=('build', 'run')) + depends_on('py-backports-functools-lru-cache', type=('build', 'run'), when='^python@:3.2') depends_on('py-numpy@1.8.0:', type=('build', 'run')) depends_on('py-scipy@0.9.0:', type=('build', 'run')) depends_on('py-matplotlib@1.3.1:2.2.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-cheetah/package.py b/var/spack/repos/builtin/packages/py-cheetah/package.py index 6b5b76813f..b5e13cd104 100644 --- a/var/spack/repos/builtin/packages/py-cheetah/package.py +++ b/var/spack/repos/builtin/packages/py-cheetah/package.py @@ -14,6 +14,6 @@ class PyCheetah(PythonPackage): version('2.4.4', sha256='be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550') version('2.3.0', sha256='2a32d7f7f70be98c2d57aa581f979bc799d4bf17d09fc0e7d77280501edf3e53') - depends_on('python@2:2.99.999', type=('build', 'run')) + depends_on('python@2.0:2', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-markdown@2.0.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-click/package.py b/var/spack/repos/builtin/packages/py-click/package.py index 470f41590d..734090db51 100644 --- a/var/spack/repos/builtin/packages/py-click/package.py +++ b/var/spack/repos/builtin/packages/py-click/package.py @@ -22,5 +22,5 @@ class PyClick(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-importlib-metadata', type=('build', 'run'), when='@8.0.0: ^python@:3.7.999') + depends_on('py-importlib-metadata', type=('build', 'run'), when='@8.0.0: ^python@:3.7') # depends_on('py-colorama', type=('build', 'run'), when='platform=windows') diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py index a18fe650ef..3fa7f75d49 100644 --- a/var/spack/repos/builtin/packages/py-cnvkit/package.py +++ b/var/spack/repos/builtin/packages/py-cnvkit/package.py @@ -21,7 +21,7 @@ class PyCnvkit(PythonPackage): depends_on('py-pomegranate@0.9.0:', type=('build', 'run')) depends_on('py-matplotlib@1.3.1:', type=('build', 'run')) depends_on('py-numpy@1.9:', type=('build', 'run')) - depends_on('py-pandas@0.20.1:0.24.999', type=('build', 'run')) + depends_on('py-pandas@0.20.1:0.24', type=('build', 'run')) depends_on('py-pyfaidx@0.4.7:', type=('build', 'run')) depends_on('py-pysam@0.10.0:', type=('build', 'run')) depends_on('py-reportlab@3.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-cogent/package.py b/var/spack/repos/builtin/packages/py-cogent/package.py index b28a1b4bda..cde80da85d 100644 --- a/var/spack/repos/builtin/packages/py-cogent/package.py +++ b/var/spack/repos/builtin/packages/py-cogent/package.py @@ -21,7 +21,7 @@ class PyCogent(PythonPackage): variant('mysql', default=False, description='Required for the Ensembl querying code.') depends_on('py-setuptools', type=('build'), when='@1.9') - depends_on('python@2.6:2.999', type=('build', 'run')) + depends_on('python@2.6:2', type=('build', 'run')) depends_on('py-numpy@1.3:', type=('build', 'run')) depends_on('zlib') depends_on('py-matplotlib', when='+matplotlib', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-configargparse/package.py b/var/spack/repos/builtin/packages/py-configargparse/package.py index 9871f2e4a6..49d716823b 100644 --- a/var/spack/repos/builtin/packages/py-configargparse/package.py +++ b/var/spack/repos/builtin/packages/py-configargparse/package.py @@ -22,4 +22,4 @@ class PyConfigargparse(PythonPackage): version('1.2.3', sha256='0f1144a204e3b896d6ac900e151c1d13bde3103d6b7d541e3bb57514a94083bf') - depends_on('python@2.2:2.999,3.5:', type=('build', 'run')) + depends_on('python@2.2:2,3.5:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-coveralls/package.py b/var/spack/repos/builtin/packages/py-coveralls/package.py index 3691e32ad3..03e5ec2d7c 100644 --- a/var/spack/repos/builtin/packages/py-coveralls/package.py +++ b/var/spack/repos/builtin/packages/py-coveralls/package.py @@ -21,6 +21,6 @@ class PyCoveralls(PythonPackage): depends_on('python@3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-pyyaml@3.10:', type=('build', 'run'), when='+pyyaml') - depends_on('py-coverage@4.1:5.999', type=('build', 'run')) + depends_on('py-coverage@4.1:5', type=('build', 'run')) depends_on('py-docopt@0.6.1:', type=('build', 'run')) depends_on('py-pyyaml@1.0.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-crispresso/package.py b/var/spack/repos/builtin/packages/py-crispresso/package.py index 093c52c323..ce5f3f3a56 100644 --- a/var/spack/repos/builtin/packages/py-crispresso/package.py +++ b/var/spack/repos/builtin/packages/py-crispresso/package.py @@ -16,7 +16,7 @@ class PyCrispresso(PythonPackage): version('1.0.8', sha256='b04ac8781ff8ed56d018c357e741f146b72ad7e0d23c9e5bc1e1bcd1a873ebc3') depends_on('py-setuptools', type='build') - depends_on('python@2.7.0:2.7.999', type=('build', 'run')) + depends_on('python@2.7.0:2.7', type=('build', 'run')) depends_on('py-biopython@1.6.5:', type=('build', 'run')) depends_on('py-matplotlib@1.3.1:', type=('build', 'run')) depends_on('py-numpy@1.9:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-cutadapt/package.py b/var/spack/repos/builtin/packages/py-cutadapt/package.py index ff1d146cb6..9c76773f87 100644 --- a/var/spack/repos/builtin/packages/py-cutadapt/package.py +++ b/var/spack/repos/builtin/packages/py-cutadapt/package.py @@ -28,10 +28,10 @@ class PyCutadapt(PythonPackage): depends_on('py-xopen@0.1.1:', type=('build', 'run'), when='@1.13') depends_on('py-xopen@0.5.0:', type=('build', 'run'), when='@2.0:2.3') depends_on('py-xopen@0.7.3:', type=('build', 'run'), when='@2.4') - depends_on('py-xopen@0.8.1:0.8.999', type=('build', 'run'), when='@2.5') - depends_on('py-xopen@0.8.4:0.8.999', type=('build', 'run'), when='@2.6:') + depends_on('py-xopen@0.8.1:0.8', type=('build', 'run'), when='@2.5') + depends_on('py-xopen@0.8.4:0.8', type=('build', 'run'), when='@2.6:') depends_on('py-dnaio@0.3:', type=('build', 'run'), when='@2.0:2.4') - depends_on('py-dnaio@0.3.0:0.3.999', type=('build', 'run'), when='@2.5') - depends_on('py-dnaio@0.4.0:0.4.999', type=('build', 'run'), when='@2.6') - depends_on('py-dnaio@0.4.1:0.4.999', type=('build', 'run'), when='@2.7:2.9') - depends_on('py-dnaio@0.4.2:0.4.999', type=('build', 'run'), when='@2.10:') + depends_on('py-dnaio@0.3.0:0.3', type=('build', 'run'), when='@2.5') + depends_on('py-dnaio@0.4.0:0.4', type=('build', 'run'), when='@2.6') + depends_on('py-dnaio@0.4.1:0.4', type=('build', 'run'), when='@2.7:2.9') + depends_on('py-dnaio@0.4.2:0.4', type=('build', 'run'), when='@2.10:') diff --git a/var/spack/repos/builtin/packages/py-cvxopt/package.py b/var/spack/repos/builtin/packages/py-cvxopt/package.py index 4dcd6e41dd..dd8f92bef5 100644 --- a/var/spack/repos/builtin/packages/py-cvxopt/package.py +++ b/var/spack/repos/builtin/packages/py-cvxopt/package.py @@ -24,7 +24,7 @@ class PyCvxopt(PythonPackage): # Required dependencies depends_on('python@2.7:', type=('build', 'link', 'run')) - depends_on('python@2.7:3.7.999', type=('build', 'link', 'run'), when='@:1.1.9') + depends_on('python@2.7:3.7', type=('build', 'link', 'run'), when='@:1.1.9') depends_on('py-setuptools', type='build') depends_on('blas') depends_on('lapack') diff --git a/var/spack/repos/builtin/packages/py-cvxpy/package.py b/var/spack/repos/builtin/packages/py-cvxpy/package.py index fbb4e111b5..3ebc7de544 100644 --- a/var/spack/repos/builtin/packages/py-cvxpy/package.py +++ b/var/spack/repos/builtin/packages/py-cvxpy/package.py @@ -27,4 +27,4 @@ class PyCvxpy(PythonPackage): depends_on('py-scs@1.1.6:', type=('build', 'run'), when='@1.1.13:') depends_on('py-osqp@0.4.1:', type=('build', 'run')) depends_on('py-multiprocess', type=('build', 'run')) - depends_on('py-six', type=('build', 'run'), when='@:1.0.99') + depends_on('py-six', type=('build', 'run'), when='@:1.0') diff --git a/var/spack/repos/builtin/packages/py-cymem/package.py b/var/spack/repos/builtin/packages/py-cymem/package.py index 674b530642..ba49918c08 100644 --- a/var/spack/repos/builtin/packages/py-cymem/package.py +++ b/var/spack/repos/builtin/packages/py-cymem/package.py @@ -13,4 +13,4 @@ class PyCymem(PythonPackage): version('2.0.3', sha256='5083b2ab5fe13ced094a82e0df465e2dbbd9b1c013288888035e24fd6eb4ed01') depends_on('py-setuptools', type='build') - depends_on('py-wheel@0.32.0:0.32.999', type='build') + depends_on('py-wheel@0.32.0:0.32', type='build') diff --git a/var/spack/repos/builtin/packages/py-dask-glm/package.py b/var/spack/repos/builtin/packages/py-dask-glm/package.py index 9a8e280390..29b0b078d6 100644 --- a/var/spack/repos/builtin/packages/py-dask-glm/package.py +++ b/var/spack/repos/builtin/packages/py-dask-glm/package.py @@ -24,7 +24,7 @@ class PyDaskGlm(PythonPackage): depends_on('py-multipledispatch@0.4.9:', type=('build', 'run')) depends_on('py-scipy@0.18.1:', type=('build', 'run')) depends_on('py-scikit-learn@0.18:', type=('build', 'run'), when='~docs') - depends_on('py-scikit-learn@0.18:0.21.999', type=('build', 'run'), when='+docs') + depends_on('py-scikit-learn@0.18:0.21', type=('build', 'run'), when='+docs') depends_on('py-jupyter', type='build', when='+docs') depends_on('py-nbsphinx', type='build', when='+docs') depends_on('py-notebook', type='build', when='+docs') diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index 4358b7c258..89d8d61728 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -148,7 +148,7 @@ class PyDask(PythonPackage): # Requirements for dask.diagnostics depends_on('py-bokeh@1.0.0:', type=('build', 'run'), when='@2.0.0: +diagnostics') - depends_on('py-bokeh@1.0.0:1.999,2.0.1:', type=('build', 'run'), when='@2.26.0: +diagnostics') + depends_on('py-bokeh@1.0.0:1,2.0.1:', type=('build', 'run'), when='@2.26.0: +diagnostics') # Requirements for dask.delayed depends_on('py-cloudpickle@0.2.1:', type=('build', 'run'), when='@2.7.0: +delayed') diff --git a/var/spack/repos/builtin/packages/py-dataclasses/package.py b/var/spack/repos/builtin/packages/py-dataclasses/package.py index 4270cb7a12..1a218f7b00 100644 --- a/var/spack/repos/builtin/packages/py-dataclasses/package.py +++ b/var/spack/repos/builtin/packages/py-dataclasses/package.py @@ -15,5 +15,5 @@ class PyDataclasses(PythonPackage): version('0.8', sha256='8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97') version('0.7', sha256='494a6dcae3b8bcf80848eea2ef64c0cc5cd307ffc263e17cdf42f3e5420808e6') - depends_on('python@3.6.00:3.6.99', type=('build', 'run')) + depends_on('python@3.6.00:3.6', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-datasets/package.py b/var/spack/repos/builtin/packages/py-datasets/package.py index db8ed919bb..575bcd0819 100644 --- a/var/spack/repos/builtin/packages/py-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-datasets/package.py @@ -19,17 +19,17 @@ class PyDatasets(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy@1.17:', type=('build', 'run')) - depends_on('py-pyarrow@1.0.0:3.999+parquet', type=('build', 'run')) + depends_on('py-pyarrow@1.0.0:3+parquet', type=('build', 'run')) depends_on('py-dill', type=('build', 'run')) depends_on('py-pandas', type=('build', 'run')) depends_on('py-requests@2.19:', type=('build', 'run')) - depends_on('py-tqdm@4.27:4.49.999', type=('build', 'run')) - depends_on('py-dataclasses', when='^python@:3.6.999', type=('build', 'run')) + depends_on('py-tqdm@4.27:4.49', type=('build', 'run')) + depends_on('py-dataclasses', when='^python@:3.6', type=('build', 'run')) depends_on('py-xxhash', type=('build', 'run')) depends_on('py-multiprocess', type=('build', 'run')) - depends_on('py-importlib-metadata', when='^python@:3.7.999', type=('build', 'run')) - depends_on('py-huggingface-hub@:0.0.999', type=('build', 'run')) + depends_on('py-importlib-metadata', when='^python@:3.7', type=('build', 'run')) + depends_on('py-huggingface-hub@:0.0', type=('build', 'run')) depends_on('py-packaging', type=('build', 'run')) - depends_on('py-fsspec@:0.8.0', when='^python@:3.7.999', type=('build', 'run')) + depends_on('py-fsspec@:0.8.0', when='^python@:3.7', type=('build', 'run')) depends_on('py-fsspec', when='^python@3.8:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-debtcollector/package.py b/var/spack/repos/builtin/packages/py-debtcollector/package.py index 89598c845f..7a95c4d092 100644 --- a/var/spack/repos/builtin/packages/py-debtcollector/package.py +++ b/var/spack/repos/builtin/packages/py-debtcollector/package.py @@ -21,7 +21,7 @@ class PyDebtcollector(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-pbr@2.0.0:2.0.999,2.1.1:', type='build') + depends_on('py-pbr@2.0.0:2.0,2.1.1:', type='build') depends_on('py-six@1.10.0:', type=('build', 'run')) depends_on('py-wrapt@1.7.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-deprecated/package.py b/var/spack/repos/builtin/packages/py-deprecated/package.py index b17672e274..3f56f828d0 100644 --- a/var/spack/repos/builtin/packages/py-deprecated/package.py +++ b/var/spack/repos/builtin/packages/py-deprecated/package.py @@ -17,5 +17,5 @@ class PyDeprecated(PythonPackage): version('1.2.7', sha256='408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308') depends_on("python@2.7:2.8,3.4:", type=("build", "run")) - depends_on("py-wrapt@1.10:1.99999", type=("build", "run")) + depends_on("py-wrapt@1.10:1", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-devlib/package.py b/var/spack/repos/builtin/packages/py-devlib/package.py index f4cc8823f1..cbf1ec8225 100644 --- a/var/spack/repos/builtin/packages/py-devlib/package.py +++ b/var/spack/repos/builtin/packages/py-devlib/package.py @@ -29,6 +29,6 @@ class PyDevlib(PythonPackage): depends_on('py-future', type=('build', 'run')) depends_on('py-pandas', type=('build', 'run')) depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3') - depends_on('py-contextlib2', type=('build', 'run'), when='^python@:2.999') - depends_on('py-numpy@:1.16.4', type=('build', 'run'), when='^python@:2.999') + depends_on('py-contextlib2', type=('build', 'run'), when='^python@:2') + depends_on('py-numpy@:1.16.4', type=('build', 'run'), when='^python@:2') depends_on('py-numpy', type=('build', 'run'), when='^python@:3.0') diff --git a/var/spack/repos/builtin/packages/py-distributed/package.py b/var/spack/repos/builtin/packages/py-distributed/package.py index aec2bd4583..b5259ea364 100644 --- a/var/spack/repos/builtin/packages/py-distributed/package.py +++ b/var/spack/repos/builtin/packages/py-distributed/package.py @@ -40,7 +40,7 @@ class PyDistributed(PythonPackage): depends_on('py-msgpack@0.6.0:', type=('build', 'run'), when='@2.11.0:') depends_on('py-psutil@5.0:', type=('build', 'run')) depends_on('py-six', type=('build', 'run'), when='@:1') - depends_on('py-sortedcontainers@:1.999,2.0.2:', type=('build', 'run')) + depends_on('py-sortedcontainers@:1,2.0.2:', type=('build', 'run')) depends_on('py-tblib', type=('build', 'run'), when='@:2.10.0') depends_on('py-tblib@1.6.0:', type=('build', 'run'), when='@2.11.0:') depends_on('py-toolz@0.7.4:', type=('build', 'run'), when='@:2.12.0') diff --git a/var/spack/repos/builtin/packages/py-docker/package.py b/var/spack/repos/builtin/packages/py-docker/package.py index fe1f667fae..c98c602591 100644 --- a/var/spack/repos/builtin/packages/py-docker/package.py +++ b/var/spack/repos/builtin/packages/py-docker/package.py @@ -16,6 +16,6 @@ class PyDocker(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-six@1.4.0:', type=('build', 'run')) depends_on('py-websocket-client@0.32.0:', type=('build', 'run')) - depends_on('py-requests@2.14.2:2.17.999,2.18.1:', type=('build', 'run')) + depends_on('py-requests@2.14.2:2.17,2.18.1:', type=('build', 'run')) depends_on('py-backports-ssl-match-hostname@3.5:', when='^python@:3.4', type=('build', 'run')) depends_on('py-ipaddress@1.0.16:', when='^python@:3.2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-docutils/package.py b/var/spack/repos/builtin/packages/py-docutils/package.py index b7874c5d72..449745c166 100644 --- a/var/spack/repos/builtin/packages/py-docutils/package.py +++ b/var/spack/repos/builtin/packages/py-docutils/package.py @@ -28,7 +28,7 @@ class PyDocutils(PythonPackage): depends_on('python@2.6:2.8,3.3:', when='@0.14:0.15', type=('build', 'run')) depends_on('python@2.4:3', when='@0.10:0.13', type=('build', 'run')) depends_on('python@2.2.1:3', when='@0.6:0.9', type=('build', 'run')) - depends_on('python@2.2.1:2.8', when='@0.5.0:0.5.999', type=('build', 'run')) + depends_on('python@2.2.1:2.8', when='@0.5.0:0.5', type=('build', 'run')) depends_on('python@2.1:2.8', when='@:0.4', type=('build', 'run')) # NOTE: This creates symbolic links to be able to run docutils scripts diff --git a/var/spack/repos/builtin/packages/py-dominate/package.py b/var/spack/repos/builtin/packages/py-dominate/package.py index 5e844e743a..96e91ba338 100644 --- a/var/spack/repos/builtin/packages/py-dominate/package.py +++ b/var/spack/repos/builtin/packages/py-dominate/package.py @@ -20,5 +20,5 @@ class PyDominate(PythonPackage): version('2.6.0', sha256='76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4') - depends_on('python@2.7:2.9999,3.4:', type=('build', 'run')) + depends_on('python@2.7:2,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-dvc/package.py b/var/spack/repos/builtin/packages/py-dvc/package.py index 6793937988..9d18ac4598 100644 --- a/var/spack/repos/builtin/packages/py-dvc/package.py +++ b/var/spack/repos/builtin/packages/py-dvc/package.py @@ -41,21 +41,21 @@ class PyDvc(PythonPackage): depends_on('py-funcy@1.14:', type=('build', 'run')) depends_on('py-pathspec@0.6.0:', type=('build', 'run')) depends_on('py-shortuuid@0.5.0:', type=('build', 'run')) - depends_on('py-tqdm@4.45.0:4.99', type=('build', 'run')) + depends_on('py-tqdm@4.45.0:4', type=('build', 'run')) depends_on('py-packaging@19.0:', type=('build', 'run')) - depends_on('py-flufl-lock@3.2:3.999', type=('build', 'run')) + depends_on('py-flufl-lock@3.2:3', type=('build', 'run')) depends_on('py-zc-lockfile@1.2.1:', type=('build', 'run')) depends_on('py-networkx@2.1:2.4', when='@:1.11.6', type=('build', 'run')) depends_on('py-networkx@2.1:', when='@1.11.7:', type=('build', 'run')) depends_on('py-psutil@5.8.0:', type=('build', 'run'), when='@2.1.0:') depends_on('py-pydot@1.2.4:', type=('build', 'run')) - depends_on('py-dataclasses@0.7', when='^python@:3.6.999', type=('build', 'run')) - depends_on('py-flatten-dict@0.3.0:0.99', type=('build', 'run')) + depends_on('py-dataclasses@0.7', when='^python@:3.6', type=('build', 'run')) + depends_on('py-flatten-dict@0.3.0:0', type=('build', 'run')) depends_on('py-tabulate@0.8.7:', type=('build', 'run')) depends_on('py-pygtrie@2.3.2', type=('build', 'run')) - depends_on('py-dpath@2.0.1:2.99', type=('build', 'run')) - depends_on('py-shtab@1.3.2:1.99', type=('build', 'run'), when='@:1.11.10') - depends_on('py-shtab@1.3.4:1.99', type=('build', 'run'), when='@2.1.0:') + depends_on('py-dpath@2.0.1:2', type=('build', 'run')) + depends_on('py-shtab@1.3.2:1', type=('build', 'run'), when='@:1.11.10') + depends_on('py-shtab@1.3.4:1', type=('build', 'run'), when='@2.1.0:') depends_on('py-rich@3.0.5:', type=('build', 'run'), when='@:1.11.10') depends_on('py-rich@10.0.0:', type=('build', 'run'), when='@2.1.0:') depends_on('py-dictdiffer@0.8.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-elasticsearch/package.py b/var/spack/repos/builtin/packages/py-elasticsearch/package.py index 7429f21748..db7abe00c1 100644 --- a/var/spack/repos/builtin/packages/py-elasticsearch/package.py +++ b/var/spack/repos/builtin/packages/py-elasticsearch/package.py @@ -18,9 +18,9 @@ class PyElasticsearch(PythonPackage): version('2.3.0', sha256='be3080a2bf32dff0a9f9fcc1c087515a25a357645673a976d25ef77166134d81') depends_on('py-setuptools', type='build') - depends_on('py-urllib3@1.8:1.999', type=('build', 'run')) + depends_on('py-urllib3@1.8:1', type=('build', 'run')) # tests_require - # depends_on('py-requests@1.0.0:2.9.999', type=('build', 'run')) + # depends_on('py-requests@1.0.0:2.9', type=('build', 'run')) # depends_on('py-nose', type=('build', 'run')) # depends_on('py-coverage', type=('build', 'run')) # depends_on('py-mock', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index 66e0b5a363..371df0f48a 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -30,13 +30,13 @@ class PyEspressopp(CMakePackage): depends_on("mpi") depends_on("boost+serialization+filesystem+system+python+mpi cxxstd=11") extends("python") - depends_on("python@2:2.8", when="@:2.9999", type=('build', 'run')) + depends_on("python@2:2.8", when="@:2", type=('build', 'run')) depends_on("python@3:", type=('build', 'run')) depends_on("py-mpi4py@2.0.0:", type=('build', 'run')) depends_on("fftw") depends_on("py-sphinx", when="+ug", type='build') depends_on("py-sphinx", when="+pdf", type='build') - depends_on('py-numpy@:1.16.6', when='@:2.9999', type=('build', 'run')) + depends_on('py-numpy@:1.16.6', when='@:2', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-matplotlib', when="+ug", type='build') depends_on('py-matplotlib', when="+pdf", type='build') diff --git a/var/spack/repos/builtin/packages/py-eventlet/package.py b/var/spack/repos/builtin/packages/py-eventlet/package.py index 54ca8e5710..7fc6697cda 100644 --- a/var/spack/repos/builtin/packages/py-eventlet/package.py +++ b/var/spack/repos/builtin/packages/py-eventlet/package.py @@ -16,4 +16,4 @@ class PyEventlet(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-greenlet@0.3:') - depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3') diff --git a/var/spack/repos/builtin/packages/py-fabric/package.py b/var/spack/repos/builtin/packages/py-fabric/package.py index 1f63b06bdb..102e14379f 100644 --- a/var/spack/repos/builtin/packages/py-fabric/package.py +++ b/var/spack/repos/builtin/packages/py-fabric/package.py @@ -13,5 +13,5 @@ class PyFabric(PythonPackage): version('2.5.0', sha256='24842d7d51556adcabd885ac3cf5e1df73fc622a1708bf3667bf5927576cdfa6') depends_on('py-setuptools', type='build') - depends_on('py-invoke@1.3:1.999', type=('build', 'run')) + depends_on('py-invoke@1.3:1', type=('build', 'run')) depends_on('py-paramiko@2.4:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-fenics-basix/package.py b/var/spack/repos/builtin/packages/py-fenics-basix/package.py index 1f5c567059..1ce63c2357 100644 --- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py @@ -30,7 +30,7 @@ class PyFenicsBasix(PythonPackage): depends_on("cmake@3.18:", type="build") depends_on("xtl@0.7.2:", type="build") depends_on("xtensor@0.23.10:", type="build") - depends_on("py-pybind11@2.6.2:2.7.99", type="build") + depends_on("py-pybind11@2.6.2:2.7", type="build") phases = ['build_ext', 'build', 'install'] diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py index bb5d442be3..15fd924f19 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -36,7 +36,7 @@ class PyFenicsDolfinx(PythonPackage): depends_on("py-numpy@:1.20.3", type=("build", "run")) depends_on("py-mpi4py", type=("build", "run")) depends_on("py-petsc4py", type=("build", "run")) - depends_on("py-pybind11@2.6.2:2.7.99", type=("build", "run")) + depends_on("py-pybind11@2.6.2:2.7", type=("build", "run")) depends_on("xtensor@0.23.10:", type="build") depends_on("py-fenics-ffcx@main", type="run", when="@main") diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py index ab95f7ec12..bb6d4fbb2a 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -24,7 +24,7 @@ class PyFenicsFfcx(PythonPackage): depends_on('py-cffi', type='run') depends_on('py-fenics-ufl@main', type='run', when='@main') - depends_on('py-fenics-ufl@2021.1.0', type='run', when='@0.1.0:0.3.99') + depends_on('py-fenics-ufl@2021.1.0', type='run', when='@0.1.0:0.3') depends_on('py-fenics-basix@main', type='run', when='@main') depends_on('py-fenics-basix@0.3.0', type='run', when='@0.3.0') diff --git a/var/spack/repos/builtin/packages/py-fenics-instant/package.py b/var/spack/repos/builtin/packages/py-fenics-instant/package.py index 10de314363..aa6ab4ab86 100644 --- a/var/spack/repos/builtin/packages/py-fenics-instant/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-instant/package.py @@ -21,7 +21,7 @@ class PyFenicsInstant(PythonPackage): depends_on('python@2.7:', type=("build", "run")) depends_on('py-six', type=('build', 'run')) - depends_on('py-subprocess32', when='^python@:2.999', type=('build', 'run')) + depends_on('py-subprocess32', when='^python@:2', type=('build', 'run')) depends_on('py-setuptools', type="build") depends_on('py-numpy', type=("build", "run")) depends_on('cmake', type="run") diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index a0da2f0c38..6117be8478 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -33,30 +33,30 @@ class PyFlake8(PythonPackage): # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8 # Flake8 3.8.X - depends_on('py-pycodestyle@2.6.0:2.6.999', when='@3.8.0:3.8.999', type=('build', 'run')) - depends_on('py-pyflakes@2.2.0:2.2.999', when='@3.8.0:3.8.999', type=('build', 'run')) + depends_on('py-pycodestyle@2.6.0:2.6', when='@3.8.0:3.8', type=('build', 'run')) + depends_on('py-pyflakes@2.2.0:2.2', when='@3.8.0:3.8', type=('build', 'run')) # Flake8 3.7.X - # FIXME @0.3.0:0.3.999 causes concretization to hang - depends_on('py-entrypoints@0.3', when='@3.7.0:3.8.999', type=('build', 'run')) - depends_on('py-pyflakes@2.1.0:2.1.999', when='@3.7.0:3.7.999', type=('build', 'run')) - depends_on('py-pycodestyle@2.5.0:2.5.999', when='@3.7.0:3.7.999', type=('build', 'run')) - depends_on('py-mccabe@0.6.0:0.6.999', when='@3.7.0:3.8.999', type=('build', 'run')) + # FIXME @0.3.0:0.3 causes concretization to hang + depends_on('py-entrypoints@0.3', when='@3.7.0:3.8', type=('build', 'run')) + depends_on('py-pyflakes@2.1.0:2.1', when='@3.7.0:3.7', type=('build', 'run')) + depends_on('py-pycodestyle@2.5.0:2.5', when='@3.7.0:3.7', type=('build', 'run')) + depends_on('py-mccabe@0.6.0:0.6', when='@3.7.0:3.8', type=('build', 'run')) # Flake8 3.5.X - depends_on('py-pyflakes@1.5:1.6', when='@3.5.0:3.5.999', type=('build', 'run')) - depends_on('py-pycodestyle@2.0:2.4', when='@3.5.0:3.5.999', type=('build', 'run')) - depends_on('py-mccabe@0.6.0:0.6.999', when='@3.5.0:3.5.999', type=('build', 'run')) + depends_on('py-pyflakes@1.5:1.6', when='@3.5.0:3.5', type=('build', 'run')) + depends_on('py-pycodestyle@2.0:2.4', when='@3.5.0:3.5', type=('build', 'run')) + depends_on('py-mccabe@0.6.0:0.6', when='@3.5.0:3.5', type=('build', 'run')) # Flake8 3.0.X - depends_on('py-pyflakes@0.8.1:1.1,1.2.3:1.2.999', when='@3.0.0:3.0.999', type=('build', 'run')) - depends_on('py-pycodestyle@2.0.0:2.0.999', when='@3.0.0:3.0.999', type=('build', 'run')) - depends_on('py-mccabe@0.5.0:0.5.999', when='@3.0.0:3.0.999', type=('build', 'run')) + depends_on('py-pyflakes@0.8.1:1.1,1.2.3:1.2', when='@3.0.0:3.0', type=('build', 'run')) + depends_on('py-pycodestyle@2.0.0:2.0', when='@3.0.0:3.0', type=('build', 'run')) + depends_on('py-mccabe@0.5.0:0.5', when='@3.0.0:3.0', type=('build', 'run')) # Flake8 2.5.X - depends_on('py-pyflakes@0.8.1:1.0', when='@2.5.0:2.5.999', type=('build', 'run')) - depends_on('py-pycodestyle@1.5.7:1.5.999,1.6.3:', when='@2.5.0:2.5.999', type=('build', 'run')) - depends_on('py-mccabe@0.2.1:0.4', when='@2.5.0:2.5.999', type=('build', 'run')) + depends_on('py-pyflakes@0.8.1:1.0', when='@2.5.0:2.5', type=('build', 'run')) + depends_on('py-pycodestyle@1.5.7:1.5,1.6.3:', when='@2.5.0:2.5', type=('build', 'run')) + depends_on('py-mccabe@0.2.1:0.4', when='@2.5.0:2.5', type=('build', 'run')) # Python version-specific backports depends_on('py-importlib-metadata', when='@3.8.0: ^python@:3.7', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-flatten-dict/package.py b/var/spack/repos/builtin/packages/py-flatten-dict/package.py index 6b2eeb1d0a..14453dc633 100644 --- a/var/spack/repos/builtin/packages/py-flatten-dict/package.py +++ b/var/spack/repos/builtin/packages/py-flatten-dict/package.py @@ -18,5 +18,5 @@ class PyFlattenDict(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-six@1.12:1.999', type=('build', 'run')) - depends_on('py-pathlib2@2.3:2.999', type=('build', 'run')) + depends_on('py-six@1.12:1', type=('build', 'run')) + depends_on('py-pathlib2@2.3:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-flufl-lock/package.py b/var/spack/repos/builtin/packages/py-flufl-lock/package.py index 70b57ff62f..d3cfaaf198 100644 --- a/var/spack/repos/builtin/packages/py-flufl-lock/package.py +++ b/var/spack/repos/builtin/packages/py-flufl-lock/package.py @@ -21,4 +21,4 @@ class PyFluflLock(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-atpublic', type=('build', 'run')) depends_on('py-psutil', type=('build', 'run')) - depends_on('py-typing-extensions', when='^python@:3.7.999', type=('build', 'run')) + depends_on('py-typing-extensions', when='^python@:3.7', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-freezegun/package.py b/var/spack/repos/builtin/packages/py-freezegun/package.py index 7ad47c106e..3f8b32d1a3 100644 --- a/var/spack/repos/builtin/packages/py-freezegun/package.py +++ b/var/spack/repos/builtin/packages/py-freezegun/package.py @@ -17,5 +17,5 @@ class PyFreezegun(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-six', type=('build', 'run')) - depends_on('py-python-dateutil@1.0:1.999', type=('build', 'run'), when='^python@:2') + depends_on('py-python-dateutil@1.0:1', type=('build', 'run'), when='^python@:2') depends_on('py-python-dateutil@2:', type=('build', 'run'), when='^python@3:') diff --git a/var/spack/repos/builtin/packages/py-funcy/package.py b/var/spack/repos/builtin/packages/py-funcy/package.py index e918f2e3d2..4164f811dc 100644 --- a/var/spack/repos/builtin/packages/py-funcy/package.py +++ b/var/spack/repos/builtin/packages/py-funcy/package.py @@ -15,5 +15,5 @@ class PyFuncy(PythonPackage): version('1.15', sha256='65b746fed572b392d886810a98d56939c6e0d545abb750527a717c21ced21008') version('1.14', sha256='75ee84c3b446f92e68a857c2267b15a1b49c631c9d5a87a5f063cd2d6761a5c4') - depends_on('python@2.7.0:2.7.999,3.4:', type=('build', 'run')) + depends_on('python@2.7.0:2.7,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-fury/package.py b/var/spack/repos/builtin/packages/py-fury/package.py index abe791ac6c..693da3e01c 100644 --- a/var/spack/repos/builtin/packages/py-fury/package.py +++ b/var/spack/repos/builtin/packages/py-fury/package.py @@ -18,7 +18,7 @@ class PyFury(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-numpy@1.7.1:', type=('build', 'run')) depends_on('py-scipy@1.2:', type=('build', 'run')) # from requirements/default.txt - depends_on('vtk+python@8.1.2:8.99,9.0.1:', type=('build', 'run')) + depends_on('vtk+python@8.1.2:8,9.0.1:', type=('build', 'run')) depends_on('pil@5.4.1:', type=('build', 'run')) depends_on('py-codecov', type='test') diff --git a/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py b/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py index 63d8548ab6..cf4effc213 100644 --- a/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py +++ b/var/spack/repos/builtin/packages/py-gcs-oauth2-boto-plugin/package.py @@ -19,7 +19,7 @@ class PyGcsOauth2BotoPlugin(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-rsa@:4.0', when='^python@:3.4.999', type=('build', 'run')) + depends_on('py-rsa@:4.0', when='^python@:3.4', type=('build', 'run')) depends_on('py-boto@2.29.1:', type=('build', 'run')) depends_on('py-google-auth@0.1.0:', type=('build', 'run')) depends_on('py-httplib2@0.18:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-gdbgui/package.py b/var/spack/repos/builtin/packages/py-gdbgui/package.py index 2bac7009ea..833bc3a548 100644 --- a/var/spack/repos/builtin/packages/py-gdbgui/package.py +++ b/var/spack/repos/builtin/packages/py-gdbgui/package.py @@ -16,11 +16,11 @@ class PyGdbgui(PythonPackage): version('0.11.2.1', sha256='280945a37414c31a798f68f70c1bffbedd12dfb0ce77418357e7d42b667491c7') depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-flask@0.12.2:0.99.0', type=('build', 'run')) - depends_on('py-flask-compress@1.4.0:1.99.0', type=('build', 'run')) - depends_on('py-flask-socketio@2.9.3:2.99.0', type=('build', 'run')) - depends_on('py-gevent@1.2.2:1.99.0', type=('build', 'run')) - depends_on('py-pygdbmi@0.9.0.0:0.99.0.0', type=('build', 'run'), when='@0.13.1.1:') - depends_on('py-pygdbmi@0.8.2.0:0.8.99.0', type=('build', 'run'), when='@:0.13.0.0') - depends_on('py-pygments@2.2.0:2.99.0', type=('build', 'run')) + depends_on('py-flask@0.12.2:0', type=('build', 'run')) + depends_on('py-flask-compress@1.4.0:1', type=('build', 'run')) + depends_on('py-flask-socketio@2.9.3:2', type=('build', 'run')) + depends_on('py-gevent@1.2.2:1', type=('build', 'run')) + depends_on('py-pygdbmi@0.9.0.0:0', type=('build', 'run'), when='@0.13.1.1:') + depends_on('py-pygdbmi@0.8.2.0:0.8', type=('build', 'run'), when='@:0.13.0.0') + depends_on('py-pygments@2.2.0:2', type=('build', 'run')) depends_on('gdb', type='run') diff --git a/var/spack/repos/builtin/packages/py-gemini/package.py b/var/spack/repos/builtin/packages/py-gemini/package.py index cbb26e77e3..ed897fba9f 100644 --- a/var/spack/repos/builtin/packages/py-gemini/package.py +++ b/var/spack/repos/builtin/packages/py-gemini/package.py @@ -50,7 +50,7 @@ class PyGemini(PythonPackage): depends_on('py-ipython-cluster-helper@0.5.1:', type=('build', 'run')) depends_on('py-bx-python@0.7.1:', type=('build', 'run')) depends_on('py-pandas@0.11.0:', type=('build', 'run')) - depends_on('py-openpyxl@1.6.1:1.999', type=('build', 'run')) + depends_on('py-openpyxl@1.6.1:1', type=('build', 'run')) depends_on('py-scipy@0.12.0:', type=('build', 'run')) depends_on('py-unidecode@0.04.14:', type=('build', 'run')) depends_on('py-cyordereddict@0.2.2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-gensim/package.py b/var/spack/repos/builtin/packages/py-gensim/package.py index ad3c4d68bf..6bf33c87be 100644 --- a/var/spack/repos/builtin/packages/py-gensim/package.py +++ b/var/spack/repos/builtin/packages/py-gensim/package.py @@ -23,15 +23,15 @@ class PyGensim(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-numpy@1.11.3:1.16.1', when='^python@:2.999', type=('build', 'run')) + depends_on('py-numpy@1.11.3:1.16.1', when='^python@:2', type=('build', 'run')) depends_on('py-numpy@1.11.3:', when='^python@3:', type=('build', 'run')) - depends_on('py-scipy@0.18.1:1.2.3', when='^python@:2.999', type=('build', 'run')) + depends_on('py-scipy@0.18.1:1.2.3', when='^python@:2', type=('build', 'run')) depends_on('py-scipy@0.18.1:', when='^python@3:', type=('build', 'run')) depends_on('py-six@1.5.0:', type=('build', 'run')) - depends_on('py-smart-open@1.7.0:1.10.9999', when='@3.8.0^python@:2.999', type=('build', 'run')) + depends_on('py-smart-open@1.7.0:1.10', when='@3.8.0^python@:2', type=('build', 'run')) depends_on('py-smart-open@1.7.0:', when='@3.8.0^python@3:', type=('build', 'run')) - depends_on('py-smart-open@1.8.1:1.10.9999', when='@3.8.1:^python@:2.999', type=('build', 'run')) + depends_on('py-smart-open@1.8.1:1.10', when='@3.8.1:^python@:2', type=('build', 'run')) depends_on('py-smart-open@1.8.1:', when='@3.8.1:^python@3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-geopy/package.py b/var/spack/repos/builtin/packages/py-geopy/package.py index 89a0075536..059d261d4e 100644 --- a/var/spack/repos/builtin/packages/py-geopy/package.py +++ b/var/spack/repos/builtin/packages/py-geopy/package.py @@ -18,4 +18,4 @@ class PyGeopy(PythonPackage): depends_on('python@3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-geographiclib@1.49:1.999', type=('build', 'run')) + depends_on('py-geographiclib@1.49:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-gitdb/package.py b/var/spack/repos/builtin/packages/py-gitdb/package.py index 0af83c876c..03b0995e6f 100644 --- a/var/spack/repos/builtin/packages/py-gitdb/package.py +++ b/var/spack/repos/builtin/packages/py-gitdb/package.py @@ -17,4 +17,4 @@ class PyGitdb(PythonPackage): depends_on('python@3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-smmap@3.0.1:3.999', type=('build', 'run')) + depends_on('py-smmap@3.0.1:3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-gitpython/package.py b/var/spack/repos/builtin/packages/py-gitpython/package.py index 509e74c21e..0347d978c4 100644 --- a/var/spack/repos/builtin/packages/py-gitpython/package.py +++ b/var/spack/repos/builtin/packages/py-gitpython/package.py @@ -30,4 +30,4 @@ class PyGitpython(PythonPackage): depends_on('python@3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-gitdb@4.0.1:4.999', type=('build', 'run')) + depends_on('py-gitdb@4.0.1:4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-globus-sdk/package.py b/var/spack/repos/builtin/packages/py-globus-sdk/package.py index 48edb292df..4d1bb6dace 100644 --- a/var/spack/repos/builtin/packages/py-globus-sdk/package.py +++ b/var/spack/repos/builtin/packages/py-globus-sdk/package.py @@ -17,6 +17,6 @@ class PyGlobusSdk(PythonPackage): version('3.0.2', sha256='765b577b37edac70c513179607f1c09de7b287baa855165c9dd68de076d67f16') depends_on('python@3.4:', type=('build', 'run')) - depends_on('py-requests@2.19.1:2.999.999', type=('run', 'test')) - depends_on('py-cryptography@2.0:3.3.999,3.4.1:3.6.999', type=('run', 'test')) - depends_on('py-pyjwt@2.0.0:2.999.999+crypto', type=('run', 'test')) + depends_on('py-requests@2.19.1:2', type=('run', 'test')) + depends_on('py-cryptography@2.0:3.3,3.4.1:3.6', type=('run', 'test')) + depends_on('py-pyjwt@2.0.0:2+crypto', type=('run', 'test')) diff --git a/var/spack/repos/builtin/packages/py-google-api-core/package.py b/var/spack/repos/builtin/packages/py-google-api-core/package.py index bf0eb23d63..53e4128d11 100644 --- a/var/spack/repos/builtin/packages/py-google-api-core/package.py +++ b/var/spack/repos/builtin/packages/py-google-api-core/package.py @@ -19,10 +19,10 @@ class PyGoogleApiCore(PythonPackage): version('1.14.2', sha256='2c23fbc81c76b941ffb71301bb975ed66a610e9b03f918feacd1ed59cf43a6ec') depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) - depends_on('py-googleapis-common-protos@1.6:1.999', type=('build', 'run')) + depends_on('py-googleapis-common-protos@1.6:1', type=('build', 'run')) depends_on('py-protobuf@3.4.0:', type=('build', 'run')) - depends_on('py-google-auth@0.4:1.999', type=('build', 'run')) - depends_on('py-requests@2.18:2.999', type=('build', 'run')) + depends_on('py-google-auth@0.4:1', type=('build', 'run')) + depends_on('py-requests@2.18:2', type=('build', 'run')) depends_on('py-setuptools@34.0.0:', type=('build', 'run')) depends_on('py-six@1.10.0:', type=('build', 'run')) depends_on('py-pytz', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-google-cloud-core/package.py b/var/spack/repos/builtin/packages/py-google-cloud-core/package.py index f88f90a808..426a389c46 100644 --- a/var/spack/repos/builtin/packages/py-google-cloud-core/package.py +++ b/var/spack/repos/builtin/packages/py-google-cloud-core/package.py @@ -16,4 +16,4 @@ class PyGoogleCloudCore(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-google-api-core@1.14:1.999', type=('build', 'run')) + depends_on('py-google-api-core@1.14:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py b/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py index e605b58076..ec00caf395 100644 --- a/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py +++ b/var/spack/repos/builtin/packages/py-google-cloud-storage/package.py @@ -17,5 +17,5 @@ class PyGoogleCloudStorage(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-google-auth@1.2.0:', type=('build', 'run')) - depends_on('py-google-cloud-core@1.0:1.999', type=('build', 'run')) + depends_on('py-google-cloud-core@1.0:1', type=('build', 'run')) depends_on('py-google-resumable-media@0.3.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-gosam/package.py b/var/spack/repos/builtin/packages/py-gosam/package.py index 6f7a797f0f..ec1b61f63f 100644 --- a/var/spack/repos/builtin/packages/py-gosam/package.py +++ b/var/spack/repos/builtin/packages/py-gosam/package.py @@ -24,7 +24,7 @@ class PyGosam(PythonPackage): depends_on('form', type='run') depends_on('qgraf', type='run') depends_on('gosam-contrib', type='link') - depends_on('python@2.7:2.7.99', type=('build', 'run'), when='@:2.0.4') + depends_on('python@2.7.0:2.7', type=('build', 'run'), when='@:2.0.4') depends_on('python@3:', type=('build', 'run'), when='@2.1.1:') def setup_run_environment(self, env): diff --git a/var/spack/repos/builtin/packages/py-gql/package.py b/var/spack/repos/builtin/packages/py-gql/package.py index 3e731471a3..573162c08c 100644 --- a/var/spack/repos/builtin/packages/py-gql/package.py +++ b/var/spack/repos/builtin/packages/py-gql/package.py @@ -18,12 +18,12 @@ class PyGql(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-aiohttp@3.6.2', type=('build', 'run'), when='@3.0:') - depends_on('py-graphql-core@3.1.0:3.1.999', type=('build', 'run'), when='@3.0:') - depends_on('py-requests@2.23:2.999', type=('build', 'run'), when='@3.0:') - depends_on('py-websockets@8.1:8.999', type=('build', 'run'), when='@3.0:') - depends_on('py-yarl@1.4:1.999', type=('build', 'run'), when='@3.0:') + depends_on('py-graphql-core@3.1.0:3.1', type=('build', 'run'), when='@3.0:') + depends_on('py-requests@2.23:2', type=('build', 'run'), when='@3.0:') + depends_on('py-websockets@8.1:8', type=('build', 'run'), when='@3.0:') + depends_on('py-yarl@1.4:1', type=('build', 'run'), when='@3.0:') - depends_on('py-graphql-core@2.0:2.999', type=('build', 'run'), when='@0.4.0') + depends_on('py-graphql-core@2.0:2', type=('build', 'run'), when='@0.4.0') depends_on('py-six@1.10.0:', type=('build', 'run'), when='@0.4.0') - depends_on('py-promise@2.0:2.999', type=('build', 'run'), when='@0.4.0') - depends_on('py-requests@2.12:2.999', type=('build', 'run'), when='@0.4.0') + depends_on('py-promise@2.0:2', type=('build', 'run'), when='@0.4.0') + depends_on('py-requests@2.12:2', type=('build', 'run'), when='@0.4.0') diff --git a/var/spack/repos/builtin/packages/py-graphql-core/package.py b/var/spack/repos/builtin/packages/py-graphql-core/package.py index 9c8ab6fead..b877c456ef 100644 --- a/var/spack/repos/builtin/packages/py-graphql-core/package.py +++ b/var/spack/repos/builtin/packages/py-graphql-core/package.py @@ -16,5 +16,5 @@ class PyGraphqlCore(PythonPackage): version('3.0.5', sha256='51f7dab06b5035515b23984f6fcb677ed909b56c672152699cca32e03624992e') version('2.3.2', sha256='aac46a9ac524c9855910c14c48fc5d60474def7f99fd10245e76608eba7af746') - depends_on('python@3.6:3.999', type=('build', 'run')) + depends_on('python@3.6:3', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-gsd/package.py b/var/spack/repos/builtin/packages/py-gsd/package.py index 2cfd8719cc..d632cc17d1 100644 --- a/var/spack/repos/builtin/packages/py-gsd/package.py +++ b/var/spack/repos/builtin/packages/py-gsd/package.py @@ -22,4 +22,4 @@ class PyGsd(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-cython', type='build') - depends_on('py-numpy@1.9.3:1.999999', type=('build', 'run')) + depends_on('py-numpy@1.9.3:19', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-gsi/package.py b/var/spack/repos/builtin/packages/py-gsi/package.py index aa4a6b3b43..c1362319c9 100644 --- a/var/spack/repos/builtin/packages/py-gsi/package.py +++ b/var/spack/repos/builtin/packages/py-gsi/package.py @@ -14,6 +14,6 @@ class PyGsi(PythonPackage): version('0.6.5', sha256='8291dd2fab2be12626272629f7f9661487c4e29f1f9ab8c61614c54b06cb0643') - depends_on('python@2.7:2.7.99', type=('build', 'run')) + depends_on('python@2.7.0:2.7', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('openssl', type='link') diff --git a/var/spack/repos/builtin/packages/py-gsutil/package.py b/var/spack/repos/builtin/packages/py-gsutil/package.py index 240602709a..e8cfe652c3 100644 --- a/var/spack/repos/builtin/packages/py-gsutil/package.py +++ b/var/spack/repos/builtin/packages/py-gsutil/package.py @@ -17,7 +17,7 @@ class PyGsutil(PythonPackage): version('5.2', sha256='08857eedbd89c7c6d10176b14f94fb1168d5ef88f5b5b15b3e8a37e29302b79b') version('4.59', sha256='349e0e0b48c281659acec205917530ae57e2eb23db7220375f5add44688d3ddf') - depends_on('python@2.7:2.8,3.5:3.999', type=('build', 'run')) + depends_on('python@2.7:2.8,3.5:3', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-argcomplete@1.9.4:', type=('build', 'run')) depends_on('py-crcmod@1.7:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-gym/package.py b/var/spack/repos/builtin/packages/py-gym/package.py index 795c93fe25..c0b557ce61 100644 --- a/var/spack/repos/builtin/packages/py-gym/package.py +++ b/var/spack/repos/builtin/packages/py-gym/package.py @@ -23,4 +23,4 @@ class PyGym(PythonPackage): depends_on('py-pyglet@1.4.0:1.5.15', type=('build', 'run'), when='@0.18.1') depends_on('pil@:8.2.0', type=('build', 'run'), when='@0.18.1') depends_on('pil@:7.2.0', type=('build', 'run'), when='@0.18.0') - depends_on('py-cloudpickle@1.2.0:1.6.999', type=('build', 'run')) + depends_on('py-cloudpickle@1.2.0:1.6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 251608abb2..e7e4b123b0 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -34,37 +34,37 @@ class PyH5py(PythonPackage): variant('mpi', default=True, description='Build with MPI support') # Python versions - depends_on('python@3.6:', type=('build', 'run'), when='@3.0.0:3.1.99') + depends_on('python@3.6:', type=('build', 'run'), when='@3.0.0:3.1') depends_on('python@3.7:', type=('build', 'run'), when='@3.2.0:') # Build dependencies - depends_on('py-cython@0.23:', type='build', when='@:2.99') - depends_on('py-cython@0.29:', type=('build'), when='@3.0.0:^python@:3.7.99') - depends_on('py-cython@0.29.14:', type=('build'), when='@3.0.0:^python@3.8.0:3.8.99') + depends_on('py-cython@0.23:', type='build', when='@:2') + depends_on('py-cython@0.29:', type=('build'), when='@3.0.0:^python@:3.7') + depends_on('py-cython@0.29.14:', type=('build'), when='@3.0.0:^python@3.8.0:3.8') depends_on('py-cython@0.29.15:', type=('build'), when='@3.0.0:^python@3.9.0:') depends_on('py-pkgconfig', type='build') depends_on('py-setuptools', type='build') depends_on('py-wheel', type='build', when='@3.0.0:') # Build and runtime dependencies - depends_on('py-cached-property@1.5:', type=('build', 'run'), when='^python@:3.7.99') - depends_on('py-numpy@1.7:', type=('build', 'run'), when='@:2.99') - depends_on('py-numpy@1.12:', type=('build', 'run'), when='@3.0.0:^python@3.6.0:3.6.99') - depends_on('py-numpy@1.14.5:', type=('build', 'run'), when='@3.0.0:^python@3.7.0:3.7.99') - depends_on('py-numpy@1.17.5:', type=('build', 'run'), when='@3.0.0:^python@3.8.0:3.8.99') + depends_on('py-cached-property@1.5:', type=('build', 'run'), when='^python@:3.7') + depends_on('py-numpy@1.7:', type=('build', 'run'), when='@:2') + depends_on('py-numpy@1.12:', type=('build', 'run'), when='@3.0.0:^python@3.6.0:3.6') + depends_on('py-numpy@1.14.5:', type=('build', 'run'), when='@3.0.0:^python@3.7.0:3.7') + depends_on('py-numpy@1.17.5:', type=('build', 'run'), when='@3.0.0:^python@3.8.0:3.8') depends_on('py-numpy@1.19.3:', type=('build', 'run'), when='@3.0.0:^python@3.9.0:') - depends_on('py-six', type=('build', 'run'), when='@:2.99') + depends_on('py-six', type=('build', 'run'), when='@:2') # Link dependencies - depends_on('hdf5@1.8.4:1.11+hl', when='@:2.99') + depends_on('hdf5@1.8.4:1.11+hl', when='@:2') depends_on('hdf5@1.8.4:+hl', when='@3.0.0:') # MPI dependencies depends_on('hdf5+mpi', when='+mpi') depends_on('mpi', when='+mpi') - depends_on('py-mpi4py', when='@:2.99 +mpi', type=('build', 'run')) - depends_on('py-mpi4py@3.0.0:', when='@3.0.0:3.2.99+mpi^python@3.0.0:3.7.99', type=('build', 'run')) - depends_on('py-mpi4py@3.0.2:', when='@3.3.0:+mpi^python@3.0.0:3.7.99', type=('build', 'run')) + depends_on('py-mpi4py', when='@:2 +mpi', type=('build', 'run')) + depends_on('py-mpi4py@3.0.0:', when='@3.0.0:3.2+mpi^python@3.0.0:3.7', type=('build', 'run')) + depends_on('py-mpi4py@3.0.2:', when='@3.3.0:+mpi^python@3.0.0:3.7', type=('build', 'run')) depends_on('py-mpi4py@3.0.3:', when='@3.0.0:+mpi^python@3.8.0:', type=('build', 'run')) phases = ['configure', 'install'] @@ -83,7 +83,7 @@ class PyH5py(PythonPackage): def configure(self, spec, prefix): pass - @when('@:2.99') + @when('@:2') def configure(self, spec, prefix): self.setup_py('configure', '--hdf5={0}'.format(spec['hdf5'].prefix), '--hdf5-version={0}'.format(spec['hdf5'].version)) diff --git a/var/spack/repos/builtin/packages/py-hieroglyph/package.py b/var/spack/repos/builtin/packages/py-hieroglyph/package.py index 997e0ddf34..56a8ed3c8a 100644 --- a/var/spack/repos/builtin/packages/py-hieroglyph/package.py +++ b/var/spack/repos/builtin/packages/py-hieroglyph/package.py @@ -19,6 +19,6 @@ class PyHieroglyph(PythonPackage): depends_on('python@3:', when='@2:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-sphinx@1.2:', when='@1.0.0:1.9.999', type=('build', 'run')) + depends_on('py-sphinx@1.2:', when='@1.0.0:1.9', type=('build', 'run')) depends_on('py-sphinx@2.0:', when='@2.0.0:', type=('build', 'run')) - depends_on('py-six', when='@1.0.0:1.9.999', type=('build', 'run')) + depends_on('py-six', when='@1.0.0:1.9', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-horovod/package.py b/var/spack/repos/builtin/packages/py-horovod/package.py index 5fadc26f44..071b81fd3a 100644 --- a/var/spack/repos/builtin/packages/py-horovod/package.py +++ b/var/spack/repos/builtin/packages/py-horovod/package.py @@ -69,7 +69,7 @@ class PyHorovod(PythonPackage, CudaPackage): depends_on('py-cffi@1.4.0:', type=('build', 'run'), when='frameworks=pytorch') depends_on('mxnet@1.4.1:+python', type=('build', 'link', 'run'), when='frameworks=mxnet') depends_on('py-keras@2.0.8,2.1.2:', type=('build', 'run'), when='frameworks=keras') - depends_on('py-h5py@:2.999', type=('build', 'run'), when='frameworks=spark') + depends_on('py-h5py@:2', type=('build', 'run'), when='frameworks=spark') depends_on('py-numpy', type=('build', 'run'), when='frameworks=spark') depends_on('py-petastorm@0.8.2', type=('build', 'run'), when='frameworks=spark @:0.19.1') depends_on('py-petastorm@0.9.0:', type=('build', 'run'), when='frameworks=spark @0.19.2:0.21.0') diff --git a/var/spack/repos/builtin/packages/py-hpcbench/package.py b/var/spack/repos/builtin/packages/py-hpcbench/package.py index b53c1df5d6..f6d4e5e9c1 100644 --- a/var/spack/repos/builtin/packages/py-hpcbench/package.py +++ b/var/spack/repos/builtin/packages/py-hpcbench/package.py @@ -23,7 +23,7 @@ class PyHpcbench(PythonPackage): depends_on('py-clustershell@1.8:', type=('build', 'run')) depends_on('py-cookiecutter@1.6.0', type=('build', 'run')) depends_on('py-docopt@0.6.2', type=('build', 'run')) - depends_on('py-elasticsearch@6:6.999', type=('build', 'run')) + depends_on('py-elasticsearch@6.0:6', type=('build', 'run')) depends_on('py-jinja2@2.10', type=('build', 'run')) depends_on('py-mock@2.0.0', type=('build', 'run')) depends_on('py-numpy@1.13.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-html5lib/package.py b/var/spack/repos/builtin/packages/py-html5lib/package.py index ea81a8beae..1fa20749ca 100644 --- a/var/spack/repos/builtin/packages/py-html5lib/package.py +++ b/var/spack/repos/builtin/packages/py-html5lib/package.py @@ -10,12 +10,12 @@ class PyHtml5lib(PythonPackage): """HTML parser based on the WHATWG HTML specification.""" homepage = "https://github.com/html5lib/html5lib-python" - pypi = "html5lib/html5lib-0.9999999.tar.gz" + pypi = "html5lib/html5lib-099.tar.gz" version('1.0.1', sha256='66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736') - version('0.9999999', sha256='2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868') + version('099', sha256='2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868') - depends_on('python@2.6:2.8,3.2:', when='@0.9999999', type=('build', 'run')) + depends_on('python@2.6:2.8,3.2:', when='@099', type=('build', 'run')) depends_on('python@2.6:2.8,3.3:', when='@1.0.1:', type=('build', 'run')) depends_on('py-six', type=('build', 'run')) depends_on('py-six@1.9:', type=('build', 'run'), when='@1.0.1:') diff --git a/var/spack/repos/builtin/packages/py-httpx/package.py b/var/spack/repos/builtin/packages/py-httpx/package.py index ec3268461f..68c13dfff2 100644 --- a/var/spack/repos/builtin/packages/py-httpx/package.py +++ b/var/spack/repos/builtin/packages/py-httpx/package.py @@ -21,4 +21,4 @@ class PyHttpx(PythonPackage): depends_on('py-certifi') depends_on('py-sniffio') depends_on('py-httpcore@0.11:') - depends_on('py-rfc3986+idna2008@1.3:1.99') + depends_on('py-rfc3986+idna2008@1.3:1') diff --git a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py index e3b3870b9a..9f5d3b399b 100644 --- a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py +++ b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py @@ -23,4 +23,4 @@ class PyHuggingfaceHub(PythonPackage): depends_on('py-requests', type=('build', 'run')) depends_on('py-tqdm', type=('build', 'run')) depends_on('py-typing-extensions', when='@0.0.10:', type=('build', 'run')) - depends_on('py-importlib-metadata', when='^python@:3.7.999', type=('build', 'run')) + depends_on('py-importlib-metadata', when='^python@:3.7', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-hypothesis/package.py b/var/spack/repos/builtin/packages/py-hypothesis/package.py index 825e37e981..36c9d2cedc 100644 --- a/var/spack/repos/builtin/packages/py-hypothesis/package.py +++ b/var/spack/repos/builtin/packages/py-hypothesis/package.py @@ -25,4 +25,4 @@ class PyHypothesis(PythonPackage): depends_on('py-attrs@16.0.0:', when='@3.44.22:', type=('build', 'run')) depends_on('py-attrs', when='@3.28.0:', type=('build', 'run')) depends_on('py-enum34', type=('build', 'run'), when='^python@:2') - depends_on('py-sortedcontainers@2.1.0:2.999.0', type=('build', 'run'), when='@4.57.1:') + depends_on('py-sortedcontainers@2.1.0:2', type=('build', 'run'), when='@4.57.1:') diff --git a/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py b/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py index 5b8923a29c..e00bb18c11 100644 --- a/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py +++ b/var/spack/repos/builtin/packages/py-ibm-cloud-sdk-core/package.py @@ -19,6 +19,6 @@ class PyIbmCloudSdkCore(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-requests@2.20:2.999', type=('build', 'run')) - depends_on('py-python-dateutil@2.5.3:2.999', type=('build', 'run')) - depends_on('py-pyjwt@2.0.1:2.999', type=('build', 'run')) + depends_on('py-requests@2.20:2', type=('build', 'run')) + depends_on('py-python-dateutil@2.5.3:2', type=('build', 'run')) + depends_on('py-pyjwt@2.0.1:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ibm-watson/package.py b/var/spack/repos/builtin/packages/py-ibm-watson/package.py index 8e023c2c32..ce31f46f74 100644 --- a/var/spack/repos/builtin/packages/py-ibm-watson/package.py +++ b/var/spack/repos/builtin/packages/py-ibm-watson/package.py @@ -16,7 +16,7 @@ class PyIbmWatson(PythonPackage): version('5.1.0', sha256='faea1e519f6d846a5ca9e03aefc9f894ff8da1eed9117ace6a6fa8f218ba0bc7') depends_on('py-setuptools', type='build') - depends_on('py-requests@2.0:2.999', type=('build', 'run')) + depends_on('py-requests@2.0:2', type=('build', 'run')) depends_on('py-python-dateutil@2.5.3:', type=('build', 'run')) depends_on('py-websocket-client@0.48.0', type=('build', 'run')) depends_on('py-ibm-cloud-sdk-core@3.3.6:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ics/package.py b/var/spack/repos/builtin/packages/py-ics/package.py index db0df6608f..eb0c1eafa2 100644 --- a/var/spack/repos/builtin/packages/py-ics/package.py +++ b/var/spack/repos/builtin/packages/py-ics/package.py @@ -35,6 +35,6 @@ class PyIcs(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-python-dateutil', type=('build', 'run')) - depends_on('py-arrow@0.11:0.14.99', type=('build', 'run')) + depends_on('py-arrow@0.11:0.14', type=('build', 'run')) depends_on('py-six@1.5:', type=('build', 'run')) depends_on('py-tatsu@4.2:', type=('build', 'run'), when='@0.6:') diff --git a/var/spack/repos/builtin/packages/py-imgaug/package.py b/var/spack/repos/builtin/packages/py-imgaug/package.py index 461f17bdd2..6673310a91 100644 --- a/var/spack/repos/builtin/packages/py-imgaug/package.py +++ b/var/spack/repos/builtin/packages/py-imgaug/package.py @@ -27,5 +27,5 @@ class PyImgaug(PythonPackage): depends_on('py-six', type=('build', 'run')) depends_on('py-scikit-image@0.14.2:', type=('build', 'run')) depends_on('pil', type=('build', 'run')) - depends_on('opencv+python2', when='^python@2.0:2.999', type=('build', 'run')) + depends_on('opencv+python2', when='^python@2.0:2', type=('build', 'run')) depends_on('opencv+python3', when='^python@3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py index 7df0c6862a..5aefacec03 100644 --- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py @@ -30,4 +30,4 @@ class PyImportlibMetadata(PythonPackage): depends_on('py-pathlib2', when='^python@:2', type=('build', 'run')) depends_on('py-contextlib2', when='^python@:2', type=('build', 'run')) depends_on('py-configparser@3.5:', when='^python@:2', type=('build', 'run')) - depends_on('py-typing-extensions@3.6.4:', type=('build', 'run'), when='@3: ^python@:3.7.999') + depends_on('py-typing-extensions@3.6.4:', type=('build', 'run'), when='@3: ^python@:3.7') diff --git a/var/spack/repos/builtin/packages/py-importlib/package.py b/var/spack/repos/builtin/packages/py-importlib/package.py index e56a2ee537..27040a7aaa 100644 --- a/var/spack/repos/builtin/packages/py-importlib/package.py +++ b/var/spack/repos/builtin/packages/py-importlib/package.py @@ -14,4 +14,4 @@ class PyImportlib(PythonPackage): version('1.0.4', sha256='b6ee7066fea66e35f8d0acee24d98006de1a0a8a94a8ce6efe73a9a23c8d9826') - depends_on('python@:2.6.999,3.0.0:3.0.999', type=('build', 'run')) + 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 333d3de4e7..6d11b01b3c 100644 --- a/var/spack/repos/builtin/packages/py-intervaltree/package.py +++ b/var/spack/repos/builtin/packages/py-intervaltree/package.py @@ -14,5 +14,5 @@ class PyIntervaltree(PythonPackage): version('3.0.2', sha256='e8ab75b66077f2e5fb85ac56cb6df834689edb048d38601d53d8867cce3b77d1') - depends_on('py-sortedcontainers@2:2.999', type=('build', 'run')) + depends_on('py-sortedcontainers@2.0:2', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-ipykernel/package.py b/var/spack/repos/builtin/packages/py-ipykernel/package.py index 62eb5ad22e..47b318cac1 100644 --- a/var/spack/repos/builtin/packages/py-ipykernel/package.py +++ b/var/spack/repos/builtin/packages/py-ipykernel/package.py @@ -33,10 +33,10 @@ class PyIpykernel(PythonPackage): depends_on('py-setuptools', type='build', when='@5:') depends_on('py-importlib-metadata@:4', when='@6:^python@:3.7', type=('build', 'run')) depends_on('py-argcomplete@1.12.3:', when='@6:^python@:3.7', type=('build', 'run')) - depends_on('py-debugpy@1.0:1.999', when='@6:', type=('build', 'run')) + depends_on('py-debugpy@1.0:1', when='@6:', type=('build', 'run')) depends_on('py-ipython@4.0:', when='@:4', type=('build', 'run')) depends_on('py-ipython@5.0:', when='@5', type=('build', 'run')) - depends_on('py-ipython@7.23.1:7.999', when='@6:', type=('build', 'run')) + depends_on('py-ipython@7.23.1:7', when='@6:', type=('build', 'run')) depends_on('py-traitlets@4.1.0:', type=('build', 'run')) depends_on('py-traitlets@4.1.0:5', when='@6:', type=('build', 'run')) depends_on('py-jupyter-client', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py b/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py index 02f2a1e563..0f5989bd28 100644 --- a/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py +++ b/var/spack/repos/builtin/packages/py-ipython-cluster-helper/package.py @@ -20,7 +20,7 @@ class PyIpythonClusterHelper(PythonPackage): depends_on('py-setuptools@18.5:', type=('build', 'run')) depends_on('py-pyzmq@2.1.11:', type=('build', 'run')) - depends_on('py-ipython@:5.99', type=('build', 'run')) + depends_on('py-ipython@:5', type=('build', 'run')) depends_on('py-ipyparallel@6.0.2:', type=('build', 'run')) depends_on('py-netifaces@0.10.3:', type=('build', 'run')) depends_on('py-six@1.10.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index ad8e73c3b4..db78971301 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -43,11 +43,11 @@ class PyIpython(PythonPackage): depends_on('py-decorator', type=('build', 'run')) depends_on('py-pickleshare', type=('build', 'run')) depends_on('py-traitlets@4.2:', type=('build', 'run')) - depends_on('py-prompt-toolkit@1.0.4:1.999', when='@:7.0.0', type=('build', 'run')) - depends_on('py-prompt-toolkit@2.0.0:2.999', when='@7.0.0:7.5.0', type=('build', 'run')) - depends_on('py-prompt-toolkit@2.0.0:2.0.999', when='@7.5.0', type=('build', 'run')) - depends_on('py-prompt-toolkit@3.0.2:3.0.999', when='@7.18:7.25', type=('build', 'run')) - depends_on('py-prompt-toolkit@2.0.0:2.999,3.0.2:3.0.999', when='@7.26:', type=('build', 'run')) + depends_on('py-prompt-toolkit@1.0.4:1', when='@:7.0.0', type=('build', 'run')) + depends_on('py-prompt-toolkit@2.0.0:2', when='@7.0.0:7.5.0', type=('build', 'run')) + depends_on('py-prompt-toolkit@2.0.0:2.0', when='@7.5.0', type=('build', 'run')) + depends_on('py-prompt-toolkit@3.0.2:3.0', when='@7.18:7.25', type=('build', 'run')) + depends_on('py-prompt-toolkit@2.0.0:2,3.0.2:3.0', when='@7.26:', type=('build', 'run')) depends_on('py-pygments', type=('build', 'run')) depends_on('py-backcall', type=('build', 'run'), when='@7.3.0:') depends_on('py-matplotlib-inline', when='@7.23:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ipywidgets/package.py b/var/spack/repos/builtin/packages/py-ipywidgets/package.py index 3f377f093d..9acf7a2146 100644 --- a/var/spack/repos/builtin/packages/py-ipywidgets/package.py +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -24,14 +24,14 @@ class PyIpywidgets(PythonPackage): when='^python@3.6:') depends_on('py-ipykernel@4.2.2:', type=('build', 'run')) depends_on('py-ipykernel@4.5.1:', type=('build', 'run'), when='@6:') - depends_on('py-ipython-genutils@0.2.0:0.2.999', type=('build', 'run'), + depends_on('py-ipython-genutils@0.2.0:0.2', type=('build', 'run'), when='@7.6.4:') depends_on('py-traitlets@4.2.1:', type=('build', 'run')) depends_on('py-traitlets@4.3.1:', type=('build', 'run'), when='@6:') depends_on('py-nbformat@4.2.0:', type=('build', 'run'), when='@6:') depends_on('py-widgetsnbextension@1.2.6:1.9', type=('build', 'run'), when='@5.2.2') - depends_on('py-widgetsnbextension@3.4.0:3.4.999', type=('build', 'run'), + depends_on('py-widgetsnbextension@3.4.0:3.4', type=('build', 'run'), when='@7.4.2') - depends_on('py-widgetsnbextension@3.5.0:3.5.999', type=('build', 'run'), + depends_on('py-widgetsnbextension@3.5.0:3.5', type=('build', 'run'), when='@7.5.1:') diff --git a/var/spack/repos/builtin/packages/py-irpf90/package.py b/var/spack/repos/builtin/packages/py-irpf90/package.py index a4e6d6e9ce..7f2fba78cf 100644 --- a/var/spack/repos/builtin/packages/py-irpf90/package.py +++ b/var/spack/repos/builtin/packages/py-irpf90/package.py @@ -19,5 +19,5 @@ class PyIrpf90(PythonPackage): version('1.7.7', sha256='c6b2eecb9180f1feaab9644bbed806637a4a30a0fad2c4775a985fcc01a99530') - depends_on('python@2.7.0:2.8.999', type=('build', 'run')) + depends_on('python@2.7.0:2.8', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index c246d5fdd3..30c8721692 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -18,10 +18,10 @@ class PyIsort(PythonPackage): variant('colors', default=False, description='Install colorama for --color support') - depends_on('python@3.6.1:3.999', type=('build', 'run'), when='@5:') + depends_on('python@3.6.1:3', type=('build', 'run'), when='@5:') depends_on('python@2.7:2.8,3.4:', type=('build', 'run'), when='@4.3:') depends_on('python@2.6:2.8,3.3:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-futures', type=('build', 'run'), when='@4.3:4.999 ^python@:3.1') - depends_on('py-backports-functools-lru-cache', type=('build', 'run'), when='@4.3.10:4.999 ^python@:3.1') - depends_on('py-colorama@0.4.3:0.4.999', type=('build', 'run'), when='+colors') + depends_on('py-futures', type=('build', 'run'), when='@4.3:4 ^python@:3.1') + depends_on('py-backports-functools-lru-cache', type=('build', 'run'), when='@4.3.10:4 ^python@:3.1') + depends_on('py-colorama@0.4.3:0.4', type=('build', 'run'), when='+colors') diff --git a/var/spack/repos/builtin/packages/py-itk/package.py b/var/spack/repos/builtin/packages/py-itk/package.py index 8d985dbd09..8d34fc370f 100644 --- a/var/spack/repos/builtin/packages/py-itk/package.py +++ b/var/spack/repos/builtin/packages/py-itk/package.py @@ -89,11 +89,11 @@ class PyItk(Package): extends('python') depends_on('py-pip', type='build') - depends_on('python@3.5.0:3.5.999', when='@5.1.1-cp35', type=('build', 'run')) - depends_on('python@3.6.0:3.6.999', when='@5.1.1-cp36,5.1.2-cp36', type=('build', 'run')) - depends_on('python@3.7.0:3.7.999', when='@5.1.1-cp37,5.1.2-cp37', type=('build', 'run')) - depends_on('python@3.8.0:3.8.999', when='@5.1.1-cp38,5.1.2-cp38', type=('build', 'run')) - depends_on('python@3.9.0:3.9.999', when='@5.1.2-cp39', type=('build', 'run')) + depends_on('python@3.5.0:3.5', when='@5.1.1-cp35', type=('build', 'run')) + depends_on('python@3.6.0:3.6', when='@5.1.1-cp36,5.1.2-cp36', type=('build', 'run')) + depends_on('python@3.7.0:3.7', when='@5.1.1-cp37,5.1.2-cp37', type=('build', 'run')) + depends_on('python@3.8.0:3.8', when='@5.1.1-cp38,5.1.2-cp38', type=('build', 'run')) + depends_on('python@3.9.0:3.9', when='@5.1.2-cp39', type=('build', 'run')) depends_on('itk@5.1.1', when='@5.1.1-cp35:5.1.1-cp39', type='run') depends_on('itk@5.1.2', when='@5.1.2-cp35:5.1.2-cp39', type='run') diff --git a/var/spack/repos/builtin/packages/py-javaproperties/package.py b/var/spack/repos/builtin/packages/py-javaproperties/package.py index d68bbd225a..22b6485937 100644 --- a/var/spack/repos/builtin/packages/py-javaproperties/package.py +++ b/var/spack/repos/builtin/packages/py-javaproperties/package.py @@ -13,6 +13,6 @@ class PyJavaproperties(PythonPackage): version('0.7.0', sha256='cf45b39fcbaeced1dfc0b7f2bda16e34fc0349116269e001dada42fd2e145d87') version('0.5.1', sha256='2b0237b054af4d24c74f54734b7d997ca040209a1820e96fb4a82625f7bd40cf') - depends_on('python@2.7:2.8,3.4:3.999', type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:3', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-six@1.4:1.999', type=('build', 'run')) + depends_on('py-six@1.4:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-jedi/package.py b/var/spack/repos/builtin/packages/py-jedi/package.py index 1c65e8e7d3..06c507d77c 100644 --- a/var/spack/repos/builtin/packages/py-jedi/package.py +++ b/var/spack/repos/builtin/packages/py-jedi/package.py @@ -44,5 +44,5 @@ class PyJedi(PythonPackage): 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.99', type=('build', 'run'), when='@0.17.2') - depends_on('py-parso@0.8.0:0.8.99', type=('build', 'run'), when='@0.18.0') + depends_on('py-parso@0.7.0:0.7', type=('build', 'run'), when='@0.17.2') + depends_on('py-parso@0.8.0:0.8', type=('build', 'run'), when='@0.18.0') diff --git a/var/spack/repos/builtin/packages/py-jsonpickle/package.py b/var/spack/repos/builtin/packages/py-jsonpickle/package.py index 858743b658..6bf9271360 100644 --- a/var/spack/repos/builtin/packages/py-jsonpickle/package.py +++ b/var/spack/repos/builtin/packages/py-jsonpickle/package.py @@ -15,4 +15,4 @@ class PyJsonpickle(PythonPackage): depends_on('python@2.7:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm@3.4.1:+toml', type='build') - depends_on("py-importlib-metadata", when="^python@:3.7.99", type=('build', 'run')) + depends_on("py-importlib-metadata", when="^python@:3.7", type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py index 812a72c9a0..0a5eb0e106 100644 --- a/var/spack/repos/builtin/packages/py-jsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -32,4 +32,4 @@ class PyJsonschema(PythonPackage): depends_on('py-pyrsistent@0.14.0:', when='@3:', type=('build', 'run')) depends_on('py-six@1.11.0:', when='@3:', type=('build', 'run')) - depends_on('py-importlib-metadata', when='@3.1.1: ^python@:3.7.99', type=('build', 'run')) + depends_on('py-importlib-metadata', when='@3.1.1: ^python@:3.7', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-jupyter-console/package.py b/var/spack/repos/builtin/packages/py-jupyter-console/package.py index 9bed10217d..f17eb084b4 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-console/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-console/package.py @@ -27,5 +27,5 @@ class PyJupyterConsole(PythonPackage): depends_on('py-ipython', type=('build', 'run')) depends_on('py-ipykernel', type=('build', 'run')) depends_on('py-pygments', type=('build', 'run')) - depends_on('py-prompt-toolkit@1.0.0:1.999', type=('build', 'run'), when='@:5') - depends_on('py-prompt-toolkit@2.0.0:2.999,3.0.2:3.0.999', type=('build', 'run'), when='@6:') + depends_on('py-prompt-toolkit@1.0.0:1', type=('build', 'run'), when='@:5') + depends_on('py-prompt-toolkit@2.0.0:2,3.0.2:3.0', type=('build', 'run'), when='@6:') diff --git a/var/spack/repos/builtin/packages/py-jupyter-server/package.py b/var/spack/repos/builtin/packages/py-jupyter-server/package.py index 3301cf8205..fb34dc71d3 100644 --- a/var/spack/repos/builtin/packages/py-jupyter-server/package.py +++ b/var/spack/repos/builtin/packages/py-jupyter-server/package.py @@ -31,6 +31,6 @@ class PyJupyterServer(PythonPackage): depends_on('py-send2trash', type=('build', 'run')) depends_on('py-terminado@0.8.3:', type=('build', 'run')) depends_on('py-prometheus-client', type=('build', 'run')) - depends_on('py-anyio@3.1.0:3.99', type=('build', 'run')) + depends_on('py-anyio@3.1.0:3', type=('build', 'run')) depends_on('py-websocket-client', type=('build', 'run')) depends_on('py-requests-unixsocket', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py index 0e6bbeddfe..816facd4f4 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-pygments/package.py @@ -13,4 +13,4 @@ class PyJupyterlabPygments(PythonPackage): version('0.1.1', sha256='19a0ccde7daddec638363cd3d60b63a4f6544c9181d65253317b2fb492a797b9') depends_on('py-setuptools', type='build') - depends_on('py-pygments@2.4.1:2.999', type=('build', 'run')) + depends_on('py-pygments@2.4.1:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py index 3252bfc45e..f1a0b1e0c9 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-server/package.py @@ -25,5 +25,5 @@ class PyJupyterlabServer(PythonPackage): depends_on('py-jinja2@2.10:', type=('build', 'run')) depends_on('py-babel', when='@2.5.1:', type=('build', 'run')) depends_on('py-packaging', when='@2.5.1:', type=('build', 'run')) - depends_on('py-jupyter-server@1.4:1.99', when='@2.5.1:', type=('build', 'run')) + depends_on('py-jupyter-server@1.4:1', when='@2.5.1:', type=('build', 'run')) depends_on('py-notebook@4.2.0:', when='@:2.5.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py index 4d85eb3659..ba0cfc11b2 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab-widgets/package.py @@ -16,5 +16,5 @@ class PyJupyterlabWidgets(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools@40.8.0:', type='build') - depends_on('py-jupyter-packaging@0.7.9:0.7.99', type='build') - depends_on('py-jupyterlab@3.0:3.99', type='build') + depends_on('py-jupyter-packaging@0.7.9:0.7', type='build') + depends_on('py-jupyterlab@3.0:3', type='build') diff --git a/var/spack/repos/builtin/packages/py-jupyterlab/package.py b/var/spack/repos/builtin/packages/py-jupyterlab/package.py index 9307e8914c..295bda2fc1 100644 --- a/var/spack/repos/builtin/packages/py-jupyterlab/package.py +++ b/var/spack/repos/builtin/packages/py-jupyterlab/package.py @@ -24,8 +24,8 @@ class PyJupyterlab(PythonPackage): depends_on('python@3.6:', when='@3:', type=('build', 'run')) depends_on('python@3.5:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-jupyter-packaging@0.9:1.999', when='@3.0.15:', type='build') - depends_on('py-jupyter-packaging@0.7.3:0.7.999', when='@3.0.0:3.0.14', type=('build', 'run')) + depends_on('py-jupyter-packaging@0.9:1', when='@3.0.15:', type='build') + depends_on('py-jupyter-packaging@0.7.3:0.7', when='@3.0.0:3.0.14', type=('build', 'run')) # dependency on py-jinja2@2.1 seems to be a migration issue from the switch # to setup.cfg in 3.0.15, leave it a 2.10 depends_on('py-jinja2@2.10:', type=('build', 'run')) @@ -35,17 +35,17 @@ class PyJupyterlab(PythonPackage): depends_on('py-packaging', when='@3:', type=('build', 'run')) depends_on('py-tornado@6.1:', when='@3:', type=('build', 'run')) depends_on('py-jupyter-core', when='@3:', type=('build', 'run')) - depends_on('py-jupyterlab-server@2.3:2.999', when='@3.0.9:', type=('build', 'run')) - depends_on('py-jupyterlab-server@2.0:2.999', when='@3.0.0:3.0.8', type=('build', 'run')) - depends_on('py-jupyter-server@1.4:1.999', when='@3.0.9:', type=('build', 'run')) - depends_on('py-jupyter-server@1.2:1.999', when='@3.0.3:3.0.8', type=('build', 'run')) - depends_on('py-jupyter-server@1.1:1.999', when='@3.0.0:3.0.2', type=('build', 'run')) - depends_on('py-nbclassic@0.2.0:0.999', when='@3:', type=('build', 'run')) + depends_on('py-jupyterlab-server@2.3:2', when='@3.0.9:', type=('build', 'run')) + depends_on('py-jupyterlab-server@2.0:2', when='@3.0.0:3.0.8', type=('build', 'run')) + depends_on('py-jupyter-server@1.4:1', when='@3.0.9:', type=('build', 'run')) + depends_on('py-jupyter-server@1.2:1', when='@3.0.3:3.0.8', type=('build', 'run')) + depends_on('py-jupyter-server@1.1:1', when='@3.0.0:3.0.2', type=('build', 'run')) + depends_on('py-nbclassic@0.2.0:0', when='@3:', type=('build', 'run')) # @:3 - depends_on('py-notebook@4.3.1:', when='@:2.99', type=('build', 'run')) - depends_on('py-tornado@:5,6.0.3:', when='@:2.99', type=('build', 'run')) - depends_on('py-jupyterlab-server@1.1.5:1.999', when='@:2.99', type=('build', 'run')) + depends_on('py-notebook@4.3.1:', when='@:2', type=('build', 'run')) + depends_on('py-tornado@:5,6.0.3:', when='@:2', type=('build', 'run')) + depends_on('py-jupyterlab-server@1.1.5:1', when='@:2', type=('build', 'run')) def setup_run_environment(self, env): env.set('JUPYTERLAB_DIR', self.prefix.share.jupyter.lab) diff --git a/var/spack/repos/builtin/packages/py-keystoneauth1/package.py b/var/spack/repos/builtin/packages/py-keystoneauth1/package.py index 2f1b4714ab..8d48321f22 100644 --- a/var/spack/repos/builtin/packages/py-keystoneauth1/package.py +++ b/var/spack/repos/builtin/packages/py-keystoneauth1/package.py @@ -21,7 +21,7 @@ class PyKeystoneauth1(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) - depends_on('py-pbr@2.0.0:2.0.999,2.1.1:', type='build') + depends_on('py-pbr@2.0.0:2.0,2.1.1:', type='build') depends_on('py-setuptools', type='build') depends_on('py-iso8601@0.1.11:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-kombu/package.py b/var/spack/repos/builtin/packages/py-kombu/package.py index 92d4ce9c86..17df166b02 100644 --- a/var/spack/repos/builtin/packages/py-kombu/package.py +++ b/var/spack/repos/builtin/packages/py-kombu/package.py @@ -20,7 +20,7 @@ class PyKombu(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-amqp@2.5.2:2.5.999', when="@:4.6.6", type=('build', 'run')) - depends_on('py-amqp@2.6.0:2.6.999', when="@4.6.7:4.999", type=('build', 'run')) - depends_on('py-amqp@5.0.0:5.999', when="@5.0.0:", type=('build', 'run')) + depends_on('py-amqp@2.5.2:2.5', when="@:4.6.6", type=('build', 'run')) + depends_on('py-amqp@2.6.0:2.6', when="@4.6.7:4", type=('build', 'run')) + depends_on('py-amqp@5.0.0:5', when="@5.0.0:", type=('build', 'run')) depends_on('py-importlib-metadata@0.18:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-labours/package.py b/var/spack/repos/builtin/packages/py-labours/package.py index df8af5bc30..814104cd10 100644 --- a/var/spack/repos/builtin/packages/py-labours/package.py +++ b/var/spack/repos/builtin/packages/py-labours/package.py @@ -15,17 +15,17 @@ class PyLabours(PythonPackage): build_directory = 'python' depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-matplotlib@2.0:3.999', type=('build', 'run')) - depends_on('py-numpy@1.12.0:1.999', type=('build', 'run')) - depends_on('py-pandas@0.20.0:0.999', type=('build', 'run')) - depends_on('py-pyyaml@3.0:5.999', type=('build', 'run')) + depends_on('py-matplotlib@2.0:3', type=('build', 'run')) + depends_on('py-numpy@1.12.0:1', type=('build', 'run')) + depends_on('py-pandas@0.20.0:0', type=('build', 'run')) + depends_on('py-pyyaml@3.0:5', type=('build', 'run')) depends_on('py-scipy@0.19.0:1.2.1', type=('build', 'run')) - depends_on('py-protobuf@3.5.0:3.999', type=('build', 'run')) - depends_on('py-munch@2.0:2.999', type=('build', 'run')) - depends_on('py-python-dateutil@2.6.0:2.999', type=('build', 'run')) - depends_on('py-tqdm@4.3:4.999', type=('build', 'run')) + depends_on('py-protobuf@3.5.0:3', type=('build', 'run')) + depends_on('py-munch@2.0:2', type=('build', 'run')) + depends_on('py-python-dateutil@2.6.0:2', type=('build', 'run')) + depends_on('py-tqdm@4.3:4', type=('build', 'run')) - depends_on('py-hdbscan@0.8.0:1.999', type=('build', 'run')) - depends_on('py-seriate@1.1.2:1.999', type=('build', 'run')) - depends_on('py-fastdtw@0.3.2:1.999', type=('build', 'run')) - depends_on('py-lifelines@0.20.0:1.999', type=('build', 'run')) + depends_on('py-hdbscan@0.8.0:1', type=('build', 'run')) + depends_on('py-seriate@1.1.2:1', type=('build', 'run')) + depends_on('py-fastdtw@0.3.2:1', type=('build', 'run')) + depends_on('py-lifelines@0.20.0:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-librosa/package.py b/var/spack/repos/builtin/packages/py-librosa/package.py index f579bd8c89..df105d6b1c 100644 --- a/var/spack/repos/builtin/packages/py-librosa/package.py +++ b/var/spack/repos/builtin/packages/py-librosa/package.py @@ -18,7 +18,7 @@ class PyLibrosa(PythonPackage): depends_on('py-audioread@2.0.0:', type=('build', 'run')) depends_on('py-numpy@1.15.0:', type=('build', 'run')) depends_on('py-scipy@1.0.0:', type=('build', 'run')) - depends_on('py-scikit-learn@0.14.0:0.18.999,0.19.1:', type=('build', 'run')) + depends_on('py-scikit-learn@0.14.0:0.18,0.19.1:', type=('build', 'run')) depends_on('py-joblib@0.12:', type=('build', 'run')) depends_on('py-decorator@3.0.0:', type=('build', 'run')) depends_on('py-six@1.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-lightgbm/package.py b/var/spack/repos/builtin/packages/py-lightgbm/package.py index 5bcef6498c..e5d1fd901d 100644 --- a/var/spack/repos/builtin/packages/py-lightgbm/package.py +++ b/var/spack/repos/builtin/packages/py-lightgbm/package.py @@ -21,7 +21,7 @@ class PyLightgbm(PythonPackage): depends_on('py-wheel', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) - depends_on('py-scikit-learn@:0.21.999,0.22.1:', type=('build', 'run')) + depends_on('py-scikit-learn@:0.21,0.22.1:', type=('build', 'run')) depends_on('cmake@3.8:', type='build') diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index b6736f9f39..be4acd5699 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -27,19 +27,19 @@ class PyLlvmlite(PythonPackage): depends_on('python@3.7:3.9', type=('build', 'run'), when='@0.37.0:') depends_on('python@3.6:', type=('build', 'run'), when='@0.33:') depends_on('python@2.6:2.8,3.4:', type=('build', 'run')) - depends_on('py-enum34', type=('build', 'run'), when='@:0.32.0 ^python@:3.3.99') + depends_on('py-enum34', type=('build', 'run'), when='@:0.32.0 ^python@:3.3') # llvmlite compatibility information taken from https://github.com/numba/llvmlite#compatibility - depends_on('llvm@11.0:11.99~flang', when='@0.37.0:') + depends_on('llvm@11.0:11~flang', when='@0.37.0:') for t in ['arm:', 'ppc:', 'ppc64:', 'ppc64le:', 'ppcle:', 'sparc:', 'sparc64:', 'x86:', 'x86_64:']: - depends_on('llvm@10.0:10.0.99~flang', when='@0.34.0:0.36.99 target={0}'.format(t)) - depends_on('llvm@9.0:9.0.99~flang', when='@0.34.0:0.36.99 target=aarch64:') - depends_on('llvm@9.0:9.0.99~flang', when='@0.33.0:0.33.99') - depends_on('llvm@7.0:8.0.99~flang', when='@0.29.0:0.32.99') - depends_on('llvm@7.0:7.0.99~flang', when='@0.27.0:0.28.99') - depends_on('llvm@6.0:6.0.99~flang', when='@0.23.0:0.26.99') - depends_on('llvm@4.0:4.0.99~flang', when='@0.17.0:0.20.99') + depends_on('llvm@10.0.0:10.0~flang', when='@0.34.0:0.36 target={0}'.format(t)) + depends_on('llvm@9.0.0:9.0~flang', when='@0.34.0:0.36 target=aarch64:') + depends_on('llvm@9.0.0:9.0~flang', when='@0.33.0:0.33') + depends_on('llvm@7.0.0:8.0~flang', when='@0.29.0:0.32') + depends_on('llvm@7.0.0:7.0~flang', when='@0.27.0:0.28') + depends_on('llvm@6.0.0:6.0~flang', when='@0.23.0:0.26') + depends_on('llvm@4.0.0:4.0~flang', when='@0.17.0:0.20') depends_on('binutils', type='build') def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/py-luigi/package.py b/var/spack/repos/builtin/packages/py-luigi/package.py index 849c2a0228..520a4653cf 100644 --- a/var/spack/repos/builtin/packages/py-luigi/package.py +++ b/var/spack/repos/builtin/packages/py-luigi/package.py @@ -23,14 +23,14 @@ class PyLuigi(PythonPackage): depends_on('py-setuptools', type='build') - depends_on('py-enum34@1.1.1:', when='^python@:3.3.999', type=('build', 'run')) + depends_on('py-enum34@1.1.1:', when='^python@:3.3', type=('build', 'run')) - depends_on('py-tornado@4.0:4.999', type=('build', 'run'), when='@:2.999') - depends_on('py-tornado@5.0:5.999', type=('build', 'run'), when='@3.0.1') - depends_on('py-tornado@5.0:6.999', type=('build', 'run'), when='@3.0.2:') + depends_on('py-tornado@4.0:4', type=('build', 'run'), when='@:2') + depends_on('py-tornado@5.0:5', type=('build', 'run'), when='@3.0.1') + depends_on('py-tornado@5.0:6', type=('build', 'run'), when='@3.0.2:') - depends_on('py-tenacity@6.3.0:6.999', type=('build', 'run'), when='@3.0.3:') + depends_on('py-tenacity@6.3.0:6', type=('build', 'run'), when='@3.0.3:') depends_on('py-python-daemon', type=('build', 'run')) - depends_on('py-python-dateutil@2.7.5:2.999', when='@2.8.3:', type=('build', 'run')) + depends_on('py-python-dateutil@2.7.5:2', when='@2.8.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-markdown2/package.py b/var/spack/repos/builtin/packages/py-markdown2/package.py index b3cf580238..b3159531c9 100644 --- a/var/spack/repos/builtin/packages/py-markdown2/package.py +++ b/var/spack/repos/builtin/packages/py-markdown2/package.py @@ -14,5 +14,5 @@ class PyMarkdown2(PythonPackage): version('2.4.0', sha256='28d769f0e544e6f68f684f01e9b186747b079a6927d9ca77ebc8c640a2829b1b') - depends_on('python@3.5:3.999', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 916b2fac63..ca3a5eac11 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -108,10 +108,10 @@ class PyMatplotlib(PythonPackage): depends_on('py-python-dateutil@2.7:', when='@3.4:', type=('build', 'run')) depends_on('py-pytz', type=('build', 'run'), when='@:2') depends_on('py-subprocess32', type=('build', 'run'), when='^python@:2.7') - depends_on('py-functools32', type=('build', 'run'), when='@:2.0.999 ^python@:2.7') + depends_on('py-functools32', type=('build', 'run'), when='@:2.0 ^python@:2.7') depends_on('py-backports-functools-lru-cache', type=('build', 'run'), - when='@2.1.0:2.999.999 ^python@:2') - depends_on('py-six@1.10.0:', type=('build', 'run'), when='@2.0:2.999') + when='@2.1.0:2 ^python@:2') + depends_on('py-six@1.10.0:', type=('build', 'run'), when='@2.0:2') depends_on('py-six@1.9.0:', type=('build', 'run'), when='@:1') # Optional backend dependencies @@ -149,7 +149,7 @@ class PyMatplotlib(PythonPackage): # https://matplotlib.org/devel/testing.html#requirements depends_on('py-pytest@3.6:', type='test') depends_on('ghostscript@9.0:', type='test') - # depends_on('inkscape@:0.999', type='test') + # depends_on('inkscape@:0', type='test') msg = 'MacOSX backend requires the Cocoa headers included with XCode' conflicts('platform=linux', when='backend=macosx', msg=msg) diff --git a/var/spack/repos/builtin/packages/py-mechanize/package.py b/var/spack/repos/builtin/packages/py-mechanize/package.py index a85bdf4ccf..544cd7ab1f 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@0.9999999999:', type=('build', 'run')) + depends_on('py-html5lib@099999:', type=('build', 'run')) depends_on('python@2.7:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-merlin/package.py b/var/spack/repos/builtin/packages/py-merlin/package.py index 645603b23a..8be5caae28 100644 --- a/var/spack/repos/builtin/packages/py-merlin/package.py +++ b/var/spack/repos/builtin/packages/py-merlin/package.py @@ -24,12 +24,12 @@ class PyMerlin(PythonPackage): depends_on('py-setuptools', type=('build', 'run')) depends_on('py-cached-property', type=('build', 'run')) depends_on('py-celery@5.0.0+redis+sqlalchemy', when="@1.7.5:", type=('build', 'run')) - depends_on('py-celery@4.3.0:4.999+redis+sqlalchemy', when="@:1.7.4", type=('build', 'run')) + depends_on('py-celery@4.3.0:4+redis+sqlalchemy', when="@:1.7.4", type=('build', 'run')) depends_on('py-coloredlogs@10.0:', type=('build', 'run')) depends_on('py-cryptography', type=('build', 'run')) - depends_on('py-importlib-resources', when="^python@3.0:3.6.99", type=('build', 'run')) + depends_on('py-importlib-resources', when="^python@3.0:3.6", type=('build', 'run')) depends_on('py-maestrowf@1.1.7dev0', when="@1.2.0:", type=('build', 'run')) - depends_on('py-maestrowf@1.1.6:', when="@:1.1.99", type=('build', 'run')) + depends_on('py-maestrowf@1.1.6:', when="@:1.1", type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-parse', type=('build', 'run')) depends_on('py-psutil@5.1.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-metpy/package.py b/var/spack/repos/builtin/packages/py-metpy/package.py index b60b08fe9c..7b8876b4e3 100644 --- a/var/spack/repos/builtin/packages/py-metpy/package.py +++ b/var/spack/repos/builtin/packages/py-metpy/package.py @@ -25,8 +25,8 @@ class PyMetpy(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm', type='build') - depends_on('py-importlib-metadata@1.0.0:', when='^python@:3.7.999', type=('build', 'run')) - depends_on('py-importlib-resources@1.3.0:', when='^python@:3.8.999', type=('build', 'run')) + depends_on('py-importlib-metadata@1.0.0:', when='^python@:3.7', type=('build', 'run')) + depends_on('py-importlib-resources@1.3.0:', when='^python@:3.8', type=('build', 'run')) depends_on('py-matplotlib@2.1.0:', type=('build', 'run')) depends_on('py-numpy@1.16.0:', type=('build', 'run')) depends_on('py-pandas@0.22.0:', when='@1.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-more-itertools/package.py b/var/spack/repos/builtin/packages/py-more-itertools/package.py index d96651f47a..2a9a49975a 100644 --- a/var/spack/repos/builtin/packages/py-more-itertools/package.py +++ b/var/spack/repos/builtin/packages/py-more-itertools/package.py @@ -24,4 +24,4 @@ class PyMoreItertools(PythonPackage): depends_on('python@2.7:2.8,3.2:', when='@2.3:', type=('build', 'run')) depends_on('python@2.6:2.8,3.2:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-six@1.0.0:1.999', when='@:5', type=('build', 'run')) + depends_on('py-six@1.0.0:1', when='@:5', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-motmetrics/package.py b/var/spack/repos/builtin/packages/py-motmetrics/package.py index 73dc3d7ba6..93ea3b6e56 100644 --- a/var/spack/repos/builtin/packages/py-motmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-motmetrics/package.py @@ -18,7 +18,7 @@ class PyMotmetrics(PythonPackage): depends_on('py-pandas@0.23.1:', type=('build', 'run')) depends_on('py-scipy@0.19.0:', type=('build', 'run')) depends_on('py-xmltodict@0.12.0:', type=('build', 'run')) - depends_on('py-enum34', when='^python@:2.999', type=('build', 'run')) + depends_on('py-enum34', when='^python@:2', type=('build', 'run')) depends_on('py-flake8', type=('build', 'run')) depends_on('py-flake8-import-order', type=('build', 'run')) depends_on('py-pytest', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-moviepy/package.py b/var/spack/repos/builtin/packages/py-moviepy/package.py index 5746a6a5d1..fb7de98916 100644 --- a/var/spack/repos/builtin/packages/py-moviepy/package.py +++ b/var/spack/repos/builtin/packages/py-moviepy/package.py @@ -21,11 +21,11 @@ class PyMoviepy(PythonPackage): version('1.0.1', sha256='9d5b0a0e884c0eb92c431baa110e560059720aab15d2ef3e4cba3892c34cf1ed') depends_on('py-setuptools', type='build') - depends_on('py-decorator@4.0.2:4.9999', type=('build', 'run')) - depends_on('py-imageio@2.5:2.9999', when='^python@3.4:', type=('build', 'run')) - depends_on('py-imageio@2.0:2.4.9999', when='^python@:3.3.9999', type=('build', 'run')) + depends_on('py-decorator@4.0.2:4', type=('build', 'run')) + depends_on('py-imageio@2.5:2', when='^python@3.4:', type=('build', 'run')) + depends_on('py-imageio@2.0:2.4', when='^python@:3.3', type=('build', 'run')) depends_on('py-imageio-ffmpeg@0.2.0:', when='^python@3.4:', type=('build', 'run')) - depends_on('py-tqdm@4.11.2:4.9999', type=('build', 'run')) + depends_on('py-tqdm@4.11.2:4', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) - depends_on('py-requests@2.8.1:2.99999', type=('build', 'run')) + depends_on('py-requests@2.8.1:2', type=('build', 'run')) depends_on('py-proglog@:1.0.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-mpi4py/package.py b/var/spack/repos/builtin/packages/py-mpi4py/package.py index 154669a671..d08dad163c 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -22,7 +22,7 @@ class PyMpi4py(PythonPackage): version('2.0.0', sha256='6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81') version('1.3.1', sha256='e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507') - depends_on('python@2.6:2.7.99,3.2:') + depends_on('python@2.6:2.7,3.2:') depends_on('py-setuptools', type='build') depends_on('mpi') depends_on('py-cython@0.22.0:', when='@develop', type='build') diff --git a/var/spack/repos/builtin/packages/py-msal-extensions/package.py b/var/spack/repos/builtin/packages/py-msal-extensions/package.py index 5c657ddcea..e8c7855c1b 100644 --- a/var/spack/repos/builtin/packages/py-msal-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-msal-extensions/package.py @@ -17,6 +17,6 @@ class PyMsalExtensions(PythonPackage): version('0.1.3', sha256='59e171a9a4baacdbf001c66915efeaef372fb424421f1a4397115a3ddd6205dc') depends_on('py-setuptools', type='build') - depends_on('py-msal@0.4.1:1.999', type=('build', 'run')) - depends_on('py-portalocker@1.0:1.999', type=('build', 'run')) + depends_on('py-msal@0.4.1:1', type=('build', 'run')) + depends_on('py-portalocker@1.0:1', type=('build', 'run')) depends_on('py-pathlib2', when='@0.2:^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-msal/package.py b/var/spack/repos/builtin/packages/py-msal/package.py index f71ecfff9c..3a1c98adcc 100644 --- a/var/spack/repos/builtin/packages/py-msal/package.py +++ b/var/spack/repos/builtin/packages/py-msal/package.py @@ -17,5 +17,5 @@ class PyMsal(PythonPackage): version('1.0.0', sha256='ecbe3f5ac77facad16abf08eb9d8562af3bc7184be5d4d90c9ef4db5bde26340') depends_on('py-setuptools', type='build') - depends_on('py-requests@2.0.0:2.999', type=('build', 'run')) - depends_on('py-pyjwt@1.0.0:1.999+crypto', type=('build', 'run')) + depends_on('py-requests@2.0.0:2', type=('build', 'run')) + depends_on('py-pyjwt@1.0.0:1+crypto', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-msrest/package.py b/var/spack/repos/builtin/packages/py-msrest/package.py index 27b6171661..57160cff65 100644 --- a/var/spack/repos/builtin/packages/py-msrest/package.py +++ b/var/spack/repos/builtin/packages/py-msrest/package.py @@ -13,7 +13,7 @@ class PyMsrest(PythonPackage): version('0.6.16', sha256='214c5be98954cb45feb6a6a858a7ae6d41a664e80294b65db225bbaa33d9ca3c') depends_on('py-setuptools', type='build') - depends_on('py-requests@2.16:2.999', type=('build', 'run')) + depends_on('py-requests@2.16:2', type=('build', 'run')) depends_on('py-requests-oauthlib@0.5.0:', type=('build', 'run')) depends_on('py-isodate@0.6.0:', type=('build', 'run')) depends_on('py-certifi@2017.4.17:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-msrestazure/package.py b/var/spack/repos/builtin/packages/py-msrestazure/package.py index 2ab33f4bf7..0a9210cb7f 100644 --- a/var/spack/repos/builtin/packages/py-msrestazure/package.py +++ b/var/spack/repos/builtin/packages/py-msrestazure/package.py @@ -14,5 +14,5 @@ class PyMsrestazure(PythonPackage): version('0.6.3', sha256='0ec9db93eeea6a6cf1240624a04f49cd8bbb26b98d84a63a8220cfda858c2a96') depends_on('py-setuptools', type='build') - depends_on('py-msrest@0.6.0:1.999', type=('build', 'run')) - depends_on('py-adal@0.6.0:1.999', type=('build', 'run')) + depends_on('py-msrest@0.6.0:1', type=('build', 'run')) + depends_on('py-adal@0.6.0:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-murmurhash/package.py b/var/spack/repos/builtin/packages/py-murmurhash/package.py index a21cabd104..ee424f093b 100644 --- a/var/spack/repos/builtin/packages/py-murmurhash/package.py +++ b/var/spack/repos/builtin/packages/py-murmurhash/package.py @@ -13,4 +13,4 @@ class PyMurmurhash(PythonPackage): version('1.0.2', sha256='c7a646f6b07b033642b4f52ae2e45efd8b80780b3b90e8092a0cec935fbf81e2') depends_on('py-setuptools', type='build') - depends_on('py-wheel@0.32.0:0.32.999', type='build') + depends_on('py-wheel@0.32.0:0.32', type='build') diff --git a/var/spack/repos/builtin/packages/py-mutagen/package.py b/var/spack/repos/builtin/packages/py-mutagen/package.py index 3befa29a16..9a4c7b4ba8 100644 --- a/var/spack/repos/builtin/packages/py-mutagen/package.py +++ b/var/spack/repos/builtin/packages/py-mutagen/package.py @@ -14,5 +14,5 @@ class PyMutagen(PythonPackage): version('1.45.1', sha256='6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1') - depends_on('python@3.5:3.99', type=('build', 'run')) + depends_on('python@3.5:3', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-mypy/package.py b/var/spack/repos/builtin/packages/py-mypy/package.py index 1725986b4f..f3558a9fcc 100644 --- a/var/spack/repos/builtin/packages/py-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-mypy/package.py @@ -21,7 +21,7 @@ class PyMypy(PythonPackage): depends_on("python@3.5:", type=("build", "run")) depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-typed-ast@1.4.0:1.4.999', type=('build', 'run')) + depends_on('py-typed-ast@1.4.0:1.4', type=('build', 'run')) depends_on('py-typing-extensions@3.7.4:', type=('build', 'run')) - depends_on('py-mypy-extensions@0.4.3:0.4.999', type=('build', 'run')) + depends_on('py-mypy-extensions@0.4.3:0.4', type=('build', 'run')) depends_on('py-toml', when='@0.900:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-nbclassic/package.py b/var/spack/repos/builtin/packages/py-nbclassic/package.py index ab98af4ddf..40fc0b6e0f 100644 --- a/var/spack/repos/builtin/packages/py-nbclassic/package.py +++ b/var/spack/repos/builtin/packages/py-nbclassic/package.py @@ -16,5 +16,5 @@ class PyNbclassic(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-jupyter-server@1.8:1.999', type=('build', 'run')) - depends_on('py-notebook@:6.999', type=('build', 'run')) + depends_on('py-jupyter-server@1.8:1', type=('build', 'run')) + depends_on('py-notebook@:6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-nbconvert/package.py b/var/spack/repos/builtin/packages/py-nbconvert/package.py index f75cf1d1cb..47dc2dabd3 100644 --- a/var/spack/repos/builtin/packages/py-nbconvert/package.py +++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py @@ -24,7 +24,7 @@ class PyNbconvert(PythonPackage): depends_on('python@3.6:', type=('build', 'run'), when='@6:') depends_on('py-setuptools', type=('build', 'run'), when='@5:') depends_on('py-pycurl', type='build', when='^python@:2.7.8') - depends_on('py-mistune@0.8.1:1.999', type=('build', 'run')) + depends_on('py-mistune@0.8.1:1', type=('build', 'run')) depends_on('py-jinja2', type=('build', 'run')) depends_on('py-jinja2@2.4:', type=('build', 'run'), when='@5:') depends_on('py-pygments', type=('build', 'run')) @@ -41,7 +41,7 @@ class PyNbconvert(PythonPackage): depends_on('py-pandocfilters@1.4.1:', type=('build', 'run'), when='@5:') depends_on('py-testpath', type=('build', 'run'), when='@5:') depends_on('py-defusedxml', type=('build', 'run'), when='@5:') - depends_on('py-nbclient@0.5.0:0.5.999', type=('build', 'run'), when='@6:') + depends_on('py-nbclient@0.5.0:0.5', type=('build', 'run'), when='@6:') depends_on('py-tornado@4.0:', type=('build', 'run'), when='+serve') def patch(self): diff --git a/var/spack/repos/builtin/packages/py-nbformat/package.py b/var/spack/repos/builtin/packages/py-nbformat/package.py index 9ee100e72a..d93ed934b1 100644 --- a/var/spack/repos/builtin/packages/py-nbformat/package.py +++ b/var/spack/repos/builtin/packages/py-nbformat/package.py @@ -21,5 +21,5 @@ class PyNbformat(PythonPackage): depends_on('python@2.7:2.8,3.3:', when='@:4', type=('build', 'run')) depends_on('py-ipython-genutils', type=('build', 'run')) depends_on('py-traitlets@4.1:', type=('build', 'run')) - depends_on('py-jsonschema@2.4.0:2.4.999,2.5.1:', type=('build', 'run')) + depends_on('py-jsonschema@2.4.0:2.4,2.5.1:', type=('build', 'run')) depends_on('py-jupyter-core', 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 77166847c2..1b2c940a39 100644 --- a/var/spack/repos/builtin/packages/py-nbmake/package.py +++ b/var/spack/repos/builtin/packages/py-nbmake/package.py @@ -14,12 +14,12 @@ class PyNbmake(PythonPackage): version('0.5', sha256='da9bf1bbc377c9d1d697f99952834017c39b4983e7e482a038dec705955a8ae9') - depends_on('python@3.6.1:3.999', type=('build', 'run')) + depends_on('python@3.6.1:3', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-pygments@2.7.3:2.999', type=('build', 'run')) - 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', 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')) + depends_on('py-pygments@2.7.3:2', type=('build', 'run')) + depends_on('py-ipykernel@5.4.0:5', type=('build', 'run')) + depends_on('py-nbclient@0.3:0', type=('build', 'run')) + depends_on('py-nbformat@5.0.8:5', type=('build', 'run')) + depends_on('py-pathlib@1.0.1:1', when='^python@:3.3', type=('build', 'run')) + depends_on('py-pydantic@1.7.2:1', type=('build', 'run')) + depends_on('py-pytest@6.1.2:6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-networkx/package.py b/var/spack/repos/builtin/packages/py-networkx/package.py index e76b355a5e..1f5e13f1db 100644 --- a/var/spack/repos/builtin/packages/py-networkx/package.py +++ b/var/spack/repos/builtin/packages/py-networkx/package.py @@ -29,7 +29,7 @@ class PyNetworkx(PythonPackage): depends_on('py-decorator@3.4.0:', type=('build', 'run')) depends_on('py-decorator@4.1.0:', type=('build', 'run'), when='@2.0:') depends_on('py-decorator@4.3.0:', type=('build', 'run'), when='@2.2:') - depends_on('py-decorator@4.3.0:4.999', type=('build', 'run'), when='@2.5.1:') + depends_on('py-decorator@4.3.0:4', type=('build', 'run'), when='@2.5.1:') def url_for_version(self, version): ext = 'tar.gz' diff --git a/var/spack/repos/builtin/packages/py-nipype/package.py b/var/spack/repos/builtin/packages/py-nipype/package.py index 2b96768487..43dc16a987 100644 --- a/var/spack/repos/builtin/packages/py-nipype/package.py +++ b/var/spack/repos/builtin/packages/py-nipype/package.py @@ -21,7 +21,7 @@ class PyNipype(PythonPackage): depends_on('py-click@6.6.0:', type=('build', 'run')) depends_on('py-networkx@2.0:', type=('build', 'run')) depends_on('py-nibabel@2.1.0:', type=('build', 'run')) - depends_on('py-numpy@1.13:', type=('build', 'run'), when='^python@:3.6.999') + depends_on('py-numpy@1.13:', type=('build', 'run'), when='^python@:3.6') depends_on('py-numpy@1.15.3:', type=('build', 'run'), when='^python@3.7:') depends_on('py-packaging', type=('build', 'run')) depends_on('py-prov@1.5.2:', type=('build', 'run')) @@ -30,6 +30,6 @@ class PyNipype(PythonPackage): depends_on('py-rdflib@5.0.0:', type=('build', 'run')) depends_on('py-scipy@0.14:', type=('build', 'run')) depends_on('py-simplejson@3.8.0:', type=('build', 'run')) - depends_on('py-traits@4.6:4.99,5.1:', type=('build', 'run')) + depends_on('py-traits@4.6:4,5.1:', type=('build', 'run')) depends_on('py-filelock@3.0.0:', type=('build', 'run')) depends_on('py-etelemetry@0.2.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-nose2/package.py b/var/spack/repos/builtin/packages/py-nose2/package.py index 287bfee0de..188f859f8c 100644 --- a/var/spack/repos/builtin/packages/py-nose2/package.py +++ b/var/spack/repos/builtin/packages/py-nose2/package.py @@ -19,4 +19,4 @@ class PyNose2(PythonPackage): depends_on('py-six@1.7:', type=('build', 'run')) depends_on('py-cov-core@1.12:', type=('build', 'run'), when='@0.6.0:0.6.5') depends_on('py-coverage@4.4.1:', type=('build', 'run'), when='@0.7.0:') - depends_on('py-mock@2.0.0:', type=('build', 'run'), when='^python@2.7:3.5.99') + depends_on('py-mock@2.0.0:', type=('build', 'run'), when='^python@2.7:3.5') diff --git a/var/spack/repos/builtin/packages/py-notebook/package.py b/var/spack/repos/builtin/packages/py-notebook/package.py index 0bbbcbc70e..1cfbfa496f 100644 --- a/var/spack/repos/builtin/packages/py-notebook/package.py +++ b/var/spack/repos/builtin/packages/py-notebook/package.py @@ -35,8 +35,8 @@ class PyNotebook(PythonPackage): depends_on('python@3.5:', type=('build', 'run'), when='@6:') depends_on('py-setuptools', type=('build', 'run'), when='@5:') depends_on('py-jinja2', type=('build', 'run')) - depends_on('py-tornado@4.0:6.999', type=('build', 'run'), when='@:5.7.4') - depends_on('py-tornado@4.1:6.999', type=('build', 'run'), when='@5.7.5:5.999') + depends_on('py-tornado@4.0:6', type=('build', 'run'), when='@:5.7.4') + depends_on('py-tornado@4.1:6', type=('build', 'run'), when='@5.7.5:5') depends_on('py-tornado@5.0:', type=('build', 'run'), when='@6:') depends_on('py-pyzmq@17:', type=('build', 'run'), when='@6:') depends_on('py-argon2-cffi', type=('build', 'run'), when='@6.1:') @@ -48,7 +48,7 @@ class PyNotebook(PythonPackage): depends_on('py-jupyter-core@4.6.0:', type=('build', 'run'), when='@6.0.2') depends_on('py-jupyter-core@4.6.1:', type=('build', 'run'), when='@6.0.3:') depends_on('py-jupyter-client', type=('build', 'run')) - depends_on('py-jupyter-client@5.2.0:', type=('build', 'run'), when='@5.7.0:5.999') + depends_on('py-jupyter-client@5.2.0:', type=('build', 'run'), when='@5.7.0:5') depends_on('py-jupyter-client@5.3.1:', type=('build', 'run'), when='@6.0.0:6.0.1') depends_on('py-jupyter-client@5.3.4:', type=('build', 'run'), when='@6.0.2:') depends_on('py-nbformat', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ntlm-auth/package.py b/var/spack/repos/builtin/packages/py-ntlm-auth/package.py index 46c3245ec9..a139dbefe6 100644 --- a/var/spack/repos/builtin/packages/py-ntlm-auth/package.py +++ b/var/spack/repos/builtin/packages/py-ntlm-auth/package.py @@ -16,4 +16,4 @@ class PyNtlmAuth(PythonPackage): depends_on('python@2.6:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-ordereddict', type=('build', 'run'), when='^python@:2.6.999') + depends_on('py-ordereddict', type=('build', 'run'), when='^python@:2.6') diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index b50274179b..38eaeac07c 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -19,13 +19,13 @@ class PyNumba(PythonPackage): version('0.40.1', sha256='52d046c13bcf0de79dbfb936874b7228f141b9b8e3447cc35855e9ad3e12aa33') version('0.35.0', sha256='11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3') - depends_on('python@3.7:3.9.999', type=('build', 'run'), when='@0.54.0:') + depends_on('python@3.7:3.9', type=('build', 'run'), when='@0.54.0:') depends_on('python@3.6:', type=('build', 'run'), when='@0.48.0:') - depends_on('python@3.3:3.7.9999', type=('build', 'run'), when='@0.40.1:0.47.999') - depends_on('python@3.3:3.6.9999', type=('build', 'run'), when='@:0.35.0') + depends_on('python@3.3:3.7', type=('build', 'run'), when='@0.40.1:0.47') + depends_on('python@3.3:3.6', type=('build', 'run'), when='@:0.35.0') depends_on('py-numpy@1.17:1.20', type=('build', 'run'), when='@0.54.0:') depends_on('py-numpy@1.15:', type=('build', 'run'), when='@0.48.0:') - depends_on('py-numpy@1.10:1.99', type=('build', 'run')) + depends_on('py-numpy@1.10:1', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) # Note: As of 1 Nov 2018, 0.25 was the latest version of py-llvmlite. @@ -33,16 +33,16 @@ class PyNumba(PythonPackage): # calls. If newer versions maintain backwards compatibility, the calls # can be updated accordingly. depends_on('py-llvmlite@0.37.0:0.37.9', type=('build', 'run'), when='@0.54.0') - depends_on('py-llvmlite@0.34.0:0.34.999', type=('build', 'run'), when='@0.51.1') - depends_on('py-llvmlite@0.33.0:0.33.999', type=('build', 'run'), when='@0.50.1') - depends_on('py-llvmlite@0.31.0:0.31.999', type=('build', 'run'), when='@0.48.0') + depends_on('py-llvmlite@0.34.0:0.34', type=('build', 'run'), when='@0.51.1') + depends_on('py-llvmlite@0.33.0:0.33', type=('build', 'run'), when='@0.50.1') + depends_on('py-llvmlite@0.31.0:0.31', type=('build', 'run'), when='@0.48.0') depends_on('py-llvmlite@0.25.0:', type=('build', 'run'), when='@0.40.1') depends_on('py-llvmlite@0.20:0.25', type=('build', 'run'), when='@0.35.1') depends_on('py-argparse', type=('build', 'run'), when='^python@:2.6') - depends_on('py-funcsigs', type=('build', 'run'), when='@:0.47 ^python@:3.2.99') - depends_on('py-enum34', type=('build', 'run'), when='@:0.47 ^python@:3.3.99') - depends_on('py-singledispatch', type=('build', 'run'), when='@:0.47 ^python@:3.3.99') + depends_on('py-funcsigs', type=('build', 'run'), when='@:0.47 ^python@:3.2') + depends_on('py-enum34', type=('build', 'run'), when='@:0.47 ^python@:3.3') + depends_on('py-singledispatch', type=('build', 'run'), when='@:0.47 ^python@:3.3') # Version 6.0.0 of llvm had a hidden symbol which breaks numba at runtime. # See https://reviews.llvm.org/D44140 diff --git a/var/spack/repos/builtin/packages/py-numcodecs/package.py b/var/spack/repos/builtin/packages/py-numcodecs/package.py index 3a788b981c..ce9b83ba4e 100644 --- a/var/spack/repos/builtin/packages/py-numcodecs/package.py +++ b/var/spack/repos/builtin/packages/py-numcodecs/package.py @@ -26,8 +26,8 @@ class PyNumcodecs(PythonPackage): variant('msgpack', default=False, description='Codec to encode data as msgpacked bytes.') - depends_on('python@3.6:3.999', when='@0.7:', type=('build', 'link', 'run')) - depends_on('python@2.7:2.8,3.5:', when='@:0.6.999', type=('build', 'link', 'run')) + depends_on('python@3.6:3', when='@0.7:', type=('build', 'link', 'run')) + depends_on('python@2.7:2.8,3.5:', when='@:0.6', type=('build', 'link', 'run')) depends_on('py-setuptools@18.1:', type='build') depends_on('py-setuptools-scm@1.5.5:', type='build') depends_on('py-cython', type='build') diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 4dfac98a8a..559ff5c24a 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -129,7 +129,7 @@ class PyNumpy(PythonPackage): conflicts('%gcc@:4.7', msg='GCC 4.8+ required') # NVHPC support added in https://github.com/numpy/numpy/pull/17344 - conflicts('%nvhpc', when='@:1.19.999') + conflicts('%nvhpc', when='@:1.19') def flag_handler(self, name, flags): # -std=c99 at least required, old versions of GCC default to -std=c90 diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py index 86355dd317..904b392a99 100644 --- a/var/spack/repos/builtin/packages/py-onnx/package.py +++ b/var/spack/repos/builtin/packages/py-onnx/package.py @@ -27,7 +27,7 @@ class PyOnnx(PythonPackage): depends_on('py-protobuf+cpp', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-six', type=('build', 'run')) - depends_on('py-typing@3.6.4:', when='^python@:3.4.999', type=('build', 'run')) + depends_on('py-typing@3.6.4:', when='^python@:3.4', type=('build', 'run')) depends_on('py-typing-extensions@3.6.4:', type=('build', 'run')) depends_on('cmake@3.1:', type='build') diff --git a/var/spack/repos/builtin/packages/py-opencensus-context/package.py b/var/spack/repos/builtin/packages/py-opencensus-context/package.py index 5e8a66c622..00ab68d342 100644 --- a/var/spack/repos/builtin/packages/py-opencensus-context/package.py +++ b/var/spack/repos/builtin/packages/py-opencensus-context/package.py @@ -14,7 +14,7 @@ class PyOpencensusContext(Package): extends('python') depends_on('py-pip', type='build') - depends_on('py-contextvars', when='^python@3.6.0:3.6.999', type=('build', 'run')) + depends_on('py-contextvars', when='^python@3.6.0:3.6', type=('build', 'run')) def install(self, spec, prefix): pip = which('pip') diff --git a/var/spack/repos/builtin/packages/py-opencensus/package.py b/var/spack/repos/builtin/packages/py-opencensus/package.py index 76643d9fc1..1f6ea56991 100644 --- a/var/spack/repos/builtin/packages/py-opencensus/package.py +++ b/var/spack/repos/builtin/packages/py-opencensus/package.py @@ -14,4 +14,4 @@ class PyOpencensus(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-opencensus-context@0.1.1', type=('build', 'run')) - depends_on('py-google-api-core@1.0:1.999', type=('build', 'run')) + depends_on('py-google-api-core@1.0:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-os-service-types/package.py b/var/spack/repos/builtin/packages/py-os-service-types/package.py index 7f405ce383..f020c1a7fd 100644 --- a/var/spack/repos/builtin/packages/py-os-service-types/package.py +++ b/var/spack/repos/builtin/packages/py-os-service-types/package.py @@ -17,5 +17,5 @@ class PyOsServiceTypes(PythonPackage): version('1.7.0', sha256='31800299a82239363995b91f1ebf9106ac7758542a1e4ef6dc737a5932878c6c') depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) - depends_on('py-pbr@2.0.0:2.0.999,2.1.1:', type='build') + depends_on('py-pbr@2.0.0:2.0,2.1.1:', type='build') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-oslo-i18n/package.py b/var/spack/repos/builtin/packages/py-oslo-i18n/package.py index 1b0196095c..99f301ad29 100644 --- a/var/spack/repos/builtin/packages/py-oslo-i18n/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-i18n/package.py @@ -22,6 +22,6 @@ class PyOsloI18n(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-pbr@2.0.0:2.0.999,2.1.1:', type=('build', 'run')) + depends_on('py-pbr@2.0.0:2.0,2.1.1:', type=('build', 'run')) depends_on('py-six@1.10.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-oslo-serialization/package.py b/var/spack/repos/builtin/packages/py-oslo-serialization/package.py index 438c40ff61..9255393d86 100644 --- a/var/spack/repos/builtin/packages/py-oslo-serialization/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-serialization/package.py @@ -21,7 +21,7 @@ class PyOsloSerialization(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-pbr@2.0.0:2.0.999,2.1.1:', type='build') + depends_on('py-pbr@2.0.0:2.0,2.1.1:', type='build') depends_on('py-msgpack@0.5.2:', type=('build', 'run')) depends_on('py-oslo-utils@3.33.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-oslo-utils/package.py b/var/spack/repos/builtin/packages/py-oslo-utils/package.py index adf936142a..483f0b708e 100644 --- a/var/spack/repos/builtin/packages/py-oslo-utils/package.py +++ b/var/spack/repos/builtin/packages/py-oslo-utils/package.py @@ -22,7 +22,7 @@ class PyOsloUtils(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-pbr@2.0.0:2.0.999,2.1.1:', type='build') + depends_on('py-pbr@2.0.0:2.0,2.1.1:', type='build') depends_on('py-iso8601@0.1.11:', type=('build', 'run')) depends_on('py-oslo-i18n@3.15.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-packaging/package.py b/var/spack/repos/builtin/packages/py-packaging/package.py index 4b07829a30..37ad3aadca 100644 --- a/var/spack/repos/builtin/packages/py-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-packaging/package.py @@ -26,5 +26,5 @@ class PyPackaging(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-pyparsing@2.0.2:', type=('build', 'run')) - depends_on('py-six', type=('build', 'run'), when='@:20.7.99') + depends_on('py-six', type=('build', 'run'), when='@:20.7') depends_on('py-attrs', type=('build', 'run'), when='@19.1') diff --git a/var/spack/repos/builtin/packages/py-peachpy/package.py b/var/spack/repos/builtin/packages/py-peachpy/package.py index 7ff0e52b44..2e613bff63 100644 --- a/var/spack/repos/builtin/packages/py-peachpy/package.py +++ b/var/spack/repos/builtin/packages/py-peachpy/package.py @@ -17,4 +17,4 @@ class PyPeachpy(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-opcodes@0.3.13:', type='build') depends_on('py-six', type=('build', 'run')) - depends_on('py-enum34', when='^python@:3.3.999', type=('build', 'run')) + depends_on('py-enum34', when='^python@:3.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pep8-naming/package.py b/var/spack/repos/builtin/packages/py-pep8-naming/package.py index ba90bad4f1..111025cdf9 100644 --- a/var/spack/repos/builtin/packages/py-pep8-naming/package.py +++ b/var/spack/repos/builtin/packages/py-pep8-naming/package.py @@ -16,4 +16,4 @@ class PyPep8Naming(PythonPackage): version('0.7.0', sha256='624258e0dd06ef32a9daf3c36cc925ff7314da7233209c5b01f7e5cdd3c34826') depends_on('py-setuptools', type='build') - depends_on('py-flake8-polyfill@1.0.2:1.999', type=('build', 'run')) + depends_on('py-flake8-polyfill@1.0.2:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 5ac3aaef9b..27444d5c4a 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -51,19 +51,19 @@ class PyPetsc4py(PythonPackage): depends_on('petsc+mpi', when='+mpi') depends_on('petsc~mpi', when='~mpi') depends_on('petsc@main', when='@main') - depends_on('petsc@3.16.0:3.16.99', when='@3.16.0:3.16.99') - depends_on('petsc@3.15.0:3.15.99', when='@3.15.0:3.15.99') - depends_on('petsc@3.14.2:3.14.99', when='@3.14.1:3.14.99') + depends_on('petsc@3.16.0:3.16', when='@3.16.0:3.16') + depends_on('petsc@3.15.0:3.15', when='@3.15.0:3.15') + depends_on('petsc@3.14.2:3.14', when='@3.14.1:3.14') depends_on('petsc@3.14.0:3.14.1', when='@3.14.0') - depends_on('petsc@3.13:3.13.99', when='@3.13:3.13.99') - depends_on('petsc@3.12:3.12.99', when='@3.12:3.12.99') - depends_on('petsc@3.11:3.11.99', when='@3.11:3.11.99') - depends_on('petsc@3.10.3:3.10.99', when='@3.10.1:3.10.99') + depends_on('petsc@3.13.0:3.13', when='@3.13.0:3.13') + depends_on('petsc@3.12.0:3.12', when='@3.12.0:3.12') + depends_on('petsc@3.11.0:3.11', when='@3.11.0:3.11') + depends_on('petsc@3.10.3:3.10', when='@3.10.1:3.10') depends_on('petsc@3.10:3.10.2', when='@3.10.0') - depends_on('petsc@3.9:3.9.99', when='@3.9:3.9.99') - depends_on('petsc@3.8:3.8.99', when='@3.8:3.8.99') - depends_on('petsc@3.7:3.7.99', when='@3.7:3.7.99') - depends_on('petsc@3.6:3.6.99', when='@3.6:3.6.99') + depends_on('petsc@3.9.0:3.9', when='@3.9.0:3.9') + depends_on('petsc@3.8.0:3.8', when='@3.8.0:3.8') + depends_on('petsc@3.7.0:3.7', when='@3.7.0:3.7') + depends_on('petsc@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-picrust/package.py b/var/spack/repos/builtin/packages/py-picrust/package.py index d506dbf43d..9d269537f8 100644 --- a/var/spack/repos/builtin/packages/py-picrust/package.py +++ b/var/spack/repos/builtin/packages/py-picrust/package.py @@ -15,9 +15,9 @@ class PyPicrust(PythonPackage): version('1.1.3', sha256='7538c8544899b8855deb73a2d7a4ccac4808ff294e161530a8c8762d472d8906') - depends_on('python@2.7:2.999', type=('build', 'run')) + depends_on('python@2.7:2', type=('build', 'run')) depends_on('py-cogent@1.5.3', type=('build', 'run')) - depends_on('py-biom-format@2.1.4:2.1.999', type=('build', 'run')) + depends_on('py-biom-format@2.1.4:2.1', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-future@0.16.0', type=('build', 'run')) depends_on('py-numpy@1.5.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pillow/package.py b/var/spack/repos/builtin/packages/py-pillow/package.py index 4388a6d8dd..374b7123b4 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -31,7 +31,7 @@ class PyPillowBase(PythonPackage): depends_on('python@2.7:2.8,3.5:3.7', when='@6.0:6.2.0', type=('build', 'run')) depends_on('python@2.7:2.8,3.4:3.7', when='@5.2:5.4', type=('build', 'run')) depends_on('python@2.7:2.8,3.4:3.6', when='@5.0:5.1', type=('build', 'run')) - depends_on('python@2.7:2.8,3.3:3.6', when='@4.0:4.999', type=('build', 'run')) + depends_on('python@2.7:2.8,3.3:3.6', when='@4.0:4', type=('build', 'run')) depends_on('python@2.6:2.8,3.2:3.5', when='@2:3', type=('build', 'run')) depends_on('python@2.4:2.7', when='@:1', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-pint/package.py b/var/spack/repos/builtin/packages/py-pint/package.py index ade1726835..aea85b03cb 100644 --- a/var/spack/repos/builtin/packages/py-pint/package.py +++ b/var/spack/repos/builtin/packages/py-pint/package.py @@ -29,5 +29,5 @@ class PyPint(PythonPackage): depends_on('py-setuptools', type=('build', 'run')) depends_on('py-setuptools-scm', type=('build')) depends_on('py-packaging', type=('build', 'run'), when='@0.17:') - depends_on('py-importlib-metadata', type=('build', 'run'), when='@0.17: ^python@:3.7.999') - depends_on('py-importlib-resources', type=('build', 'run'), when='@0.17: ^python@:3.6.999') + depends_on('py-importlib-metadata', type=('build', 'run'), when='@0.17: ^python@:3.7') + depends_on('py-importlib-resources', type=('build', 'run'), when='@0.17: ^python@:3.6') diff --git a/var/spack/repos/builtin/packages/py-pot/package.py b/var/spack/repos/builtin/packages/py-pot/package.py index a5cdf51da2..f7d662952e 100644 --- a/var/spack/repos/builtin/packages/py-pot/package.py +++ b/var/spack/repos/builtin/packages/py-pot/package.py @@ -21,7 +21,7 @@ class PyPot(PythonPackage): # Avoid that CC and CXX are overridden with g++ in setup.py. patch('175.patch', when='@0.7.0') - depends_on('python@2.7:2.7.999,3.4:', type=('build', 'run')) + depends_on('python@2.7.0:2.7,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy@1.16:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pre-commit/package.py b/var/spack/repos/builtin/packages/py-pre-commit/package.py index 502f2adabd..74fa347adc 100644 --- a/var/spack/repos/builtin/packages/py-pre-commit/package.py +++ b/var/spack/repos/builtin/packages/py-pre-commit/package.py @@ -25,6 +25,6 @@ class PyPreCommit(PythonPackage): depends_on('py-six', type=('build', 'run')) depends_on('py-toml', type=('build', 'run')) depends_on('py-virtualenv@15.2:', type=('build', 'run')) - depends_on('py-futures', type=('build', 'run'), when='^python@:3.1.99') - depends_on('py-importlib-metadata', type=('build', 'run'), when='^python@:3.7.99') - depends_on('py-importlib-resources', type=('build', 'run'), when='^python@:3.6.99') + depends_on('py-futures', type=('build', 'run'), when='^python@:3.1') + depends_on('py-importlib-metadata', type=('build', 'run'), when='^python@:3.7') + depends_on('py-importlib-resources', type=('build', 'run'), when='^python@:3.6') diff --git a/var/spack/repos/builtin/packages/py-preshed/package.py b/var/spack/repos/builtin/packages/py-preshed/package.py index 27c70ec90e..e6e339317c 100644 --- a/var/spack/repos/builtin/packages/py-preshed/package.py +++ b/var/spack/repos/builtin/packages/py-preshed/package.py @@ -13,5 +13,5 @@ class PyPreshed(PythonPackage): version('3.0.2', sha256='61d73468c97c1d6d5a048de0b01d5a6fd052123358aca4823cdb277e436436cb') depends_on('py-setuptools', type='build') - depends_on('py-cymem@2.0.2:2.0.999', type=('build', 'run')) + depends_on('py-cymem@2.0.2:2.0', type=('build', 'run')) depends_on('py-murmurhash@0.28:1.0', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-promise/package.py b/var/spack/repos/builtin/packages/py-promise/package.py index 305079b86a..f5ba627a6b 100644 --- a/var/spack/repos/builtin/packages/py-promise/package.py +++ b/var/spack/repos/builtin/packages/py-promise/package.py @@ -21,4 +21,4 @@ class PyPromise(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-six', type=('build', 'run')) - depends_on('py-typing@3.6.4:', when='^python@:3.4.999', type=('build', 'run')) + depends_on('py-typing@3.6.4:', when='^python@:3.4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py index 863f5f51b7..7432627758 100644 --- a/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py +++ b/var/spack/repos/builtin/packages/py-prompt-toolkit/package.py @@ -35,7 +35,7 @@ class PyPromptToolkit(PythonPackage): version('1.0.9', sha256='cd6523b36adc174cc10d54b1193eb626b4268609ff6ea92c15bcf1996609599c') depends_on('python@3.6.1:', when='@3:', type=('build', 'run')) - depends_on('python@2.6:2.8,3.3:', when='@:2.999', type=('build', 'run')) + depends_on('python@2.6:2.8,3.3:', when='@:2', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-six@1.9.0:', when='@:2.999', type=('build', 'run')) + depends_on('py-six@1.9.0:', when='@:2', type=('build', 'run')) depends_on('py-wcwidth', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-prov/package.py b/var/spack/repos/builtin/packages/py-prov/package.py index 983a2b0b21..58e81e076b 100644 --- a/var/spack/repos/builtin/packages/py-prov/package.py +++ b/var/spack/repos/builtin/packages/py-prov/package.py @@ -20,7 +20,7 @@ class PyProv(PythonPackage): variant('dot', default=False, description='Graphical visualisation support for prov.model') - depends_on('python@3.6:3.999', type=('build', 'run')) + depends_on('python@3.6:3', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-lxml@3.3.5:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-py2neo/package.py b/var/spack/repos/builtin/packages/py-py2neo/package.py index 896a6f52e4..457614924c 100644 --- a/var/spack/repos/builtin/packages/py-py2neo/package.py +++ b/var/spack/repos/builtin/packages/py-py2neo/package.py @@ -24,9 +24,9 @@ class PyPy2neo(PythonPackage): depends_on("py-certifi", type=('build', 'run'), when='@4.3.0:') depends_on("py-click@7.0", type=('build', 'run'), when='@4.3.0:') depends_on("py-colorama", type=('build', 'run'), when='@4.3.0:') - depends_on("py-neobolt@1.7.12:1.7.999", type=('build', 'run'), when='@4.3.0:') - depends_on("py-neotime@1.7.4:1.7.999", type=('build', 'run'), when='@4.3.0:') - depends_on("py-prompt-toolkit@2.0.7:2.0.999", type=('build', 'run'), when='@4.3.0:') - depends_on("py-pygments@2.3.1:2.3.999", type=('build', 'run'), when='@4.3.0:') + depends_on("py-neobolt@1.7.12:1.7", type=('build', 'run'), when='@4.3.0:') + depends_on("py-neotime@1.7.4:1.7", type=('build', 'run'), when='@4.3.0:') + depends_on("py-prompt-toolkit@2.0.7:2.0", type=('build', 'run'), when='@4.3.0:') + depends_on("py-pygments@2.3.1:2.3", type=('build', 'run'), when='@4.3.0:') depends_on("py-pytz", type=('build', 'run'), when='@4.3.0:') depends_on("py-urllib3@1.23:1.24", type=('build', 'run'), when='@4.3.0:') diff --git a/var/spack/repos/builtin/packages/py-pyarrow/package.py b/var/spack/repos/builtin/packages/py-pyarrow/package.py index a3852da42f..9b362b81f7 100644 --- a/var/spack/repos/builtin/packages/py-pyarrow/package.py +++ b/var/spack/repos/builtin/packages/py-pyarrow/package.py @@ -37,8 +37,8 @@ class PyPyarrow(PythonPackage, CudaPackage): depends_on('py-numpy@1.14:', type=('build', 'run'), when='@0.15.0:') depends_on('py-numpy@1.16.6:', type=('build', 'run'), when='@3.0.0:') depends_on('py-six@1.0.0:', type=('build', 'run'), when='@0.15.0') - depends_on('py-futures', type=('build', 'run'), when='@0.15.0:^python@:3.1.99') - depends_on('py-enum34@1.1.6:', type=('build', 'run'), when='@0.15.0:^python@:3.3.99') + depends_on('py-futures', type=('build', 'run'), when='@0.15.0:^python@:3.1') + depends_on('py-enum34@1.1.6:', type=('build', 'run'), when='@0.15.0:^python@:3.3') for v in ('@0.9.0', '@0.11.0', '@0.12.1', '@0.15.1', '@0.17.1', '@3.0.0', '@4.0.1'): depends_on('arrow+python' + v, when=v) diff --git a/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py b/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py index e1d4fa7c96..6fc74662ff 100644 --- a/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py +++ b/var/spack/repos/builtin/packages/py-pyasn1-modules/package.py @@ -19,5 +19,5 @@ class PyPyasn1Modules(PythonPackage): depends_on('python@2.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-pyasn1@0.4.6:0.4.999', type=('build', 'run'), when='@0.2.6') - depends_on('py-pyasn1@0.4.1:0.4.999', type=('build', 'run'), when='@0.2.5') + depends_on('py-pyasn1@0.4.6:0.4', type=('build', 'run'), when='@0.2.6') + depends_on('py-pyasn1@0.4.1:0.4', type=('build', 'run'), when='@0.2.5') diff --git a/var/spack/repos/builtin/packages/py-pyautogui/package.py b/var/spack/repos/builtin/packages/py-pyautogui/package.py index 619171d061..bf3754ffd3 100644 --- a/var/spack/repos/builtin/packages/py-pyautogui/package.py +++ b/var/spack/repos/builtin/packages/py-pyautogui/package.py @@ -24,7 +24,7 @@ class PyPyautogui(PythonPackage): depends_on('py-mouseinfo', type=('build', 'run')) depends_on('py-python3-xlib', when='^python@3: platform=linux', type=('build', 'run')) - depends_on('py-python-xlib', when='^python@:2.999 platform=linux', type=('build', 'run')) + depends_on('py-python-xlib', when='^python@:2 platform=linux', type=('build', 'run')) # Missing packages; commented out for now # depends_on('py-pyobjc-core', when='platform=darwin', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pybids/package.py b/var/spack/repos/builtin/packages/py-pybids/package.py index 267cb872ba..710671d451 100644 --- a/var/spack/repos/builtin/packages/py-pybids/package.py +++ b/var/spack/repos/builtin/packages/py-pybids/package.py @@ -22,7 +22,7 @@ class PyPybids(PythonPackage): depends_on('py-nibabel@2.1:', type=('build', 'run')) depends_on('py-pandas@0.23:', type=('build', 'run')) depends_on('py-patsy', type=('build', 'run')) - depends_on('py-sqlalchemy@:1.3.999', type=('build', 'run')) + depends_on('py-sqlalchemy@:1.3', type=('build', 'run')) depends_on('py-bids-validator', type=('build', 'run')) depends_on('py-num2words', type=('build', 'run')) depends_on('py-click', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py index 35cdb8ead0..c613d5a8d7 100644 --- a/var/spack/repos/builtin/packages/py-pybind11/package.py +++ b/var/spack/repos/builtin/packages/py-pybind11/package.py @@ -63,7 +63,7 @@ class PyPybind11(CMakePackage, PythonPackage): env.set('PYBIND11_USE_CMAKE', 1) # https://github.com/pybind/pybind11/pull/1995 - @when('@:2.4.99') + @when('@:2.4') def patch(self): """ see https://github.com/spack/spack/issues/13559 """ filter_file('import sys', diff --git a/var/spack/repos/builtin/packages/py-pycairo/package.py b/var/spack/repos/builtin/packages/py-pycairo/package.py index 0ad69c46f0..f707c66759 100644 --- a/var/spack/repos/builtin/packages/py-pycairo/package.py +++ b/var/spack/repos/builtin/packages/py-pycairo/package.py @@ -23,8 +23,8 @@ class PyPycairo(PythonPackage): depends_on('pkgconfig', type='build') depends_on('py-setuptools', type='build') depends_on('python@2.7:2.8,3.3:', when='@:1.17.1', type=('build', 'run')) - depends_on('python@2.7:2.8,3.4:3.7.999', when='@1.18.1:1.19.999', type=('build', 'run')) - depends_on('python@3.6:3.999', when='@1.20.0:', type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:3.7', when='@1.18.1:1.19', type=('build', 'run')) + depends_on('python@3.6:3', when='@1.20.0:', type=('build', 'run')) @run_after('install') def post_install(self): diff --git a/var/spack/repos/builtin/packages/py-pycuda/package.py b/var/spack/repos/builtin/packages/py-pycuda/package.py index db5a4798ff..34da30d1dd 100644 --- a/var/spack/repos/builtin/packages/py-pycuda/package.py +++ b/var/spack/repos/builtin/packages/py-pycuda/package.py @@ -33,7 +33,7 @@ class PyPycuda(PythonPackage): depends_on('py-setuptools', type='build') depends_on('cuda') depends_on('boost+python') - depends_on('python@3.6:3.999', type=('build', 'run'), when='@2020.1:') + depends_on('python@3.6:3', type=('build', 'run'), when='@2020.1:') depends_on('py-numpy@1.6:', type=('build', 'run')) depends_on('py-pytools@2011.2:', type=('build', 'run')) depends_on('py-six', type='run') diff --git a/var/spack/repos/builtin/packages/py-pydap/package.py b/var/spack/repos/builtin/packages/py-pydap/package.py index c0c714f4e6..fa710c4010 100644 --- a/var/spack/repos/builtin/packages/py-pydap/package.py +++ b/var/spack/repos/builtin/packages/py-pydap/package.py @@ -21,4 +21,4 @@ class PyPydap(PythonPackage): depends_on('py-docopt', type=('build', 'run')) depends_on('py-six@1.4.0:', type=('build', 'run')) depends_on('py-beautifulsoup4', type=('build', 'run')) - depends_on('py-singledispatch', when='^python@:3.4.999', type=('build', 'run')) + depends_on('py-singledispatch', when='^python@:3.4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pydeps/package.py b/var/spack/repos/builtin/packages/py-pydeps/package.py index b56662392c..a0c29e5bc2 100644 --- a/var/spack/repos/builtin/packages/py-pydeps/package.py +++ b/var/spack/repos/builtin/packages/py-pydeps/package.py @@ -13,6 +13,6 @@ class PyPydeps(PythonPackage): version('1.7.1', sha256='7eeb8d0ec2713befe81dd0d15eac540e843b1daae13613df1c572528552d6340') depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3.99') + depends_on('py-enum34', type=('build', 'run'), when='^python@:3.3') depends_on('py-stdlib-list', type=('build', 'run')) depends_on('py-pyyaml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pydmd/package.py b/var/spack/repos/builtin/packages/py-pydmd/package.py index cc0cee1185..e3c2238509 100644 --- a/var/spack/repos/builtin/packages/py-pydmd/package.py +++ b/var/spack/repos/builtin/packages/py-pydmd/package.py @@ -26,7 +26,7 @@ class PyPydmd(PythonPackage): depends_on('py-future', type=('build', 'run')) depends_on('py-nose', type='test') depends_on('texlive', type='build', when='+docs') - depends_on('py-sphinx@1.4.0:1.4.99', type='build', when='+docs') + depends_on('py-sphinx@1.4.0:1.4', type='build', when='+docs') depends_on('py-sphinx-rtd-theme', type='build', when='+docs') # https://github.com/mathLab/PyDMD/pull/133 diff --git a/var/spack/repos/builtin/packages/py-pyfftw/package.py b/var/spack/repos/builtin/packages/py-pyfftw/package.py index 4f55477f84..c64f0e8eac 100644 --- a/var/spack/repos/builtin/packages/py-pyfftw/package.py +++ b/var/spack/repos/builtin/packages/py-pyfftw/package.py @@ -19,9 +19,9 @@ class PyPyfftw(PythonPackage): depends_on('fftw') depends_on('py-setuptools', type='build') - depends_on('py-cython@0.29:0.999', type='build') + depends_on('py-cython@0.29:0', type='build') depends_on('py-numpy@1.6:', type=('build', 'run'), when='@:0.10.4') - depends_on('py-numpy@1.10:1.999', type=('build', 'run'), when='@0.11.0:') + depends_on('py-numpy@1.10:1', type=('build', 'run'), when='@0.11.0:') def setup_build_environment(self, env): env.append_flags('LDFLAGS', self.spec['fftw'].libs.search_flags) diff --git a/var/spack/repos/builtin/packages/py-pygit2/package.py b/var/spack/repos/builtin/packages/py-pygit2/package.py index 1459dc2a23..e31158be72 100644 --- a/var/spack/repos/builtin/packages/py-pygit2/package.py +++ b/var/spack/repos/builtin/packages/py-pygit2/package.py @@ -23,15 +23,15 @@ class PyPygit2(PythonPackage): depends_on('py-setuptools', type='build') # Version must match with libgit2 # See: https://www.pygit2.org/install.html - depends_on('libgit2@1.1:1.1.99', when='@1.4:') - depends_on('libgit2@1.0:1.0.99', when='@1.2:1.3.99') - depends_on('libgit2@0.99:1.0.99', when='@1.1:1.1.99') - depends_on('libgit2@0.28:0.28.99', when='@0.28:1.0.99') - depends_on('libgit2@0.24:0.27.99', when='@0.24:0.27.99') + depends_on('libgit2@1.1.0:1.1', when='@1.4:') + depends_on('libgit2@1.0.0:1.0', when='@1.2:1.3') + depends_on('libgit2@0:1.0', when='@1.1.0:1.1') + depends_on('libgit2@0.28.0:0.28', when='@0.28:1.0') + depends_on('libgit2@0.24:0.27', when='@0.24:0.27') depends_on('python@3.6:', when='@1.4.0:') - depends_on('python@3.6:3.8.99', when='@1.2:1.3.99') - depends_on('python@3.5:3.8.99', when='@1.0:1.1.99') - depends_on('python@2.7:3.7.99', when='@0.28:0.99.99') + depends_on('python@3.6:3.8', when='@1.2:1.3') + depends_on('python@3.5:3.8', when='@1.0:1.1') + depends_on('python@2.7:3.7', when='@0.28:0') depends_on('py-six', type=('build', 'run'), when='@:0.28.2') depends_on('py-cffi@1.4.0:', type=('build', 'run')) depends_on('py-cached-property', when='@1.1.0:1.5', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index 02e283806e..ae2c180cee 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -24,9 +24,9 @@ class PyPygobject(PythonPackage): depends_on('pkgconfig', type='build') depends_on("libffi") depends_on('glib') - depends_on('python@2:2.99', when='@2:2.99', type=('build', 'run')) + depends_on('python@2.0:2', when='@2.0:2', type=('build', 'run')) depends_on('py-pycairo', type=('build', 'run'), when='@3:') - depends_on('py-py2cairo', type=('build', 'run'), when='@2:2.99') + depends_on('py-py2cairo', type=('build', 'run'), when='@2.0:2') depends_on('gobject-introspection') depends_on('gtkplus', when='@3:') @@ -47,11 +47,11 @@ class PyPygobject(PythonPackage): return url + '/%s/pygobject-%s.tar.xz' % (version.up_to(2), version) # pygobject version 2 requires an autotools build - @when('@2:2.99') + @when('@2.0:2') def build(self, spec, prefix): configure('--prefix=%s' % spec.prefix) - @when('@2:2.99') + @when('@2.0:2') def install(self, spec, prefix): make('install', parallel=False) diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py index db4274a8c9..9c340d904e 100644 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ b/var/spack/repos/builtin/packages/py-pygtk/package.py @@ -22,12 +22,12 @@ class PyPygtk(AutotoolsPackage): depends_on('atk@:2.20.0') # PyGTK requires python 2 # Use py-pygobject@3: for GTK bindings for python 3 - depends_on('python@2:2.99', type=('build', 'run')) + depends_on('python@2.0:2', type=('build', 'run')) depends_on('cairo') depends_on('glib') # for GTK 3.X use pygobject 3.X instead of pygtk - depends_on('gtkplus@2.24:2.99') - depends_on('py-pygobject@2.28:2.99', type=('build', 'run')) + depends_on('gtkplus@2.24:2') + depends_on('py-pygobject@2.28:2', type=('build', 'run')) depends_on('py-py2cairo', type=('build', 'run')) def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/py-pyjwt/package.py b/var/spack/repos/builtin/packages/py-pyjwt/package.py index e8e86ac83f..1a14e40e03 100644 --- a/var/spack/repos/builtin/packages/py-pyjwt/package.py +++ b/var/spack/repos/builtin/packages/py-pyjwt/package.py @@ -21,4 +21,4 @@ class PyPyjwt(PythonPackage): depends_on('python@3.6:', when='@2.1.0:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-cryptography@1.4:', when='+crypto', type=('build', 'run')) - depends_on('py-cryptography@3.3.1:3.999', when='@2.1.0:+crypto', type=('build', 'run')) + depends_on('py-cryptography@3.3.1:3', when='@2.1.0:+crypto', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pykwalify/package.py b/var/spack/repos/builtin/packages/py-pykwalify/package.py index 46c3195640..76c2bd2863 100644 --- a/var/spack/repos/builtin/packages/py-pykwalify/package.py +++ b/var/spack/repos/builtin/packages/py-pykwalify/package.py @@ -24,5 +24,5 @@ class PyPykwalify(PythonPackage): depends_on('py-pyyaml@3.11:', type=('build', 'run'), when='@1.6.1') conflicts('^py-ruamel@0.16.0:', when='@1.6.1') - conflicts('^python@2.8.0:3.2.99', when='@1.6.1') - conflicts('^python@2.8.0:3.4.99', when='@1.7.0:') + conflicts('^python@2.8.0:3.2', when='@1.6.1') + conflicts('^python@2.8.0:3.4', when='@1.7.0:') diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 3f2ffce12c..5d28171372 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -22,26 +22,26 @@ class PyPylint(PythonPackage): extends('python', ignore=r'bin/pytest') depends_on('python@2.7:2.8,3.4:3.6', when='@:1', type=('build', 'run')) - depends_on('python@3.4:', when='@2:2.7.999', type=('build', 'run')) + depends_on('python@3.4:', when='@2:2.7', type=('build', 'run')) depends_on('python@3.6:', when='@2.8.2:', type=('build', 'run')) depends_on('py-astroid', type=('build', 'run')) # note there is no working version of astroid for this depends_on('py-astroid@1.5.1:', type=('build', 'run'), when='@1.7:') depends_on('py-astroid@1.6:1.9', type=('build', 'run'), when='@1.9.4') depends_on('py-astroid@2.0:', type=('build', 'run'), when='@2.2.0:') - depends_on('py-astroid@2.2.0:2.999.999', type=('build', 'run'), when='@2.3.0:2.7.999') - depends_on('py-astroid@2.5.6:2.6.999', type=('build', 'run'), when='@2.8.0:') + depends_on('py-astroid@2.2.0:2', type=('build', 'run'), when='@2.3.0:2.7') + depends_on('py-astroid@2.5.6:2.6', type=('build', 'run'), when='@2.8.0:') depends_on('py-six', type=('build', 'run'), when='@1:2.3.1') depends_on('py-isort@4.2.5:', type=('build', 'run')) - depends_on('py-isort@4.2.5:5.999', when='@2.3.1:', type=('build', 'run')) + depends_on('py-isort@4.2.5:5', when='@2.3.1:', type=('build', 'run')) depends_on('py-mccabe', type=('build', 'run')) - depends_on('py-mccabe@0.6.0:0.6.999', when='@2.3.1:', type=('build', 'run')) + depends_on('py-mccabe@0.6.0:0.6', when='@2.3.1:', type=('build', 'run')) depends_on('py-editdistance', type=('build', 'run'), when='@:1.7') depends_on('py-setuptools@17.1:', type='build') depends_on('py-setuptools-scm', type='build', when='@2.8.2:') # depends_on('py-setuptools-scm@1.15.0:', type='build') depends_on('py-configparser', when='^python@:2.8', type=('build', 'run')) depends_on('py-backports-functools-lru-cache', when='^python@:2.8', type=('build', 'run')) - depends_on('py-singledispatch', when='^python@:3.3.99', type=('build', 'run')) + depends_on('py-singledispatch', when='^python@:3.3', type=('build', 'run')) depends_on('py-toml@0.7.1:', type=('build', 'run'), when='@2.8.2:') diff --git a/var/spack/repos/builtin/packages/py-pyprecice/package.py b/var/spack/repos/builtin/packages/py-pyprecice/package.py index 6df24e4d20..ca36e08712 100644 --- a/var/spack/repos/builtin/packages/py-pyprecice/package.py +++ b/var/spack/repos/builtin/packages/py-pyprecice/package.py @@ -31,13 +31,13 @@ class PyPyprecice(PythonPackage): version("2.0.0.1", sha256="96eafdf421ec61ad6fcf0ab1d3cf210831a815272984c470b2aea57d4d0c9e0e") depends_on("precice@develop", when="@develop") - depends_on("precice@2.2.1", when="@2.2.1.1:2.2.1.99") - depends_on("precice@2.2.0", when="@2.2.0.1:2.2.0.99") - depends_on("precice@2.1.1", when="@2.1.1.1:2.1.1.99") - depends_on("precice@2.1.0", when="@2.1.0.1:2.1.0.99") - depends_on("precice@2.0.2", when="@2.0.2.1:2.0.2.99") - depends_on("precice@2.0.1", when="@2.0.1.1:2.0.1.99") - depends_on("precice@2.0.0", when="@2.0.0.1:2.0.0.99") + depends_on("precice@2.2.1", when="@2.2.1.1:2.2.1") + depends_on("precice@2.2.0", when="@2.2.0.1:2.2.0") + depends_on("precice@2.1.1", when="@2.1.1.1:2.1.1") + depends_on("precice@2.1.0", when="@2.1.0.1:2.1.0") + depends_on("precice@2.0.2", when="@2.0.2.1:2.0.2") + depends_on("precice@2.0.1", when="@2.0.1.1:2.0.1") + depends_on("precice@2.0.0", when="@2.0.0.1:2.0.0") depends_on("python@3:", type=("build", "link", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pyproj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py index 01dc4cccdf..e144ff8227 100644 --- a/var/spack/repos/builtin/packages/py-pyproj/package.py +++ b/var/spack/repos/builtin/packages/py-pyproj/package.py @@ -37,16 +37,16 @@ class PyPyproj(PythonPackage): # https://pyproj4.github.io/pyproj/stable/installation.html#installing-from-source depends_on('proj') depends_on('proj@7.2:', when='@3.0.1:') - depends_on('proj@7.2.0:7.2.999', when='@3.0.0') + depends_on('proj@7.2.0:7.2', when='@3.0.0') depends_on('proj@6.2:7.0', when='@2.4:2.6') depends_on('proj@6.1:7.0', when='@2.2:2.3') - depends_on('proj@6.0:6.999', when='@2.0:2.1') + depends_on('proj@6.0:6', when='@2.0:2.1') depends_on('proj@:5.2', when='@:1.9') # In setup.py depends_on('py-setuptools', type='build') depends_on('py-certifi', when='@3.0:', type=('build', 'run')) - depends_on('py-aenum', when='@2.2.0:2.2.999 ^python@:3.5.999', type=('build', 'run')) + depends_on('py-aenum', when='@2.2.0:2.2 ^python@:3.5', type=('build', 'run')) # In pyproject.toml depends_on('py-cython@0.28.4:', when='@2.0:') diff --git a/var/spack/repos/builtin/packages/py-pyrad/package.py b/var/spack/repos/builtin/packages/py-pyrad/package.py index 758699b0aa..5ec2c38e84 100644 --- a/var/spack/repos/builtin/packages/py-pyrad/package.py +++ b/var/spack/repos/builtin/packages/py-pyrad/package.py @@ -14,7 +14,7 @@ class PyPyrad(PythonPackage): version('3.0.66', sha256='7dbd67e532058f7b7de76d14cf631fd3e3c841cd80fac4e55fbce8bb52ac6537') - depends_on('python@:2.999', type=('build', 'run')) + depends_on('python@:2', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pyscreeze/package.py b/var/spack/repos/builtin/packages/py-pyscreeze/package.py index 08248b7af8..68d6a38108 100644 --- a/var/spack/repos/builtin/packages/py-pyscreeze/package.py +++ b/var/spack/repos/builtin/packages/py-pyscreeze/package.py @@ -17,7 +17,7 @@ class PyPyscreeze(PythonPackage): version('0.1.27', sha256='cba2f264fe4b6c70510061cb2ba6e1da0e3bfecfdbe8a3b2cd6305a2afda9e6b') - depends_on('python@2.7:2.999,3.2:', type=('build', 'run')) + depends_on('python@2.7:2,3.2:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('pil', type=('build', 'run')) depends_on('scrot', type='run') diff --git a/var/spack/repos/builtin/packages/py-pyside2/package.py b/var/spack/repos/builtin/packages/py-pyside2/package.py index b98244a4f5..eae93550ab 100644 --- a/var/spack/repos/builtin/packages/py-pyside2/package.py +++ b/var/spack/repos/builtin/packages/py-pyside2/package.py @@ -25,7 +25,7 @@ class PyPyside2(PythonPackage): variant('doc', default=False, description='Enables the generation of html and man page documentation') - depends_on('python@2.7:2.7.99,3.5.0:3.5.99,3.6.1:', type=('build', 'run')) + depends_on('python@2.7.0:2.7,3.5.0:3.5,3.6.1:', type=('build', 'run')) depends_on('cmake@3.1:', type='build') depends_on('llvm@6:', type='build') diff --git a/var/spack/repos/builtin/packages/py-pyspark/package.py b/var/spack/repos/builtin/packages/py-pyspark/package.py index 68d5be974f..efa602ef4e 100644 --- a/var/spack/repos/builtin/packages/py-pyspark/package.py +++ b/var/spack/repos/builtin/packages/py-pyspark/package.py @@ -16,7 +16,7 @@ class PyPyspark(PythonPackage): version('2.4.4', sha256='13655eb113b8cf5f3f85b24fd92f86c4668a723723bd68949d028fa0df2cf694') version('2.3.0', sha256='0b3536910e154c36a94239f0ba0a201f476aadc72006409e5787198ffd01986e') - depends_on('python@2.7:3.7', when='@:2.999', type=('build', 'run')) + depends_on('python@2.7:3.7', when='@:2', type=('build', 'run')) depends_on('python@2.7:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-py4j@0.10.9', when='@3.0.1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pysqlite/package.py b/var/spack/repos/builtin/packages/py-pysqlite/package.py index ea470f7350..676ce14198 100644 --- a/var/spack/repos/builtin/packages/py-pysqlite/package.py +++ b/var/spack/repos/builtin/packages/py-pysqlite/package.py @@ -15,5 +15,5 @@ class PyPysqlite(PythonPackage): version('2.8.3', sha256='17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490') # pysqlite is built into Python3 - depends_on('python@2.7.0:2.7.999', type=('build', 'run')) + depends_on('python@2.7.0:2.7', type=('build', 'run')) depends_on('sqlite', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pytest-cpp/package.py b/var/spack/repos/builtin/packages/py-pytest-cpp/package.py index 78bf707499..52cf4f0ee0 100644 --- a/var/spack/repos/builtin/packages/py-pytest-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-cpp/package.py @@ -18,5 +18,5 @@ class PyPytestCpp(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm', type='build') - depends_on('py-pytest@:5.3.999,5.4.2:', type=('build', 'run')) + depends_on('py-pytest@:5.3,5.4.2:', type=('build', 'run')) depends_on('py-colorama', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pytest-html/package.py b/var/spack/repos/builtin/packages/py-pytest-html/package.py index bf914ce223..27d466fc5b 100644 --- a/var/spack/repos/builtin/packages/py-pytest-html/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-html/package.py @@ -19,5 +19,5 @@ class PyPytestHtml(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm', type='build') - depends_on('py-pytest@5.0:5.999,6.0.1:', type=('build', 'run')) + depends_on('py-pytest@5.0:5,6.0.1:', type=('build', 'run')) depends_on('py-pytest-metadata', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pytest/package.py b/var/spack/repos/builtin/packages/py-pytest/package.py index 65715fff73..d736596c29 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -37,7 +37,7 @@ class PyPytest(PythonPackage): # setup_requires depends_on('py-setuptools@42.0:', when='@6.2:', type=('build', 'run')) - depends_on('py-setuptools@40.0:', when='@3.9.2:6.1.999', type=('build', 'run')) + depends_on('py-setuptools@40.0:', when='@3.9.2:6.1', type=('build', 'run')) depends_on('py-setuptools@30.3:', when='@3.9.0:3.9.1', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('py-setuptools-scm@3.4:', when='@6.2:', type='build') @@ -45,35 +45,35 @@ class PyPytest(PythonPackage): # install_requires depends_on('py-attrs@19.2.0:', when='@6.2:', type=('build', 'run')) - depends_on('py-attrs@17.4.0:', when='@3.5:6.1.999', type=('build', 'run')) + depends_on('py-attrs@17.4.0:', when='@3.5:6.1', type=('build', 'run')) depends_on('py-attrs@17.2.0:', when='@3.3:3.4', type=('build', 'run')) depends_on('py-iniconfig', when='@6.0:', type=('build', 'run')) depends_on('py-packaging', when='@4.6:', type=('build', 'run')) - depends_on('py-pluggy@0.12:0.999', when='@4.6:', type=('build', 'run')) - depends_on('py-pluggy@0.9.0:0.9.999,0.11:0.999', when='@4.5.0:4.5.999', type=('build', 'run')) - depends_on('py-pluggy@0.11:', when='@4.4.2:4.4.999', type=('build', 'run')) + depends_on('py-pluggy@0.12:0', when='@4.6:', type=('build', 'run')) + depends_on('py-pluggy@0.9.0:0.9,0.11:0', when='@4.5.0:4.5', type=('build', 'run')) + depends_on('py-pluggy@0.11:', when='@4.4.2:4.4', type=('build', 'run')) depends_on('py-pluggy@0.9:', when='@4.4.0:4.4.1', type=('build', 'run')) depends_on('py-pluggy@0.7:', when='@3.7:4.3', type=('build', 'run')) - depends_on('py-pluggy@0.5:0.7', when='@3.6.4:3.6.999', type=('build', 'run')) + depends_on('py-pluggy@0.5:0.7', when='@3.6.4:3.6', type=('build', 'run')) depends_on('py-pluggy@0.5:0.6', when='@:3.6.3', type=('build', 'run')) depends_on('py-py@1.8.2:', when='@6:', type=('build', 'run')) - depends_on('py-py@1.5.0:', when='@3.3:5.999', type=('build', 'run')) - depends_on('py-py@1.4.33:', when='@3.1.2:3.2.3,3.2.5:3.2.999', type=('build', 'run')) - depends_on('py-py@1.4.33:1.4.999', when='@3.2.4', type=('build', 'run')) + depends_on('py-py@1.5.0:', when='@3.3:5', type=('build', 'run')) + depends_on('py-py@1.4.33:', when='@3.1.2:3.2.3,3.2.5:3.2', type=('build', 'run')) + depends_on('py-py@1.4.33:1.4', when='@3.2.4', type=('build', 'run')) depends_on('py-py@1.4.29:', when='@:3.1.1', type=('build', 'run')) depends_on('py-toml', when='@6.0:', type=('build', 'run')) depends_on('py-atomicwrites@1.0:', when='@5.3: platform=win32', type=('build', 'run')) - depends_on('py-atomicwrites@1.0:', when='@3.6:5.2.999', type=('build', 'run')) + depends_on('py-atomicwrites@1.0:', when='@3.6:5.2', type=('build', 'run')) depends_on('py-colorama', when='platform=win32', type=('build', 'run')) depends_on('py-importlib-metadata@0.12:', when='@4.6:5.0', type=('build', 'run')) depends_on('py-importlib-metadata@0.12:', when='@5.1: ^python@:3.7', type=('build', 'run')) # Historic dependencies depends_on('py-six@1.10.0:', when='@3.3:4', type=('build', 'run')) - depends_on('py-more-itertools@4.0.0:', when='@3.5.1:5.999', type=('build', 'run')) + depends_on('py-more-itertools@4.0.0:', when='@3.5.1:5', type=('build', 'run')) depends_on('py-more-itertools@4.0.0:6.0.0', when='@4.2.1:4.6.9 ^python@:2', type=('build', 'run')) depends_on('py-funcsigs@1.0:', when='@4.4: ^python@:2', type=('build', 'run')) depends_on('py-funcsigs', when='@3.3:4.3 ^python@:2', type=('build', 'run')) depends_on('py-pathlib2@2.2.0:', when='@3.7.1: ^python@:3.5', type=('build', 'run')) depends_on('py-pathlib2', when='@3.7.0 ^python@:3.5', type=('build', 'run')) - depends_on('py-wcwidth', when='@4.5:5.999', type=('build', 'run')) + depends_on('py-wcwidth', when='@4.5:5', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-python-benedict/package.py b/var/spack/repos/builtin/packages/py-python-benedict/package.py index 5f4f0da674..b5102e9697 100644 --- a/var/spack/repos/builtin/packages/py-python-benedict/package.py +++ b/var/spack/repos/builtin/packages/py-python-benedict/package.py @@ -17,7 +17,7 @@ class PyPythonBenedict(PythonPackage): depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-ftfy@4.4.3', when='^python@:3.3.999', type=('build', 'run')) + depends_on('py-ftfy@4.4.3', when='^python@:3.3', type=('build', 'run')) depends_on('py-ftfy', when='^python@3.4:', type=('build', 'run')) depends_on('py-mailchecker', type=('build', 'run')) depends_on('py-phonenumbers', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py b/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py index a7588f6612..0392670fb9 100644 --- a/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py +++ b/var/spack/repos/builtin/packages/py-python-certifi-win32/package.py @@ -19,5 +19,5 @@ class PyPythonCertifiWin32(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm', type='build') depends_on('py-wrapt@1.10.4:', type=('build', 'run')) - depends_on('py-wincertstore', type=('build', 'run'), when='^python@:3.3.999') + depends_on('py-wincertstore', type=('build', 'run'), when='^python@:3.3') depends_on('py-certifi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-python-editor/package.py b/var/spack/repos/builtin/packages/py-python-editor/package.py index 1fbc451c5f..469ce52846 100644 --- a/var/spack/repos/builtin/packages/py-python-editor/package.py +++ b/var/spack/repos/builtin/packages/py-python-editor/package.py @@ -14,5 +14,5 @@ class PyPythonEditor(PythonPackage): version('1.0.4', sha256='51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b') - depends_on('python@2.7:2.7.999,3.4:', type=('build', 'run')) + depends_on('python@2.7.0:2.7,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py b/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py index dc61adb66b..9f89c0ec93 100644 --- a/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py +++ b/var/spack/repos/builtin/packages/py-python-keystoneclient/package.py @@ -21,7 +21,7 @@ class PyPythonKeystoneclient(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) - depends_on('py-pbr@2.0.0:2.0.999,2.1.1:', type='build') + depends_on('py-pbr@2.0.0:2.0,2.1.1:', type='build') depends_on('py-setuptools', type='build') depends_on('py-debtcollector@1.2.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pythran/package.py b/var/spack/repos/builtin/packages/py-pythran/package.py index e48928a90b..431347d26b 100644 --- a/var/spack/repos/builtin/packages/py-pythran/package.py +++ b/var/spack/repos/builtin/packages/py-pythran/package.py @@ -32,16 +32,16 @@ class PyPythran(PythonPackage): depends_on('py-ply@3.4:', type=('build', 'run')) depends_on('py-networkx@2:', when='@:0.9.11', type=('build', 'run')) depends_on('py-decorator', when='@:0.9.11', type=('build', 'run')) - depends_on('py-gast@0.5.0:0.5.999', when='@0.9.12:', type=('build', 'run')) - depends_on('py-gast@0.4.0:0.4.999', when='@0.9.7:0.9.11', type=('build', 'run')) - depends_on('py-gast@0.3.3:0.3.999', when='@0.9.6', type=('build', 'run')) + depends_on('py-gast@0.5.0:0.5', when='@0.9.12:', type=('build', 'run')) + depends_on('py-gast@0.4.0:0.4', when='@0.9.7:0.9.11', type=('build', 'run')) + depends_on('py-gast@0.3.3:0.3', when='@0.9.6', type=('build', 'run')) depends_on('py-gast@0.3.0:', when='@0.9.4:0.9.5', type=('build', 'run')) depends_on('py-gast', when='@:0.9.3', type=('build', 'run')) depends_on('py-six', when='@:0.9.11', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) - depends_on('py-beniget@0.4.0:0.4.999', when='@0.9.12:', type=('build', 'run')) - depends_on('py-beniget@0.3.0:0.3.999', when='@0.9.7:0.9.11', type=('build', 'run')) - depends_on('py-beniget@0.2.1:0.2.999', when='@0.9.6', type=('build', 'run')) + depends_on('py-beniget@0.4.0:0.4', when='@0.9.12:', type=('build', 'run')) + depends_on('py-beniget@0.3.0:0.3', when='@0.9.7:0.9.11', type=('build', 'run')) + depends_on('py-beniget@0.2.1:0.2', when='@0.9.6', type=('build', 'run')) depends_on('py-beniget@0.2.0:', when='@0.9.4:0.9.5', type=('build', 'run')) depends_on('py-beniget', when='@:0.9.3', type=('build', 'run')) depends_on('llvm-openmp', when='%apple-clang', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py index 4c2578b6ab..6816c72668 100644 --- a/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pytorch-lightning/package.py @@ -28,9 +28,9 @@ class PyPytorchLightning(PythonPackage): depends_on('py-pyyaml@5.1:', when='@1.4:', type=('build', 'run')) depends_on('py-pyyaml@5.1:5.4.1', when='@1.3', type=('build', 'run')) depends_on('py-pyyaml@5.1:5.3,5.5:', when='@:1.2', type=('build', 'run')) - depends_on('py-fsspec@2021.05.0:2021.05.999,2021.06.1:+http', when='@1.3:', type=('build', 'run')) + depends_on('py-fsspec@2021.05.0:2021.05,2021.06.1:+http', when='@1.3:', type=('build', 'run')) depends_on('py-fsspec@0.8.1:+http', when='@:1.2', type=('build', 'run')) - depends_on('py-tensorboard@2.2.0:2.4.999,2.5.1:', type=('build', 'run')) + depends_on('py-tensorboard@2.2.0:2.4,2.5.1:', type=('build', 'run')) depends_on('py-torchmetrics@0.4.0:', when='@1.4:', type=('build', 'run')) depends_on('py-torchmetrics@0.2.0:', when='@1.3', type=('build', 'run')) depends_on('py-torchmetrics@0.2.0', when='@:1.2', type=('build', 'run')) @@ -39,4 +39,4 @@ class PyPytorchLightning(PythonPackage): depends_on('py-packaging@17.0:', when='@1.3:', type=('build', 'run')) depends_on('py-packaging', type=('build', 'run')) depends_on('py-typing-extensions', when='@1.4:', type=('build', 'run')) - depends_on('pil@:8.2.999,8.3.1:', when='@1.3', type=('build', 'run')) + depends_on('pil@:8.2,8.3.1:', when='@1.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-pyusb/package.py b/var/spack/repos/builtin/packages/py-pyusb/package.py index df0d338537..a730d3dd45 100644 --- a/var/spack/repos/builtin/packages/py-pyusb/package.py +++ b/var/spack/repos/builtin/packages/py-pyusb/package.py @@ -15,6 +15,6 @@ class PyPyusb(PythonPackage): version('1.0.2', sha256='4e9b72cc4a4205ca64fbf1f3fff39a335512166c151ad103e55c8223ac147362') depends_on('py-setuptools', type=('build', 'run')) - depends_on('py-setuptools-scm@:1.999', type='build', when='^py-setuptools@:11.999') + depends_on('py-setuptools-scm@:1', type='build', when='^py-setuptools@:11') depends_on('py-setuptools-scm', type='build') depends_on('libusb') diff --git a/var/spack/repos/builtin/packages/py-pyvista/package.py b/var/spack/repos/builtin/packages/py-pyvista/package.py index 2b056e9868..26bb50f601 100644 --- a/var/spack/repos/builtin/packages/py-pyvista/package.py +++ b/var/spack/repos/builtin/packages/py-pyvista/package.py @@ -21,7 +21,7 @@ class PyPyvista(PythonPackage): depends_on('pil', type=('build', 'run')) depends_on('py-appdirs', type=('build', 'run')) depends_on('py-scooby@0.5.1:', type=('build', 'run')) - depends_on('py-meshio@4.0.3:4.99', type=('build', 'run')) + depends_on('py-meshio@4.0.3:4', type=('build', 'run')) depends_on('vtk+python', type=('build', 'run')) depends_on('py-dataclasses', when='^python@3.6', type=('build', 'run')) depends_on('py-typing-extensions', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-quantities/package.py b/var/spack/repos/builtin/packages/py-quantities/package.py index fcb2abd41a..d8fa355c9d 100644 --- a/var/spack/repos/builtin/packages/py-quantities/package.py +++ b/var/spack/repos/builtin/packages/py-quantities/package.py @@ -16,7 +16,7 @@ class PyQuantities(PythonPackage): version('0.11.1', sha256='4382098a501b55bf0fdb3dba2061a161041253697d78811ecfd7c55449836660', url="https://pypi.io/packages/source/q/quantities/quantities-0.11.1.zip") - conflicts('^py-numpy@1.13:', when='@:0.11.99') + conflicts('^py-numpy@1.13:', when='@:0.11') depends_on('python@2.6.0:') depends_on('py-numpy@1.4.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-questionary/package.py b/var/spack/repos/builtin/packages/py-questionary/package.py index 62b21eed9e..eca6c07735 100644 --- a/var/spack/repos/builtin/packages/py-questionary/package.py +++ b/var/spack/repos/builtin/packages/py-questionary/package.py @@ -15,6 +15,6 @@ class PyQuestionary(PythonPackage): version('1.9.0', sha256='a050fdbb81406cddca679a6f492c6272da90cb09988963817828f697cf091c55') - depends_on('python@3.6:3.9.999', type=('build', 'run')) + depends_on('python@3.6:3.9', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-prompt-toolkit@2.0:3.99', type=('build', 'run')) + depends_on('py-prompt-toolkit@2.0:3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py b/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py index b0846f3aaf..1fdc42d803 100644 --- a/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py +++ b/var/spack/repos/builtin/packages/py-radiant-mlhub/package.py @@ -18,7 +18,7 @@ class PyRadiantMlhub(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-requests@2.25.1:2.25.999', type=('build', 'run')) + depends_on('py-requests@2.25.1:2.25', type=('build', 'run')) depends_on('py-pystac@0.5.4', type=('build', 'run')) - depends_on('py-click@7.1.2:7.1.999', type=('build', 'run')) - depends_on('py-tqdm@4.56.0:4.56.999', type=('build', 'run')) + depends_on('py-click@7.1.2:7.1', type=('build', 'run')) + depends_on('py-tqdm@4.56.0:4.56', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py index 09ef44d0ec..6742e1619d 100644 --- a/var/spack/repos/builtin/packages/py-rasterio/package.py +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -28,7 +28,7 @@ class PyRasterio(PythonPackage): version('1.0a12', sha256='47d460326e04c64590ff56952271a184a6307f814efc34fb319c12e690585f3c') depends_on('python@3.6:3.9', type=('build', 'link', 'run'), when='@1.2:') - depends_on('python@2.7:2.8,3.5:3.8', type=('build', 'link', 'run'), when='@1.1.0:1.1.999') + depends_on('python@2.7:2.8,3.5:3.8', type=('build', 'link', 'run'), when='@1.1.0:1.1') depends_on('python@2.7:2.8,3.5:3.7', type=('build', 'link', 'run'), when='@:1.0') depends_on('py-setuptools', type=('build', 'run')) depends_on('py-cython', type='build', when='@master') @@ -42,6 +42,6 @@ class PyRasterio(PythonPackage): depends_on('py-click-plugins', type=('build', 'run')) depends_on('py-enum34', type='run', when='^python@:3.3') depends_on('gdal@2.3:3.2', when='@1.2.0:') - depends_on('gdal@1.11:3.2', when='@1.1.0:1.1.999') - depends_on('gdal@1.11:3.0', when='@1.0.25:1.0.999') + depends_on('gdal@1.11:3.2', when='@1.1.0:1.1') + depends_on('gdal@1.11:3.0', when='@1.0.25:1.0') depends_on('gdal@1.11:2', when='@:1.0.24') diff --git a/var/spack/repos/builtin/packages/py-ray/package.py b/var/spack/repos/builtin/packages/py-ray/package.py index 7b620d650e..eb8db60047 100644 --- a/var/spack/repos/builtin/packages/py-ray/package.py +++ b/var/spack/repos/builtin/packages/py-ray/package.py @@ -30,7 +30,7 @@ class PyRay(PythonPackage): depends_on('py-gpustat', type=('build', 'run')) depends_on('py-grpcio@1.28.1:', type=('build', 'run')) depends_on('py-jsonschema', type=('build', 'run')) - depends_on('py-msgpack@1.0:1.999', type=('build', 'run')) + depends_on('py-msgpack@1.0:1', type=('build', 'run')) depends_on('py-numpy@1.16:', type=('build', 'run')) depends_on('py-protobuf@3.8.0:', type=('build', 'run')) depends_on('py-py-spy@0.2.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-redis/package.py b/var/spack/repos/builtin/packages/py-redis/package.py index 2d99d04e4b..ef4a090631 100644 --- a/var/spack/repos/builtin/packages/py-redis/package.py +++ b/var/spack/repos/builtin/packages/py-redis/package.py @@ -17,7 +17,7 @@ class PyRedis(PythonPackage): variant("hiredis", default=False, description="Support for hiredis which speeds up parsing of multi bulk replies") - depends_on('python@2.7:2.8,3.4:', when="@3.3.0:3.3.99", type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:', when="@3.3.0:3.3", type=('build', 'run')) depends_on('python@2.7:2.8,3.5:', when="@3.4.0:", type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-hiredis@0.1.3:', when="+hiredis", type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py index 100efc5020..aadfed38d4 100644 --- a/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py +++ b/var/spack/repos/builtin/packages/py-requests-toolbelt/package.py @@ -17,4 +17,4 @@ class PyRequestsToolbelt(PythonPackage): version('0.8.0', sha256='f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5') depends_on('py-setuptools', type='build') - depends_on('py-requests@2.0.1:2.999', type=('build', 'run')) + depends_on('py-requests@2.0.1:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py index 01e97ff5f3..ef683fe378 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -25,11 +25,11 @@ class PyRequests(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-chardet@3.0.2:4.999', type=('build', 'run'), when='@2.25.1:') - depends_on('py-chardet@3.0.2:3.999', type=('build', 'run'), when='@2.23.0:2.25.0') - depends_on('py-chardet@3.0.2:3.0.999', type=('build', 'run'), when='@2.16.0:2.22.999') - depends_on('py-idna@2.5:2.999', type=('build', 'run'), when='@2.23.0:') - depends_on('py-idna@2.5:2.8', type=('build', 'run'), when='@2.16.0:2.22.999') - depends_on('py-urllib3@1.21.1:1.26.999', type=('build', 'run'), when='@2.25.0:') - depends_on('py-urllib3@1.21.1:1.24,1.25.2:1.25.999', type=('build', 'run'), when='@2.16.0:2.24.999') + depends_on('py-chardet@3.0.2:4', type=('build', 'run'), when='@2.25.1:') + depends_on('py-chardet@3.0.2:3', type=('build', 'run'), when='@2.23.0:2.25.0') + depends_on('py-chardet@3.0.2:3.0', type=('build', 'run'), when='@2.16.0:2.22') + depends_on('py-idna@2.5:2', type=('build', 'run'), when='@2.23.0:') + depends_on('py-idna@2.5:2.8', type=('build', 'run'), when='@2.16.0:2.22') + depends_on('py-urllib3@1.21.1:1.26', type=('build', 'run'), when='@2.25.0:') + depends_on('py-urllib3@1.21.1:1.24,1.25.2:1.25', type=('build', 'run'), when='@2.16.0:2.24') depends_on('py-certifi@2017.4.17:', type=('build', 'run'), when='@2.16.0:') diff --git a/var/spack/repos/builtin/packages/py-responses/package.py b/var/spack/repos/builtin/packages/py-responses/package.py index 25cb4b337b..51b0f0b8e5 100644 --- a/var/spack/repos/builtin/packages/py-responses/package.py +++ b/var/spack/repos/builtin/packages/py-responses/package.py @@ -18,8 +18,8 @@ class PyResponses(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-mock', when='^python@:3.2.999', type=('build', 'run')) - depends_on('py-cookies', when='^python@:3.3.999', type=('build', 'run')) + depends_on('py-mock', when='^python@:3.2', type=('build', 'run')) + depends_on('py-cookies', when='^python@:3.3', type=('build', 'run')) depends_on('py-requests@2.0:', type=('build', 'run')) depends_on('py-urllib3@1.25.10:', type=('build', 'run')) depends_on('py-six', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-resultsfile/package.py b/var/spack/repos/builtin/packages/py-resultsfile/package.py index 0b1b862416..ef2f25eac5 100644 --- a/var/spack/repos/builtin/packages/py-resultsfile/package.py +++ b/var/spack/repos/builtin/packages/py-resultsfile/package.py @@ -18,5 +18,5 @@ class PyResultsfile(PythonPackage): version('2.0', sha256='2a34208254e4bea155695690437f6a59bf5f7b0ddb421d6c1a2d377510f018f7') version('1.0', sha256='e029054b2727131da9684fa2ec9fb8b6a3225dc7f648216a9390267b2d5d60c3') - depends_on('python@2.7:2.8.999', type=('build', 'run'), when='@1.0:1.999') + depends_on('python@2.7:2.8', type=('build', 'run'), when='@1.0:1') depends_on('python@3:', type=('build', 'run'), when='@2.0:') diff --git a/var/spack/repos/builtin/packages/py-rich/package.py b/var/spack/repos/builtin/packages/py-rich/package.py index 11de5526b9..ffb6806f36 100644 --- a/var/spack/repos/builtin/packages/py-rich/package.py +++ b/var/spack/repos/builtin/packages/py-rich/package.py @@ -29,8 +29,8 @@ class PyRich(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-typing-extensions@3.7.4:3.99', type=('build', 'run')) + depends_on('py-typing-extensions@3.7.4:3', type=('build', 'run')) depends_on('py-dataclasses@0.7:0.8', when='^python@:3.6', type=('build', 'run')) - depends_on('py-pygments@2.6:2.99', type=('build', 'run')) - depends_on('py-commonmark@0.9.0:0.9.999', type=('build', 'run')) - depends_on('py-colorama@0.4.0:0.4.999', type=('build', 'run')) + depends_on('py-pygments@2.6:2', type=('build', 'run')) + depends_on('py-commonmark@0.9.0:0.9', type=('build', 'run')) + depends_on('py-colorama@0.4.0:0.4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-rise/package.py b/var/spack/repos/builtin/packages/py-rise/package.py index 3f4d480dfe..90848ec281 100644 --- a/var/spack/repos/builtin/packages/py-rise/package.py +++ b/var/spack/repos/builtin/packages/py-rise/package.py @@ -14,6 +14,6 @@ class PyRise(PythonPackage): version('5.6.1', sha256='1343f068d01adc4dd0226d9b278ce93fc92f365d827431a57e8d5679eb39f4d6') - depends_on('python@2.7:2.7.99,3.4:', type=('build', 'run')) + depends_on('python@2.7.0:2.7,3.4:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-notebook@5.5.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index 87a7b9d003..addbe28221 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -39,7 +39,7 @@ class PyRpy2(PythonPackage): depends_on('r@3.3:', when='@2.9.0:', type=('build', 'run')) depends_on('python@3.5:', when='@2.9.0:', type=('build', 'run')) depends_on('py-jinja2', when='@2.9.0:', type=('build', 'run')) - depends_on('py-six', when='@2.9.0:2.9.999', type=('build', 'run')) + depends_on('py-six', when='@2.9.0:2.9', type=('build', 'run')) # @:2.8.6 depends_on('r@2.8:', when='@:2.8.6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-s3transfer/package.py b/var/spack/repos/builtin/packages/py-s3transfer/package.py index f683e94820..aee85e6457 100644 --- a/var/spack/repos/builtin/packages/py-s3transfer/package.py +++ b/var/spack/repos/builtin/packages/py-s3transfer/package.py @@ -22,5 +22,5 @@ class PyS3transfer(PythonPackage): version('0.2.1', sha256='6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d') depends_on('py-setuptools', type='build') - depends_on('py-botocore@1.12.36:1.999', type=('build', 'run')) + depends_on('py-botocore@1.12.36:1', type=('build', 'run')) depends_on('py-futures@2.2:3', type=('build', 'run'), when='^python@:2') diff --git a/var/spack/repos/builtin/packages/py-sanic/package.py b/var/spack/repos/builtin/packages/py-sanic/package.py index facb5a13be..b72eda3490 100644 --- a/var/spack/repos/builtin/packages/py-sanic/package.py +++ b/var/spack/repos/builtin/packages/py-sanic/package.py @@ -18,12 +18,12 @@ class PySanic(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-wheel', type='build') depends_on('py-ujson') - depends_on('py-multidict@4.0:4.99') + depends_on('py-multidict@4.0:4') depends_on('py-aiofiles@0.3.0:') depends_on('py-httptools@0.0.10:') - depends_on('py-websockets@8.1:8.999') + depends_on('py-websockets@8.1:8') depends_on('py-httpx@0.11.1') - depends_on('py-websockets@8.1:8.999') + depends_on('py-websockets@8.1:8') depends_on('py-uvloop') depends_on('py-chardet') depends_on('py-hstspreload') diff --git a/var/spack/repos/builtin/packages/py-scikit-image/package.py b/var/spack/repos/builtin/packages/py-scikit-image/package.py index a8bd361cba..3f225a17a5 100644 --- a/var/spack/repos/builtin/packages/py-scikit-image/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-image/package.py @@ -38,7 +38,7 @@ class PyScikitImage(PythonPackage): depends_on('py-networkx@2.0:', type=('build', 'run'), when='@0.16.1:') depends_on('py-six', type=('build', 'run'), when='@:0.15.1') depends_on('py-matplotlib', type=('build', 'run')) - depends_on('py-matplotlib@2.0.0:2.9.999, 3.0.1:', type=('build', 'run'), when='@0.16.1:') + depends_on('py-matplotlib@2.0.0:2.9, 3.0.1:', type=('build', 'run'), when='@0.16.1:') depends_on('py-imageio@2.0.1:', type=('build', 'run'), when='@0.15.1:') depends_on('py-imageio@2.3.0:', type=('build', 'run'), when='@0.16.1:') depends_on('py-tifffile@2019.7.26:', type=('build', 'run'), when='@0.17.1:') diff --git a/var/spack/repos/builtin/packages/py-scikit-learn/package.py b/var/spack/repos/builtin/packages/py-scikit-learn/package.py index 42d3d15498..7295c23411 100644 --- a/var/spack/repos/builtin/packages/py-scikit-learn/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-learn/package.py @@ -38,18 +38,18 @@ class PyScikitLearn(PythonPackage): variant('openmp', default=True, description='Build with OpenMP support') depends_on('python@2.6:2.8,3.3:', when='@:0.19', type=('build', 'run')) - depends_on('python@2.7:2.8,3.4:', when='@0.20.0:0.20.999', type=('build', 'run')) + depends_on('python@2.7:2.8,3.4:', when='@0.20.0:0.20', type=('build', 'run')) depends_on('python@3.5:', when='@0.21:', type=('build', 'run')) depends_on('python@3.6:', when='@0.23:', type=('build', 'run')) depends_on('python@3.7:', when='@1.0:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy@1.6.1:', when='@:0.19', type=('build', 'run')) - depends_on('py-numpy@1.8.2:', when='@0.20.0:0.20.999', type=('build', 'run')) + depends_on('py-numpy@1.8.2:', when='@0.20.0:0.20', type=('build', 'run')) depends_on('py-numpy@1.11.0:', when='@0.21:', type=('build', 'run')) depends_on('py-numpy@1.13.3:', when='@0.23:', type=('build', 'run')) depends_on('py-numpy@1.14.6:', when='@1.0:', type=('build', 'run')) depends_on('py-scipy@0.9:', when='@:0.19', type=('build', 'run')) - depends_on('py-scipy@0.13.3:', when='@0.20.0:0.20.999', type=('build', 'run')) + depends_on('py-scipy@0.13.3:', when='@0.20.0:0.20', type=('build', 'run')) depends_on('py-scipy@0.17.0:', when='@0.21:', type=('build', 'run')) depends_on('py-scipy@0.19.1:', when='@0.23:', type=('build', 'run')) depends_on('py-scipy@1.1.0:', when='@1.0:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 54d367324c..8184debba5 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -46,27 +46,27 @@ class PyScipy(PythonPackage): version('0.15.1', sha256='a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a') version('0.15.0', sha256='0c74e31e08acc8bf9b6ceb9bced73df2ae0cc76003e0366350bc7b26292bf8b1') - depends_on('python@2.6:2.8,3.2:', when='@:0.17.999', type=('build', 'link', 'run')) - depends_on('python@2.7:2.8,3.4:', when='@0.18:1.2.999', type=('build', 'link', 'run')) - depends_on('python@3.5:', when='@1.3:1.4.999', type=('build', 'link', 'run')) - depends_on('python@3.6:', when='@1.5:1.5.999', type=('build', 'link', 'run')) + depends_on('python@2.6:2.8,3.2:', when='@:0.17', type=('build', 'link', 'run')) + depends_on('python@2.7:2.8,3.4:', when='@0.18:1.2', type=('build', 'link', 'run')) + depends_on('python@3.5:', when='@1.3:1.4', type=('build', 'link', 'run')) + depends_on('python@3.6:', when='@1.5.0:1.5', type=('build', 'link', 'run')) depends_on('python@3.7:', when='@1.6:1.6.1', type=('build', 'link', 'run')) - depends_on('python@3.7:3.9.999', when='@1.6.2:', type=('build', 'link', 'run')) + depends_on('python@3.7:3.9', when='@1.6.2:', type=('build', 'link', 'run')) depends_on('py-setuptools', when='@:1.5', type='build') depends_on('py-setuptools@:51.0.0', when='@1.6', type='build') depends_on('py-setuptools@:57', when='@1.7:', type='build') depends_on('py-pybind11@2.2.4:', when='@1.4.0', type=('build', 'link')) - depends_on('py-pybind11@2.4.0:', when='@1.4.1:1.4.999', type=('build', 'link')) + depends_on('py-pybind11@2.4.0:', when='@1.4.1:1.4', type=('build', 'link')) depends_on('py-pybind11@2.4.3:', when='@1.5:1.6.1', type=('build', 'link')) - depends_on('py-pybind11@2.4.3:2.6.999', when='@1.6.2:', type=('build', 'link')) - depends_on('py-numpy@1.5.1:+blas+lapack', when='@:0.15.999', type=('build', 'link', 'run')) - depends_on('py-numpy@1.6.2:+blas+lapack', when='@0.16:0.17.999', type=('build', 'link', 'run')) - depends_on('py-numpy@1.7.1:+blas+lapack', when='@0.18:0.18.999', type=('build', 'link', 'run')) - depends_on('py-numpy@1.8.2:+blas+lapack', when='@0.19:1.2.999', type=('build', 'link', 'run')) - depends_on('py-numpy@1.13.3:+blas+lapack', when='@1.3:1.4.999', type=('build', 'link', 'run')) - depends_on('py-numpy@1.14.5:+blas+lapack', when='@1.5:1.5.999', type=('build', 'link', 'run')) + depends_on('py-pybind11@2.4.3:2.6', when='@1.6.2:', type=('build', 'link')) + depends_on('py-numpy@1.5.1:+blas+lapack', when='@:0.15', type=('build', 'link', 'run')) + depends_on('py-numpy@1.6.2:+blas+lapack', when='@0.16:0.17', type=('build', 'link', 'run')) + depends_on('py-numpy@1.7.1:+blas+lapack', when='@0.18.0:0.18', type=('build', 'link', 'run')) + depends_on('py-numpy@1.8.2:+blas+lapack', when='@0.19:1.2', type=('build', 'link', 'run')) + depends_on('py-numpy@1.13.3:+blas+lapack', when='@1.3:1.4', type=('build', 'link', 'run')) + depends_on('py-numpy@1.14.5:+blas+lapack', when='@1.5.0:1.5', type=('build', 'link', 'run')) depends_on('py-numpy@1.16.5:+blas+lapack', when='@1.6:1.6.1', type=('build', 'link', 'run')) - depends_on('py-numpy@1.16.5:1.22.999+blas+lapack', when='@1.6.2:', type=('build', 'link', 'run')) + depends_on('py-numpy@1.16.5:1.22+blas+lapack', when='@1.6.2:', type=('build', 'link', 'run')) depends_on('py-cython@0.29.18:2.9', when='@1.7:', type='build') depends_on('py-pythran@0.9.11:', when='@1.7:', type=('build', 'link')) depends_on('py-pytest', type='test') diff --git a/var/spack/repos/builtin/packages/py-seqeval/package.py b/var/spack/repos/builtin/packages/py-seqeval/package.py index de534624dc..e0cb226044 100644 --- a/var/spack/repos/builtin/packages/py-seqeval/package.py +++ b/var/spack/repos/builtin/packages/py-seqeval/package.py @@ -17,7 +17,7 @@ class PySeqeval(PythonPackage): version('1.2.2', sha256='f28e97c3ab96d6fcd32b648f6438ff2e09cfba87f05939da9b3970713ec56e6f') - depends_on('python@2.6:2.999,3.3:', type=('build', 'run')) + depends_on('python@2.6:2,3.3:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy@1.14:', type=('build', 'run')) depends_on('py-scikit-learn@0.21.3:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-slepc4py/package.py b/var/spack/repos/builtin/packages/py-slepc4py/package.py index 80ea5eb0d6..e027a0dbea 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -34,26 +34,26 @@ class PySlepc4py(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-petsc4py', type=('build', 'run')) - depends_on('py-petsc4py@3.15:3.15.99', when='@3.15:3.15.99', type=('build', 'run')) - depends_on('py-petsc4py@3.13:3.13.99', when='@3.13:3.13.99', type=('build', 'run')) - depends_on('py-petsc4py@3.12:3.12.99', when='@3.12:3.12.99', type=('build', 'run')) - depends_on('py-petsc4py@3.11:3.11.99', when='@3.11:3.11.99', type=('build', 'run')) - depends_on('py-petsc4py@3.10:3.10.99', when='@3.10:3.10.99', type=('build', 'run')) - depends_on('py-petsc4py@3.9:3.9.99', when='@3.9:3.9.99', type=('build', 'run')) - depends_on('py-petsc4py@3.8:3.8.99', when='@3.8:3.8.99', type=('build', 'run')) - depends_on('py-petsc4py@3.7:3.7.99', when='@3.7:3.7.99', type=('build', 'run')) - depends_on('py-petsc4py@3.6:3.6.99', when='@3.6:3.6.99', type=('build', 'run')) + depends_on('py-petsc4py@3.15.0:3.15', when='@3.15.0:3.15', type=('build', 'run')) + depends_on('py-petsc4py@3.13.0:3.13', when='@3.13.0:3.13', type=('build', 'run')) + depends_on('py-petsc4py@3.12.0:3.12', when='@3.12.0:3.12', type=('build', 'run')) + depends_on('py-petsc4py@3.11.0:3.11', when='@3.11.0:3.11', type=('build', 'run')) + depends_on('py-petsc4py@3.10.0:3.10', when='@3.10.0:3.10', type=('build', 'run')) + 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.15:3.15.99', when='@3.15:3.15.99') - depends_on('slepc@3.13:3.13.99', when='@3.13:3.13.99') - depends_on('slepc@3.12:3.12.99', when='@3.12:3.12.99') - depends_on('slepc@3.11:3.11.99', when='@3.11:3.11.99') - depends_on('slepc@3.10:3.10.99', when='@3.10:3.10.99') - depends_on('slepc@3.9:3.9.99', when='@3.9:3.9.99') - depends_on('slepc@3.8:3.8.99', when='@3.8:3.8.99') - depends_on('slepc@3.7:3.7.99', when='@3.7:3.7.99') - depends_on('slepc@3.6:3.6.99', when='@3.6:3.6.99') + depends_on('slepc@3.15.0:3.15', when='@3.15.0:3.15') + depends_on('slepc@3.13.0:3.13', when='@3.13.0:3.13') + depends_on('slepc@3.12.0:3.12', when='@3.12.0:3.12') + depends_on('slepc@3.11.0:3.11', when='@3.11.0:3.11') + depends_on('slepc@3.10.0:3.10', when='@3.10.0:3.10') + 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-spacy-models-en-core-web-sm/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py index e0e236fe76..315dd4f781 100644 --- a/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-models-en-core-web-sm/package.py @@ -16,4 +16,4 @@ class PySpacyModelsEnCoreWebSm(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-spacy@2.2.2:', type=('build', 'run'), when='@:2.2.5') - depends_on('py-spacy@2.3.0:2.3.999', type=('build', 'run'), when='@2.3.1:') + depends_on('py-spacy@2.3.0:2.3', type=('build', 'run'), when='@2.3.1:') diff --git a/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py index 05409a3901..a0b56a69c9 100644 --- a/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py +++ b/var/spack/repos/builtin/packages/py-spacy-models-en-vectors-web-lg/package.py @@ -13,4 +13,4 @@ class PySpacyModelsEnVectorsWebLg(PythonPackage): version('2.3.0', sha256='839c177a604cd916e10700b43f7c80ca67fff1f3b5961847ef6c01c8b308e08d') depends_on('py-setuptools', type='build') - depends_on('py-spacy@2.3.0:2.3.999', type=('build', 'run')) + depends_on('py-spacy@2.3.0:2.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-spacy/package.py b/var/spack/repos/builtin/packages/py-spacy/package.py index c120ba17fe..e95b6798b0 100644 --- a/var/spack/repos/builtin/packages/py-spacy/package.py +++ b/var/spack/repos/builtin/packages/py-spacy/package.py @@ -14,22 +14,22 @@ class PySpacy(PythonPackage): version('2.3.2', sha256='818de26e0e383f64ccbe3db185574920de05923d8deac8bbb12113b9e33cee1f') version('2.2.4', sha256='f0f3a67c5841e6e35d62c98f40ebb3d132587d3aba4f4dccac5056c4e90ff5b9') - depends_on('python@2.7:2.8,3.4:', type=('build', 'run'), when='@2.2.4:2.2.999') + depends_on('python@2.7:2.8,3.4:', type=('build', 'run'), when='@2.2.4:2.2') depends_on('python@2.7:2.8,3.5:', type=('build', 'run'), when='@2.3.0:') depends_on('py-wheel', type='build') depends_on('py-cython@0.25:', type='build') - depends_on('py-cymem@2.0.2:2.0.999', type=('build', 'run')) - depends_on('py-preshed@3.0.2:3.0.999', type=('build', 'run')) + depends_on('py-cymem@2.0.2:2.0', type=('build', 'run')) + depends_on('py-preshed@3.0.2:3.0', type=('build', 'run')) depends_on('py-murmurhash@0.28:1.0', type=('build', 'run')) - depends_on('py-thinc@7.4.0', type=('build', 'run'), when='@2.2.4:2.2.999') + depends_on('py-thinc@7.4.0', type=('build', 'run'), when='@2.2.4:2.2') depends_on('py-thinc@7.4.1', type=('build', 'run'), when='@2.3.0:') - depends_on('py-blis@0.4.0:0.4.999', type=('build', 'run')) - depends_on('py-wasabi@0.4.0:1.0.999', type=('build', 'run')) - depends_on('py-srsly@1.0.2:1.0.999', type=('build', 'run')) + depends_on('py-blis@0.4.0:0.4', type=('build', 'run')) + depends_on('py-wasabi@0.4.0:1.0', type=('build', 'run')) + depends_on('py-srsly@1.0.2:1.0', type=('build', 'run')) depends_on('py-catalogue@0.0.7:1.0', type=('build', 'run')) - depends_on('py-tqdm@4.38:4.999', type=('build', 'run')) + depends_on('py-tqdm@4.38:4', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('py-numpy@1.15:', type=('build', 'run')) depends_on('py-plac@0.9.6:1.1', type=('build', 'run')) - depends_on('py-requests@2.13:2.999', type=('build', 'run')) + depends_on('py-requests@2.13:2', type=('build', 'run')) depends_on('py-pathlib@1.0.1', when='^python@:3.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-sparse/package.py b/var/spack/repos/builtin/packages/py-sparse/package.py index 814b5aa6e5..a1c204f8a5 100644 --- a/var/spack/repos/builtin/packages/py-sparse/package.py +++ b/var/spack/repos/builtin/packages/py-sparse/package.py @@ -14,7 +14,7 @@ class PySparse(PythonPackage): version('0.11.2', sha256='365b6f038c4d331b3913e5fb00f5bc5dc5eadc49ef2feef332214f9bf33dbc82') - depends_on('python@3.6:3.999', type=('build', 'run')) + depends_on('python@3.6:3', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) depends_on('py-scipy@0.19:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-spatialist/package.py b/var/spack/repos/builtin/packages/py-spatialist/package.py index 1925711eda..46f0fba974 100644 --- a/var/spack/repos/builtin/packages/py-spatialist/package.py +++ b/var/spack/repos/builtin/packages/py-spatialist/package.py @@ -27,7 +27,7 @@ class PySpatialist(PythonPackage): depends_on('py-ipython', type=('build', 'run')) depends_on('py-ipywidgets', type=('build', 'run')) depends_on('py-matplotlib', type=('build', 'run')) - depends_on('py-prompt-toolkit@2.0.10:2.0.999', type=('build', 'run')) + depends_on('py-prompt-toolkit@2.0.10:2.0', type=('build', 'run')) depends_on('py-pathos@0.2:', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-scoop', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-speech-recognition/package.py b/var/spack/repos/builtin/packages/py-speech-recognition/package.py index e8dfa4ced2..2d68b07620 100644 --- a/var/spack/repos/builtin/packages/py-speech-recognition/package.py +++ b/var/spack/repos/builtin/packages/py-speech-recognition/package.py @@ -15,5 +15,5 @@ class PySpeechRecognition(PythonPackage): version('3.8.1', sha256='82d3313db383409ddaf3e42625fb0c3518231a1feb5e2ed5473b10b3d5ece7bd') - depends_on('python@2.6:2.999,3.3:', type=('build', 'run')) + depends_on('python@2.6:2,3.3:', type=('build', 'run')) depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index 5a94395e1b..788b915440 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -40,7 +40,7 @@ class PySphinx(PythonPackage): depends_on('python@3.5:', when='@2:', type=('build', 'run')) depends_on('python@2.7:2.8,3.4:', when='@:1', type=('build', 'run')) - depends_on('py-sphinxcontrib-websupport', when='@1.6:1.999', type=('build', 'run')) + depends_on('py-sphinxcontrib-websupport', when='@1.6:1', type=('build', 'run')) depends_on('py-sphinxcontrib-applehelp', when='@2:', type=('build', 'run')) depends_on('py-sphinxcontrib-devhelp', when='@2:', type=('build', 'run')) depends_on('py-sphinxcontrib-jsmath', when='@2:', type=('build', 'run')) @@ -51,13 +51,13 @@ class PySphinx(PythonPackage): depends_on('py-sphinxcontrib-qthelp', when='@2:', type=('build', 'run')) depends_on('py-six@1.5:', when='@:1', type=('build', 'run')) depends_on('py-jinja2@2.3:', type=('build', 'run')) - depends_on('py-jinja2@2.3:2.999', when='@:4.0.1', type=('build', 'run')) + depends_on('py-jinja2@2.3:2', when='@:4.0.1', type=('build', 'run')) depends_on('py-pygments@2.0:', type=('build', 'run')) depends_on('py-docutils@0.14:0.17', when='@4:', type=('build', 'run')) depends_on('py-docutils@0.12:', when='@:3', type=('build', 'run')) depends_on('py-snowballstemmer@1.1:', type=('build', 'run')) - depends_on('py-babel@1.3:1.999,2.1:', type=('build', 'run')) - depends_on('py-alabaster@0.7.0:0.7.999', type=('build', 'run')) + depends_on('py-babel@1.3:1,2.1:', type=('build', 'run')) + depends_on('py-alabaster@0.7.0:0.7', type=('build', 'run')) depends_on('py-imagesize', when='@1.4:', type=('build', 'run')) depends_on('py-requests@2.5.0:', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-spyder/package.py b/var/spack/repos/builtin/packages/py-spyder/package.py index a5ee45024a..43adf99b9f 100644 --- a/var/spack/repos/builtin/packages/py-spyder/package.py +++ b/var/spack/repos/builtin/packages/py-spyder/package.py @@ -29,7 +29,7 @@ class PySpyder(PythonPackage): # with this change until @3.2.0 # https://github.com/PyCQA/pycodestyle/issues/466 # https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md#version-32-2017-07-24 - depends_on('py-pycodestyle@:1.7.1', when='@:3.1.99', type=('build', 'run')) + depends_on('py-pycodestyle@:1.7.1', when='@:3.1', type=('build', 'run')) depends_on('py-pycodestyle@2.1.0:', when='@3.2.0:', type=('build', 'run')) depends_on('py-pylint', type=('build', 'run')) depends_on('py-psutil', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-spykeutils/package.py b/var/spack/repos/builtin/packages/py-spykeutils/package.py index 941a5aa54b..d58a55a411 100644 --- a/var/spack/repos/builtin/packages/py-spykeutils/package.py +++ b/var/spack/repos/builtin/packages/py-spykeutils/package.py @@ -17,4 +17,4 @@ class PySpykeutils(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-scipy', type=('build', 'run')) depends_on('py-quantities', type=('build', 'run')) - depends_on('py-neo@0.2.1:0.3.99', type=('build', 'run')) + depends_on('py-neo@0.2.1:0.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py index 8e342fd738..128c263f71 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py @@ -44,9 +44,9 @@ class PySqlalchemy(PythonPackage): # >=1.4.0 depends_on('py-mysqlclient@1.4:', when='backend=mysql @1.4: ^python@3:', type=('build', 'run')) - depends_on('py-mysqlclient@1.4:,:1.99', when='backend=mysql @1.4: ^python@:2.7', type=('build', 'run')) + depends_on('py-mysqlclient@1.4:,:1', when='backend=mysql @1.4: ^python@:2.7', type=('build', 'run')) depends_on('py-pymysql', when='backend=pymysql @1.4: ^python@3:', type=('build', 'run')) - depends_on('py-pymysql@:0.999', when='backend=pymysql @1.4: ^python@:2.7', type=('build', 'run')) + depends_on('py-pymysql@:0', when='backend=pymysql @1.4: ^python@:2.7', type=('build', 'run')) depends_on('py-psycopg2@2.7:', when='backend=postgresql @1.4:', type=('build', 'run')) # < 1.4.0 diff --git a/var/spack/repos/builtin/packages/py-tables/package.py b/var/spack/repos/builtin/packages/py-tables/package.py index 551c774f7b..706d2e0e49 100644 --- a/var/spack/repos/builtin/packages/py-tables/package.py +++ b/var/spack/repos/builtin/packages/py-tables/package.py @@ -35,7 +35,7 @@ class PyTables(PythonPackage): depends_on('py-numexpr@2.6.2:', type=('build', 'run')) depends_on('py-six@1.9.0:', when='@:3.5', type=('build', 'run')) # tables/req_versions.py - depends_on('hdf5@1.8.4:1.8.999', when='@:3.3.99') + depends_on('hdf5@1.8.4:1.8', when='@:3.3') depends_on('hdf5@1.8.4:', when='@3.4.0:') # Versions prior to 3.3 must build with the internal blosc due to a lock # problem in a multithreaded environment. diff --git a/var/spack/repos/builtin/packages/py-tap-py/package.py b/var/spack/repos/builtin/packages/py-tap-py/package.py index 4af1d074ea..103ea17122 100644 --- a/var/spack/repos/builtin/packages/py-tap-py/package.py +++ b/var/spack/repos/builtin/packages/py-tap-py/package.py @@ -21,6 +21,6 @@ class PyTapPy(PythonPackage): depends_on('python@3.5:3.7', when='@3.0:') depends_on('python@2.7:2.8,3.5:3.7', when='@2.6') depends_on('python@2.6:2.8,3.2:3.4', when='@:1.8') - depends_on('py-nose', type=('build', 'run'), when='@:1.99') - depends_on('py-pygments', type=('build', 'run'), when='@:1.99') + depends_on('py-nose', type=('build', 'run'), when='@:1') + depends_on('py-pygments', type=('build', 'run'), when='@:1') depends_on('py-setuptools', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-tatsu/package.py b/var/spack/repos/builtin/packages/py-tatsu/package.py index eb831caa2a..6ce48a12a6 100644 --- a/var/spack/repos/builtin/packages/py-tatsu/package.py +++ b/var/spack/repos/builtin/packages/py-tatsu/package.py @@ -21,6 +21,6 @@ class PyTatsu(PythonPackage): depends_on('python@3.6:', type=('build', 'run'), when='@4.5:') depends_on('py-setuptools', type='build') # part of the standard lib in python@3.7.0, required in the current HEAD - depends_on('py-dataclasses@0.6:', type=('build', 'run'), when='@4.5:^python@:3.6.99') + depends_on('py-dataclasses@0.6:', type=('build', 'run'), when='@4.5:^python@:3.6') # optional dependency, otherwise falls back to standard implementation depends_on('py-regex@2018.8:', type=('build', 'run'), when='+future_regex') diff --git a/var/spack/repos/builtin/packages/py-tenacity/package.py b/var/spack/repos/builtin/packages/py-tenacity/package.py index 0e6393167c..b1beb7128a 100644 --- a/var/spack/repos/builtin/packages/py-tenacity/package.py +++ b/var/spack/repos/builtin/packages/py-tenacity/package.py @@ -21,6 +21,6 @@ class PyTenacity(PythonPackage): depends_on('py-six@1.9.0:', type=('build', 'run')) - depends_on('py-futures@3.0:', when='^python@:2.999', type=('build', 'run')) - depends_on('py-monotonic@0.6:', when='^python@:2.999', type=('build', 'run')) - depends_on('py-typing@3.7.4.1:', when='^python@:2.999', type=('build', 'run')) + depends_on('py-futures@3.0:', when='^python@:2', type=('build', 'run')) + depends_on('py-monotonic@0.6:', when='^python@:2', type=('build', 'run')) + depends_on('py-typing@3.7.4.1:', when='^python@:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-tensorboard/package.py b/var/spack/repos/builtin/packages/py-tensorboard/package.py index 2f043eafd1..d02154959a 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard/package.py @@ -26,18 +26,18 @@ class PyTensorboard(Package): depends_on('py-setuptools@41.0.0:', type=('build', 'run')) depends_on('py-absl-py@0.4:', type=('build', 'run')) depends_on('py-markdown@2.6.8:', type=('build', 'run')) - depends_on('py-requests@2.21.0:2.999', type=('build', 'run')) + depends_on('py-requests@2.21.0:2', type=('build', 'run')) depends_on('py-futures@3.1.1:', type=('build', 'run'), when='^python@:2') depends_on('py-grpcio@1.24.3:', type=('build', 'run'), when='@2.3:') depends_on('py-grpcio@1.23.3:', type=('build', 'run'), when='@2.2') - depends_on('py-google-auth@1.6.3:1.99.99', type=('build', 'run')) + depends_on('py-google-auth@1.6.3:1', type=('build', 'run')) depends_on('py-numpy@1.12.0:', type=('build', 'run')) depends_on('py-protobuf@3.6.0:', type=('build', 'run')) depends_on('py-six@1.10.0:', type=('build', 'run')) depends_on('py-werkzeug@0.11.15:', type=('build', 'run')) depends_on('py-wheel', type=('build', 'run')) depends_on('py-wheel@0.26:', type=('build', 'run'), when='@0.6: ^python@3:') - depends_on('py-google-auth-oauthlib@0.4.1:0.4.999', type=('build', 'run')) + depends_on('py-google-auth-oauthlib@0.4.1:0.4', type=('build', 'run')) depends_on('py-tensorboard-plugin-wit@1.6.0:', type=('build', 'run'), when='@2.2.0:') extends('python') diff --git a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py index 71d49302c5..04b4a8c225 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py @@ -26,11 +26,11 @@ class PyTensorflowEstimator(Package): extends('python') - depends_on('py-tensorflow@2.4.0:2.4.999', type=('build', 'run'), when='@2.4.0') - depends_on('py-tensorflow@2.3.0:2.3.999', type=('build', 'run'), when='@2.3.0') - depends_on('py-tensorflow@2.2.0:2.2.999', type=('build', 'run'), when='@2.2.0') - depends_on('py-tensorflow@2.1.0:2.1.999', type=('build', 'run'), when='@2.1') - depends_on('py-tensorflow@2.0.0:2.0.999', type=('build', 'run'), when='@2.0.0') + depends_on('py-tensorflow@2.4.0:2.4', type=('build', 'run'), when='@2.4.0') + depends_on('py-tensorflow@2.3.0:2.3', type=('build', 'run'), when='@2.3.0') + depends_on('py-tensorflow@2.2.0:2.2', type=('build', 'run'), when='@2.2.0') + depends_on('py-tensorflow@2.1.0:2.1', type=('build', 'run'), when='@2.1') + depends_on('py-tensorflow@2.0.0:2.0', type=('build', 'run'), when='@2.0.0') depends_on('py-tensorflow@1.13.1', type=('build', 'run'), when='@1.13.0') depends_on('bazel@0.19.0:', type='build') diff --git a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py index f3a483557a..109a99d05d 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-probability/package.py @@ -31,7 +31,7 @@ class PyTensorflowProbability(Package): depends_on('py-decorator', type=('build', 'run')) depends_on('py-tensorflow@1.14:', type=('build', 'run'), when='@0.8.0') - depends_on('py-gast@0.2:0.2.999', type=('build', 'run'), when='@0.8.0') + depends_on('py-gast@0.2.0:0.2', type=('build', 'run'), when='@0.8.0') depends_on('py-cloudpickle@1.1.1', type=('build', 'run'), when='@0.8.0') depends_on('py-tensorflow@2.4:', type=('build', 'run'), when='@0.12.0:') diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index 8fd5390ed2..916108e7be 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -111,9 +111,9 @@ class PyTensorflow(Package, CudaPackage): # Need to investigate further. # See _TF_MIN_BAZEL_VERSION and _TF_MAX_BAZEL_VERSION in configure.py - depends_on('bazel@3.1.0:3.99.0', type='build', when='@2.3:') - depends_on('bazel@2.0.0', type='build', when='@2.2.0:2.2.999') - depends_on('bazel@0.27.1:0.29.1', type='build', when='@2.1.0:2.1.999') + depends_on('bazel@3.1.0:3', type='build', when='@2.3:') + depends_on('bazel@2.0.0', type='build', when='@2.2.0:2.2') + depends_on('bazel@0.27.1:0.29.1', type='build', when='@2.1.0:2.1') depends_on('bazel@0.24.1:0.26.1', type='build', when='@1.15:2.0') # See call to check_bazel_version in configure.py depends_on('bazel@0.24.1:0.25.2', type='build', when='@1.14.0') @@ -138,10 +138,10 @@ class PyTensorflow(Package, CudaPackage): depends_on('py-future', type='build', when='^python@:2') # Listed under REQUIRED_PACKAGES in tensorflow/tools/pip_package/setup.py - depends_on('py-absl-py@0.10:0.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-absl-py@0.10:0', type=('build', 'run'), when='@2.4.0:') depends_on('py-absl-py@0.7.0:', type=('build', 'run'), when='@1.12.1,1.14:2.3') depends_on('py-absl-py@0.1.6:', type=('build', 'run'), when='@1.5:1.11') - depends_on('py-astunparse@1.6.3:1.6.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-astunparse@1.6.3:1.6', type=('build', 'run'), when='@2.4.0:') depends_on('py-astunparse@1.6.3', type=('build', 'run'), when='@2.2:2.3') depends_on('py-astor@0.6.0:', type=('build', 'run'), when='@1.6:2.1') depends_on('py-backports-weakref@1.0:', type=('build', 'run'), when='@1.3: ^python@:3.3') @@ -151,35 +151,35 @@ class PyTensorflow(Package, CudaPackage): depends_on('py-gast@0.3.3', type=('build', 'run'), when='@2.2:') depends_on('py-gast@0.2.2', type=('build', 'run'), when='@1.15:2.1') depends_on('py-gast@0.2.0:', type=('build', 'run'), when='@1.6:1.14') - depends_on('py-google-pasta@0.2:0.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-google-pasta@0.2:0', type=('build', 'run'), when='@2.4.0:') depends_on('py-google-pasta@0.1.8:', type=('build', 'run'), when='@2.1:2.3') depends_on('py-google-pasta@0.1.6:', type=('build', 'run'), when='@1.14:2.0') depends_on('py-google-pasta@0.1.2:', type=('build', 'run'), when='@1.12.1') # propagate the mpi variant setting for h5py/hdf5 to avoid unexpected crashes - depends_on('py-h5py@2.10.0:2.10.999+mpi', type=('build', 'run'), when='@2.2:+mpi') - depends_on('py-h5py@2.10.0:2.10.999~mpi', type=('build', 'run'), when='@2.2:~mpi') + depends_on('py-h5py@2.10.0:2.10+mpi', type=('build', 'run'), when='@2.2:+mpi') + depends_on('py-h5py@2.10.0:2.10~mpi', type=('build', 'run'), when='@2.2:~mpi') depends_on('hdf5+mpi', type='build', when='@2.2:+mpi') depends_on('hdf5~mpi', type='build', when='@2.2:~mpi') depends_on('py-keras-applications@1.0.8:', type=('build', 'run'), when='@1.15:2.1') depends_on('py-keras-applications@1.0.6:', type=('build', 'run'), when='@1.12:1.14') - depends_on('py-keras-applications@1.0.5:', type=('build', 'run'), when='@1.11.0:1.11.999') - depends_on('py-keras-preprocessing@1.1.2:1.1.999', type=('build', 'run'), when='@2.4:') - depends_on('py-keras-preprocessing@1.1.1:1.999', type=('build', 'run'), when='@2.3:2.3.999') + depends_on('py-keras-applications@1.0.5:', type=('build', 'run'), when='@1.11.0:1.11') + depends_on('py-keras-preprocessing@1.1.2:1.1', type=('build', 'run'), when='@2.4:') + depends_on('py-keras-preprocessing@1.1.1:1', type=('build', 'run'), when='@2.3.0:2.3') depends_on('py-keras-preprocessing@1.1.0:', type=('build', 'run'), when='@2.1:2.2') depends_on('py-keras-preprocessing@1.0.5:', type=('build', 'run'), when='@1.12:2.0') - depends_on('py-keras-preprocessing@1.0.3:', type=('build', 'run'), when='@1.11:1.11.999') + depends_on('py-keras-preprocessing@1.0.3:', type=('build', 'run'), when='@1.11.0:1.11') # https://github.com/tensorflow/tensorflow/issues/40688 - depends_on('py-numpy@1.19.2:1.19.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-numpy@1.19.2:1.19', type=('build', 'run'), when='@2.4.0:') depends_on('py-numpy@1.16.0:1.18', type=('build', 'run'), when='@1.13.2,1.15:2.3') depends_on('py-numpy@1.14.5:1.18', type=('build', 'run'), when='@1.12.1,1.14.0') depends_on('py-numpy@1.13.3:1.14.5', type=('build', 'run'), when='@1.10.0:1.10.1') depends_on('py-numpy@1.13.3:', type=('build', 'run'), when='@1.6:1.9') depends_on('py-numpy@1.12.1:', type=('build', 'run'), when='@1.4:1.5') depends_on('py-numpy@1.11.0:', type=('build', 'run'), when='@0.11:1.3') - depends_on('py-numpy@1.10.1:', type=('build', 'run'), when='@0.7.1:0.7.999 platform=darwin') + depends_on('py-numpy@1.10.1:', type=('build', 'run'), when='@0.7.1:0.7 platform=darwin') depends_on('py-numpy@1.8.2:', type=('build', 'run'), when='@0.6:0.10') depends_on('py-numpy@1.9.2:', type=('build', 'run'), when='@0.5.0') - depends_on('py-opt-einsum@3.3.0:3.3.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-opt-einsum@3.3.0:3.3', type=('build', 'run'), when='@2.4.0:') depends_on('py-opt-einsum@2.3.2:', type=('build', 'run'), when='@1.15:2.3') depends_on('py-protobuf@3.9.2:', type=('build', 'run'), when='@2.3:') depends_on('py-protobuf@3.8.0:', type=('build', 'run'), when='@2.1:2.2') @@ -194,29 +194,29 @@ class PyTensorflow(Package, CudaPackage): depends_on('py-protobuf@3.0.0b2', type=('build', 'run'), when='@0.7.1:0.10') depends_on('py-protobuf@3.0.0a3', type=('build', 'run'), when='@0.6:0.7.0') depends_on('protobuf') - depends_on('flatbuffers+python@1.12.0:1.12.999', type=('build', 'run'), when='@2.4.0:') + depends_on('flatbuffers+python@1.12.0:1.12', type=('build', 'run'), when='@2.4.0:') # tensorboard # tensorflow-estimator - depends_on('py-termcolor@1.1.0:1.1.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-termcolor@1.1.0:1.1', type=('build', 'run'), when='@2.4.0:') depends_on('py-termcolor@1.1.0:', type=('build', 'run'), when='@1.6:2.3') - depends_on('py-wrapt@1.12.1:1.12.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-wrapt@1.12.1:1.12', type=('build', 'run'), when='@2.4.0:') depends_on('py-wrapt@1.11.1:', type=('build', 'run'), when='@1.12.1,1.14:2.3') depends_on('py-wheel', type=('build', 'run'), when='@0.6:2.3') depends_on('py-wheel@0.26:', type=('build', 'run'), when='@0.6:2.3 ^python@3:') - depends_on('py-wheel@0.35:0.999', type=('build', 'run'), when='@2.4.0: ^python@3:') + depends_on('py-wheel@0.35:0', type=('build', 'run'), when='@2.4.0: ^python@3:') depends_on('py-mock@2.0.0:', type=('build', 'run'), when='@0.10: ^python@:2') depends_on('py-functools32@3.2.3:', type=('build', 'run'), when='@1.15: ^python@:2') - depends_on('py-six@1.15.0:1.15.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-six@1.15.0:1.15', type=('build', 'run'), when='@2.4.0:') depends_on('py-six@1.12.0:', type=('build', 'run'), when='@2.1:2.3') depends_on('py-six@1.10.0:', type=('build', 'run'), when='@:2.0') depends_on('py-scipy@1.2.2', type=('build', 'run'), when='@2.1.0:2.1.1,2.2.0,2.3.0 ^python@:2') depends_on('py-scipy@1.4.1', type=('build', 'run'), when='@2.1.0:2.1.1,2.2.0,2.3.0 ^python@3:') depends_on('py-grpcio@1.8.6:', type=('build', 'run'), when='@1.6:1.7') - depends_on('py-typing-extensions@3.7.4:3.7.999', type=('build', 'run'), when='@2.4.0:') + depends_on('py-typing-extensions@3.7.4:3.7', type=('build', 'run'), when='@2.4.0:') if sys.byteorder == 'little': # Only builds correctly on little-endian machines depends_on('py-grpcio@1.8.6:', type=('build', 'run'), when='@1.8:2.3') - depends_on('py-grpcio@1.32.0:1.32.999', type=('build', 'run'), when='@2.4:') + depends_on('py-grpcio@1.32.0:1.32', type=('build', 'run'), when='@2.4:') # TODO: add packages for some of these dependencies depends_on('mkl', when='+mkl') @@ -287,10 +287,10 @@ class PyTensorflow(Package, CudaPackage): # "Remove contrib cloud bigtable and storage ops/kernels." # Allows 2.0.* releases to build with '--config=nogcp' patch('0001-Remove-contrib-cloud-bigtable-and-storage-ops-kernel.patch', - when='@2.0.0:2.0.999') + when='@2.0.0:2.0') # for fcc - patch('1-1_fcc_tf_patch.patch', when='@2.1.0:2.1.99%fj') + patch('1-1_fcc_tf_patch.patch', when='@2.1.0:2.1%fj') # do not import contrib.cloud if not available patch('https://github.com/tensorflow/tensorflow/commit/ed62ac8203999513dfae03498e871ea35eb60cc4.patch', @@ -672,7 +672,7 @@ def protobuf_deps(): '.tf_configure.bazelrc') # see tensorflow issue #31187 on github - if spec.satisfies('@2.0.0:2.0.999'): + if spec.satisfies('@2.0.0:2.0'): filter_file(r'\#define RUY_DONOTUSEDIRECTLY_AVX512 1', '#define RUY_DONOTUSEDIRECTLY_AVX512 0', 'tensorflow/lite/experimental/ruy/platform.h') diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py index ffee23c864..a54cfc1fb5 100644 --- a/var/spack/repos/builtin/packages/py-testinfra/package.py +++ b/var/spack/repos/builtin/packages/py-testinfra/package.py @@ -20,7 +20,7 @@ class PyTestinfra(PythonPackage): version('1.11.1', sha256='a54224c39d71fe120c1f4c88330397ddcb6f6362dc38e1ce9fd53290bccbf153') depends_on('py-setuptools', type='build') - depends_on('py-importlib', when='^python@2.6.0:2.6.999', type=('build', 'run')) + depends_on('py-importlib', when='^python@2.6.0:2.6', type=('build', 'run')) depends_on('py-pytest@:3.0.1,3.0.3:', type=('build', 'run')) depends_on('py-six@1.4:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-thinc/package.py b/var/spack/repos/builtin/packages/py-thinc/package.py index 051833128b..52b199e482 100644 --- a/var/spack/repos/builtin/packages/py-thinc/package.py +++ b/var/spack/repos/builtin/packages/py-thinc/package.py @@ -15,13 +15,13 @@ class PyThinc(PythonPackage): depends_on('py-setuptools', type='build') depends_on('py-murmurhash@0.28:1.0', type=('build', 'run')) - depends_on('py-cymem@2.0.2:2.0.999', type=('build', 'run')) + depends_on('py-cymem@2.0.2:2.0', type=('build', 'run')) depends_on('py-preshed@1.0.1:3.0', type=('build', 'run')) - depends_on('py-blis@0.4.0:0.4.999', type=('build', 'run')) + depends_on('py-blis@0.4.0:0.4', type=('build', 'run')) depends_on('py-wasabi@0.0.9:1.0', type=('build', 'run')) depends_on('py-srsly@0.0.6:1.0', type=('build', 'run')) depends_on('py-catalogue@0.0.7:1.0', type=('build', 'run')) depends_on('py-numpy@1.7:', type=('build', 'run')) depends_on('py-plac@0.9.6:1.1', type=('build', 'run')) - depends_on('py-tqdm@4.10:4.999', type=('build', 'run')) + depends_on('py-tqdm@4.10:4', type=('build', 'run')) depends_on('py-pathlib@1.0.1', when='^python@:3.3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-tomlkit/package.py b/var/spack/repos/builtin/packages/py-tomlkit/package.py index b5614bb648..41ea206e34 100644 --- a/var/spack/repos/builtin/packages/py-tomlkit/package.py +++ b/var/spack/repos/builtin/packages/py-tomlkit/package.py @@ -17,6 +17,6 @@ class PyTomlkit(PythonPackage): depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') - depends_on('py-enum34@1.1:1.999', when='^python@:2', type=('build', 'run')) - depends_on('py-functools32@3.2.3:3.999', when='^python@:2', type=('build', 'run')) - depends_on('py-typing@3.6:3.999', when='^python@:3.4', type=('build', 'run')) + depends_on('py-enum34@1.1:1', when='^python@:2', type=('build', 'run')) + depends_on('py-functools32@3.2.3:3', when='^python@:2', type=('build', 'run')) + depends_on('py-typing@3.6:3', when='^python@:3.4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index 01c6df3733..2872e613fc 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -85,18 +85,18 @@ class PyTorch(PythonPackage, CudaPackage): conflicts('+mpi', when='~distributed') conflicts('+gloo', when='~distributed') conflicts('+tensorpipe', when='~distributed') - conflicts('+kineto', when='@:1.7.999') - conflicts('+valgrind', when='@:1.7.999') - conflicts('~caffe2', when='@0.4.0:1.6.999') # no way to disable caffe2? + conflicts('+kineto', when='@:1.7') + conflicts('+valgrind', when='@:1.7') + conflicts('~caffe2', when='@0.4.0:1.6') # no way to disable caffe2? conflicts('+caffe2', when='@:0.3.1') # caffe2 did not yet exist? - conflicts('+tensorpipe', when='@:1.5.999') - conflicts('+xnnpack', when='@:1.4.999') - conflicts('~onnx_ml', when='@:1.4.999') # no way to disable ONNX? - conflicts('+rocm', when='@:0.4.999') - conflicts('+cudnn', when='@:0.4.999') - conflicts('+fbgemm', when='@:0.4.999,1.4.0') - conflicts('+qnnpack', when='@:0.4.999') - conflicts('+mkldnn', when='@:0.4.999') + conflicts('+tensorpipe', when='@:1.5') + conflicts('+xnnpack', when='@:1.4') + conflicts('~onnx_ml', when='@:1.4') # no way to disable ONNX? + conflicts('+rocm', when='@:0.4') + conflicts('+cudnn', when='@:0.4') + conflicts('+fbgemm', when='@:0.4,1.4.0') + conflicts('+qnnpack', when='@:0.4') + conflicts('+mkldnn', when='@:0.4') conflicts('cuda_arch=none', when='+cuda', msg='Must specify CUDA compute capabilities of your GPU, see ' @@ -109,9 +109,9 @@ class PyTorch(PythonPackage, CudaPackage): # See python_min_version in setup.py depends_on('python@3.6.2:', when='@1.7.1:', type=('build', 'link', 'run')) depends_on('python@3.6.1:', when='@1.6.0:1.7.0', type=('build', 'link', 'run')) - depends_on('python@3.5:', when='@1.5.0:1.5.999', type=('build', 'link', 'run')) - depends_on('python@2.7:2.8,3.5:', when='@1.4.0:1.4.999', type=('build', 'link', 'run')) - depends_on('python@2.7:2.8,3.5:3.7.999', when='@:1.3.999', type=('build', 'link', 'run')) + depends_on('python@3.5:', when='@1.5.0:1.5', type=('build', 'link', 'run')) + depends_on('python@2.7:2.8,3.5:', when='@1.4.0:1.4', type=('build', 'link', 'run')) + depends_on('python@2.7:2.8,3.5:3.7', when='@:1.3', type=('build', 'link', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('py-future', when='@1.5:', type=('build', 'run')) depends_on('py-future', when='@1.1: ^python@:2', type=('build', 'run')) @@ -119,11 +119,11 @@ class PyTorch(PythonPackage, CudaPackage): depends_on('py-typing', when='@0.4: ^python@:3.4', type=('build', 'run')) depends_on('py-typing-extensions', when='@1.7:', type=('build', 'run')) depends_on('py-pybind11@master', when='@master', type=('build', 'link', 'run')) - depends_on('py-pybind11@2.6.2', when='@1.8.0:1.9.999', type=('build', 'link', 'run')) - depends_on('py-pybind11@2.3.0', when='@1.1.0:1.7.999', type=('build', 'link', 'run')) - depends_on('py-pybind11@2.2.4', when='@1.0.0:1.0.999', type=('build', 'link', 'run')) - depends_on('py-pybind11@2.2.2', when='@0.4.0:0.4.999', type=('build', 'link', 'run')) - depends_on('py-dataclasses', when='@1.7: ^python@3.6.0:3.6.999', type=('build', 'run')) + depends_on('py-pybind11@2.6.2', when='@1.8.0:1.9', type=('build', 'link', 'run')) + depends_on('py-pybind11@2.3.0', when='@1.1.0:1.7', type=('build', 'link', 'run')) + depends_on('py-pybind11@2.2.4', when='@1.0.0:1.0', type=('build', 'link', 'run')) + depends_on('py-pybind11@2.2.2', when='@0.4.0:0.4', type=('build', 'link', 'run')) + depends_on('py-dataclasses', when='@1.7: ^python@3.6.0:3.6', type=('build', 'run')) depends_on('py-tqdm', type='run') depends_on('py-protobuf', when='@0.4:', type=('build', 'run')) depends_on('protobuf', when='@0.4:') @@ -132,32 +132,32 @@ class PyTorch(PythonPackage, CudaPackage): depends_on('eigen', when='@0.4:') # https://github.com/pytorch/pytorch/issues/60329 # depends_on('cpuinfo@master', when='@master') - # depends_on('cpuinfo@2020-12-17', when='@1.8.0:1.9.999') - # depends_on('cpuinfo@2020-06-11', when='@1.6.0:1.7.999') + # depends_on('cpuinfo@2020-12-17', when='@1.8.0:1.9') + # depends_on('cpuinfo@2020-06-11', when='@1.6.0:1.7') # https://github.com/shibatch/sleef/issues/427 # depends_on('sleef@master', when='@master') - # depends_on('sleef@3.5.1_2020-12-22', when='@1.8.0:1.9.999') + # depends_on('sleef@3.5.1_2020-12-22', when='@1.8.0:1.9') # https://github.com/pytorch/pytorch/issues/60334 - # depends_on('sleef@3.4.0_2019-07-30', when='@1.6.0:1.7.999') + # depends_on('sleef@3.4.0_2019-07-30', when='@1.6.0:1.7') # https://github.com/Maratyszcza/FP16/issues/18 # depends_on('fp16@master', when='@master') - # depends_on('fp16@2020-05-14', when='@1.6.0:1.9.999') + # depends_on('fp16@2020-05-14', when='@1.6.0:1.9') depends_on('pthreadpool@master', when='@master') - depends_on('pthreadpool@2021-04-13', when='@1.9.0:1.9.999') - depends_on('pthreadpool@2020-10-05', when='@1.8.0:1.8.999') - depends_on('pthreadpool@2020-06-15', when='@1.6.0:1.7.999') + depends_on('pthreadpool@2021-04-13', when='@1.9.0:1.9') + depends_on('pthreadpool@2020-10-05', when='@1.8.0:1.8') + depends_on('pthreadpool@2020-06-15', when='@1.6.0:1.7') depends_on('psimd@master', when='@master') - depends_on('psimd@2020-05-17', when='@1.6.0:1.9.999') + depends_on('psimd@2020-05-17', when='@1.6.0:1.9') depends_on('fxdiv@master', when='@master') - depends_on('fxdiv@2020-04-17', when='@1.6.0:1.9.999') + depends_on('fxdiv@2020-04-17', when='@1.6.0:1.9') depends_on('benchmark', when='@1.6:+test') # Optional dependencies depends_on('cuda@7.5:', when='+cuda', type=('build', 'link', 'run')) depends_on('cuda@9:', when='@1.1:+cuda', type=('build', 'link', 'run')) depends_on('cuda@9.2:', when='@1.6:+cuda', type=('build', 'link', 'run')) - depends_on('cudnn@6.0:7.999', when='@:1.0.999+cudnn') - depends_on('cudnn@7.0:7.999', when='@1.1.0:1.5.999+cudnn') + depends_on('cudnn@6.0:7', when='@:1.0+cudnn') + depends_on('cudnn@7.0:7', when='@1.1.0:1.5+cudnn') depends_on('cudnn@7.0:', when='@1.6.0:+cudnn') depends_on('magma', when='+magma') depends_on('nccl', when='+nccl') @@ -167,18 +167,18 @@ class PyTorch(PythonPackage, CudaPackage): depends_on('valgrind', when='+valgrind') # https://github.com/pytorch/pytorch/issues/60332 # depends_on('xnnpack@master', when='@master+xnnpack') - # depends_on('xnnpack@2021-02-22', when='@1.8.0:1.9.999+xnnpack') - # depends_on('xnnpack@2020-03-23', when='@1.6.0:1.7.999+xnnpack') + # depends_on('xnnpack@2021-02-22', when='@1.8.0:1.9+xnnpack') + # depends_on('xnnpack@2020-03-23', when='@1.6.0:1.7+xnnpack') depends_on('mpi', when='+mpi') # https://github.com/pytorch/pytorch/issues/60270 # depends_on('gloo@master', when='@master+gloo') - # depends_on('gloo@2021-05-04', when='@1.9.0:1.9.999+gloo') - # depends_on('gloo@2020-09-18', when='@1.7.0:1.8.999+gloo') - # depends_on('gloo@2020-03-17', when='@1.6.0:1.6.999+gloo') + # depends_on('gloo@2021-05-04', when='@1.9.0:1.9+gloo') + # depends_on('gloo@2020-09-18', when='@1.7.0:1.8+gloo') + # depends_on('gloo@2020-03-17', when='@1.6.0:1.6+gloo') # https://github.com/pytorch/pytorch/issues/60331 # depends_on('onnx@master', when='@master+onnx_ml') - # depends_on('onnx@1.8.0_2020-11-03', when='@1.8.0:1.9.999+onnx_ml') - # depends_on('onnx@1.7.0_2020-05-31', when='@1.6.0:1.7.999+onnx_ml') + # depends_on('onnx@1.8.0_2020-11-03', when='@1.8.0:1.9+onnx_ml') + # depends_on('onnx@1.7.0_2020-05-31', when='@1.6.0:1.7+onnx_ml') depends_on('mkl', when='+mkldnn') # Test dependencies @@ -200,15 +200,15 @@ class PyTorch(PythonPackage, CudaPackage): # Fixes CMake configuration error when XNNPACK is disabled # https://github.com/pytorch/pytorch/pull/35607 # https://github.com/pytorch/pytorch/pull/37865 - patch('xnnpack.patch', when='@1.5.0:1.5.999') + patch('xnnpack.patch', when='@1.5.0:1.5') # Fixes build error when ROCm is enabled for pytorch-1.5 release - patch('rocm.patch', when='@1.5.0:1.5.999+rocm') + patch('rocm.patch', when='@1.5.0:1.5+rocm') # Fixes fatal error: sleef.h: No such file or directory # https://github.com/pytorch/pytorch/pull/35359 # https://github.com/pytorch/pytorch/issues/26555 - # patch('sleef.patch', when='@1.0.0:1.5.999') + # patch('sleef.patch', when='@1.0.0:1.5') # Fixes compilation with Clang 9.0.0 and Apple Clang 11.0.3 # https://github.com/pytorch/pytorch/pull/37086 @@ -218,7 +218,7 @@ class PyTorch(PythonPackage, CudaPackage): # Removes duplicate definition of getCusparseErrorString # https://github.com/pytorch/pytorch/issues/32083 - patch('cusparseGetErrorString.patch', when='@0.4.1:1.0.999^cuda@10.1.243:') + patch('cusparseGetErrorString.patch', when='@0.4.1:1.0^cuda@10.1.243:') # Fixes 'FindOpenMP.cmake' # to detect openmp settings used by Fujitsu compiler. diff --git a/var/spack/repos/builtin/packages/py-torchfile/package.py b/var/spack/repos/builtin/packages/py-torchfile/package.py index 5e4c9fb459..eb3b13dec0 100644 --- a/var/spack/repos/builtin/packages/py-torchfile/package.py +++ b/var/spack/repos/builtin/packages/py-torchfile/package.py @@ -18,5 +18,5 @@ class PyTorchfile(PythonPackage): version('0.1.0', sha256='a53dfe134b737845a9f2cb24fe0585317874f965932cebdb0439d13c8da4136e') - depends_on('python@2.7:2.999,3.4:', type=('build', 'run')) + depends_on('python@2.7:2,3.4:', type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-torchmeta/package.py b/var/spack/repos/builtin/packages/py-torchmeta/package.py index e2400926ab..828fff49e7 100644 --- a/var/spack/repos/builtin/packages/py-torchmeta/package.py +++ b/var/spack/repos/builtin/packages/py-torchmeta/package.py @@ -19,8 +19,8 @@ class PyTorchmeta(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy@1.14:', type=('build', 'run')) - depends_on('py-torch@1.4.0:1.8.999', type=('build', 'run')) - depends_on('py-torchvision@0.5.0:0.9.999', type=('build', 'run')) + depends_on('py-torch@1.4.0:1.8', type=('build', 'run')) + depends_on('py-torchvision@0.5.0:0.9', type=('build', 'run')) depends_on('pil@7.0:', type=('build', 'run')) depends_on('py-h5py', type=('build', 'run')) depends_on('py-tqdm@4.0.0:', 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 57e849915d..d07a9b7812 100644 --- a/var/spack/repos/builtin/packages/py-torchvision/package.py +++ b/var/spack/repos/builtin/packages/py-torchvision/package.py @@ -38,7 +38,7 @@ class PyTorchvision(PythonPackage): # https://github.com/pytorch/vision#installation depends_on('python@3.6:', when='@0.7:', type=('build', 'link', 'run')) - depends_on('python@3.5:', when='@0.6.0:0.6.999', type=('build', 'link', 'run')) + depends_on('python@3.5:', when='@0.6.0:0.6', type=('build', 'link', 'run')) depends_on('python@2.7:2.8,3.5:3.8', when='@0.5.0', type=('build', 'link', 'run')) depends_on('python@2.7:2.8,3.5:3.7', when='@:0.4', type=('build', 'link', 'run')) diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py index 8a82739250..e0419d9e05 100644 --- a/var/spack/repos/builtin/packages/py-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -23,7 +23,7 @@ class PyTornado(PythonPackage): depends_on('python@3.5.2:', when='@6:', type=('build', 'run')) depends_on('python@2.7:2.8,3.4:', type=('build', 'run')) depends_on('py-backports-ssl-match-hostname', when='@:4 ^python@:2.7.8', type=('build', 'run')) - depends_on('py-singledispatch', when='@:5.99 ^python@:3.3', type=('build', 'run')) + depends_on('py-singledispatch', when='@:5 ^python@:3.3', type=('build', 'run')) depends_on('py-certifi', when='@:4 ^python@:3.3', type=('build', 'run')) - depends_on('py-backports-abc@0.4:5.99', when='^python@:3.4', type=('build', 'run')) - depends_on('py-futures', when='@5:5.99 ^python@:3.1', type=('build', 'run')) + depends_on('py-backports-abc@0.4:5', when='^python@:3.4', type=('build', 'run')) + depends_on('py-futures', when='@5:5 ^python@:3.1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-tox/package.py b/var/spack/repos/builtin/packages/py-tox/package.py index d2f4674529..534f822b55 100644 --- a/var/spack/repos/builtin/packages/py-tox/package.py +++ b/var/spack/repos/builtin/packages/py-tox/package.py @@ -18,9 +18,9 @@ class PyTox(PythonPackage): depends_on('py-setuptools', type=('build', 'run')) depends_on('py-importlib-metadata@1.1.0:', when='^python@:3.7', type=('build', 'run')) depends_on('py-packaging@14:', type=('build', 'run')) - depends_on('py-pluggy@0.12.0:0.999', type=('build', 'run')) - depends_on('py-py@1.4.17:1.999', type=('build', 'run')) - depends_on('py-six@1.0.0:1.999', type=('build', 'run')) + depends_on('py-pluggy@0.12.0:0', type=('build', 'run')) + depends_on('py-py@1.4.17:1', type=('build', 'run')) + depends_on('py-six@1.0.0:1', type=('build', 'run')) depends_on('py-virtualenv@16.0.0:', type=('build', 'run')) depends_on('py-toml@0.9.4:', type=('build', 'run')) - depends_on('py-filelock@3.0.0:3.999', type=('build', 'run')) + depends_on('py-filelock@3.0.0:3', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-traits/package.py b/var/spack/repos/builtin/packages/py-traits/package.py index 98e5ba5088..3fd2871b3e 100644 --- a/var/spack/repos/builtin/packages/py-traits/package.py +++ b/var/spack/repos/builtin/packages/py-traits/package.py @@ -14,5 +14,5 @@ class PyTraits(PythonPackage): version('6.0.0', sha256='dbcd70166feca434130a1193284d5819ca72ffbc8dbce8deeecc0cebb41a3bfb') depends_on('python@3.6:', type=('build', 'run'), when='@6.2.0:') - depends_on('python@3.5:', type=('build', 'run'), when='@:6.1.999') + depends_on('python@3.5:', type=('build', 'run'), when='@:6.1') depends_on('py-setuptools', type='build') diff --git a/var/spack/repos/builtin/packages/py-transformers/package.py b/var/spack/repos/builtin/packages/py-transformers/package.py index 422f61f01d..03ffc20785 100644 --- a/var/spack/repos/builtin/packages/py-transformers/package.py +++ b/var/spack/repos/builtin/packages/py-transformers/package.py @@ -23,7 +23,7 @@ class PyTransformers(PythonPackage): 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.999', when='@4.6.1:', 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')) @@ -36,6 +36,6 @@ class PyTransformers(PythonPackage): 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.999', type=('build', 'run')) + depends_on('py-importlib-metadata', when='@4.6.1: ^python@:3.7', type=('build', 'run')) depends_on('py-huggingface-hub@0.0.8', when='@4.6.1:', type=('build', 'run')) depends_on('py-packaging', when='@4.6.1:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-tuiview/package.py b/var/spack/repos/builtin/packages/py-tuiview/package.py index e78153d2c1..be0035dad4 100644 --- a/var/spack/repos/builtin/packages/py-tuiview/package.py +++ b/var/spack/repos/builtin/packages/py-tuiview/package.py @@ -17,7 +17,7 @@ class PyTuiview(PythonPackage): version('1.2.6', sha256='61b136fa31c949d7a7a4dbf8562e6fc677d5b1845b152ec39e337f4eb2e91662') version('1.1.7', sha256='fbf0bf29cc775357dad4f8a2f0c2ffa98bbf69d603a96353e75b321adef67573') - depends_on("py-pyqt4", type=('build', 'run'), when='@:1.1.99') + depends_on("py-pyqt4", type=('build', 'run'), when='@:1.1') depends_on("py-pyqt5", type=('build', 'run'), when='@1.2.0:') depends_on("py-numpy", type=('build', 'run')) depends_on("gdal@1.11.0:+python") diff --git a/var/spack/repos/builtin/packages/py-twine/package.py b/var/spack/repos/builtin/packages/py-twine/package.py index 271f0d7563..fd69c5bd78 100644 --- a/var/spack/repos/builtin/packages/py-twine/package.py +++ b/var/spack/repos/builtin/packages/py-twine/package.py @@ -17,6 +17,6 @@ class PyTwine(PythonPackage): depends_on('python@3.6:', type=('build', 'run')) depends_on('py-pkginfo@1.4.2:', type=('build', 'run')) depends_on('py-readme-renderer@21.0:', type=('build', 'run')) - depends_on('py-requests-toolbelt@0.8.0:0.8.999,0.9.1:', type=('build', 'run')) + depends_on('py-requests-toolbelt@0.8.0:0.8,0.9.1:', type=('build', 'run')) depends_on('py-setuptools@0.7.0:', type=('build', 'run')) depends_on('py-tqdm@4.14:', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-ucx-py/package.py b/var/spack/repos/builtin/packages/py-ucx-py/package.py index 5a6939b769..d4f3fd29b3 100644 --- a/var/spack/repos/builtin/packages/py-ucx-py/package.py +++ b/var/spack/repos/builtin/packages/py-ucx-py/package.py @@ -17,7 +17,7 @@ class PyUcxPy(PythonPackage): depends_on('py-setuptools', type='build') depends_on('python@3.6:', type=('build', 'run')) - depends_on('py-cython@0.29.14:2.999.999', type='build') + depends_on('py-cython@0.29.14:2', type='build') depends_on('py-numpy', type=('build', 'run')) depends_on('py-psutil', type=('build', 'run')) depends_on('py-pynvml', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-uproot/package.py b/var/spack/repos/builtin/packages/py-uproot/package.py index 2d911e9d05..06cccf211a 100644 --- a/var/spack/repos/builtin/packages/py-uproot/package.py +++ b/var/spack/repos/builtin/packages/py-uproot/package.py @@ -40,7 +40,7 @@ class PyUproot(PythonPackage): description='Build with support for reading ' 'zstd-compressed rootfiles ') - depends_on('python@2.6:2.999,3.5:', type=('build', 'run')) + depends_on('python@2.6:2,3.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-urllib3/package.py b/var/spack/repos/builtin/packages/py-urllib3/package.py index b60f827909..71ff2e2827 100644 --- a/var/spack/repos/builtin/packages/py-urllib3/package.py +++ b/var/spack/repos/builtin/packages/py-urllib3/package.py @@ -35,6 +35,6 @@ class PyUrllib3(PythonPackage): depends_on('py-certifi', when='+secure') depends_on('py-ipaddress', when='+secure ^python@2.7:2.8') - depends_on('py-pysocks@1.5.6,1.5.8:1.999', when='+socks') + depends_on('py-pysocks@1.5.6,1.5.8:1', when='+socks') depends_on('py-brotlipy@0.6:', when='+brotli') diff --git a/var/spack/repos/builtin/packages/py-vsts/package.py b/var/spack/repos/builtin/packages/py-vsts/package.py index 75eb7ac9b6..6bb0152e5b 100644 --- a/var/spack/repos/builtin/packages/py-vsts/package.py +++ b/var/spack/repos/builtin/packages/py-vsts/package.py @@ -13,4 +13,4 @@ class PyVsts(PythonPackage): version('0.1.25', sha256='da179160121f5b38be061dbff29cd2b60d5d029b2207102454d77a7114e64f97') depends_on('py-setuptools', type='build') - depends_on('py-msrest@0.6.0:0.6.999', type=('build', 'run')) + depends_on('py-msrest@0.6.0:0.6', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-warpx/package.py b/var/spack/repos/builtin/packages/py-warpx/package.py index ec37f1afb1..c3d8e34475 100644 --- a/var/spack/repos/builtin/packages/py-warpx/package.py +++ b/var/spack/repos/builtin/packages/py-warpx/package.py @@ -43,9 +43,9 @@ class PyWarpx(PythonPackage): type=['build', 'link']) depends_on('python@3.6:', type=('build', 'run')) - depends_on('py-numpy@1.15.0:1.99.99', type=('build', 'run')) + depends_on('py-numpy@1.15.0:1', type=('build', 'run')) depends_on('py-mpi4py@2.0.0:', type=('build', 'run'), when='+mpi') - depends_on('py-periodictable@1.5:1.99', type=('build', 'run')) + depends_on('py-periodictable@1.5:1', type=('build', 'run')) depends_on('py-picmistandard@0.0.14', type=('build', 'run')) depends_on('py-setuptools@38.6:', type='build') depends_on('py-wheel', type='build') diff --git a/var/spack/repos/builtin/packages/py-xgboost/package.py b/var/spack/repos/builtin/packages/py-xgboost/package.py index 746d58a1f4..b1c08f53b3 100644 --- a/var/spack/repos/builtin/packages/py-xgboost/package.py +++ b/var/spack/repos/builtin/packages/py-xgboost/package.py @@ -29,8 +29,8 @@ class PyXgboost(PythonPackage): for ver in ['1.3.3']: depends_on('xgboost@' + ver, when='@' + ver) - depends_on('cmake@3.12:', when='@1.0:1.2.999', type='build') - depends_on('llvm-openmp', when='@:1.2.999 %apple-clang') + depends_on('cmake@3.12:', when='@1.0:1.2', type='build') + depends_on('llvm-openmp', when='@:1.2 %apple-clang') depends_on('python@3.6:', when='@1.2:', type=('build', 'run')) depends_on('python@3.5:', when='@1.0:', type=('build', 'run')) depends_on('python@3.4:', type=('build', 'run')) @@ -49,10 +49,10 @@ class PyXgboost(PythonPackage): depends_on('py-graphviz', when='+plotting', type=('build', 'run')) depends_on('py-matplotlib', when='+plotting', type=('build', 'run')) - conflicts('+pandas', when='@:0.999') - conflicts('+scikit-learn', when='@:0.999') - conflicts('+dask', when='@:0.999') - conflicts('+plotting', when='@:0.999') + conflicts('+pandas', when='@:0') + conflicts('+scikit-learn', when='@:0') + conflicts('+dask', when='@:0') + conflicts('+plotting', when='@:0') # `--use-system-libxgboost` is only valid for the 'install' phase, but we want to # skip building of the C++ library and rely on an external dependency diff --git a/var/spack/repos/builtin/packages/py-xopen/package.py b/var/spack/repos/builtin/packages/py-xopen/package.py index ecfd23d7eb..a450d6a776 100644 --- a/var/spack/repos/builtin/packages/py-xopen/package.py +++ b/var/spack/repos/builtin/packages/py-xopen/package.py @@ -24,7 +24,7 @@ class PyXopen(PythonPackage): depends_on('python@3.5:', type=('build', 'run'), when='@0.9.0:') depends_on('python@2.7,3.4:', type=('build', 'run'), when='@0.5:0.8') - depends_on('python@2.6:2.99,3.3:', type=('build', 'run'), when='@0.1.1') + depends_on('python@2.6:2,3.3:', type=('build', 'run'), when='@0.1.1') depends_on('py-setuptools', type='build') depends_on('py-setuptools-scm', type='build') depends_on('py-bz2file', type=('build', 'run'), when='@0.5: ^python@:2.8') diff --git a/var/spack/repos/builtin/packages/py-xxhash/package.py b/var/spack/repos/builtin/packages/py-xxhash/package.py index a15d94cca3..80ac2e37f0 100644 --- a/var/spack/repos/builtin/packages/py-xxhash/package.py +++ b/var/spack/repos/builtin/packages/py-xxhash/package.py @@ -15,7 +15,7 @@ class PyXxhash(PythonPackage): version('2.0.2', sha256='b7bead8cf6210eadf9cecf356e17af794f57c0939a3d420a00d87ea652f87b49') - depends_on('python@2.6:2.999,3.3:', type=('build', 'run')) + depends_on('python@2.6:2,3.3:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('xxhash@0.8.0') diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index 6c8a4c1ea4..3fb33a65d5 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -48,7 +48,7 @@ class PyYt(PythonPackage): depends_on("py-cython@0.24:", type=('build', 'run')) depends_on("py-h5py@3.1:", type=('build', 'run'), when="+h5py") depends_on("py-ipython@1.0:", type=('build', 'run')) - depends_on("py-ipython@:6.99", type=('build', 'run'), when="^python@:2.99") + depends_on("py-ipython@:6", type=('build', 'run'), when="^python@:2") depends_on("py-matplotlib@1.5.3:", type=('build', 'run')) depends_on("py-matplotlib@:3.2.2", type=('build', 'run'), when="@:3.6.0") depends_on("py-numpy@1.10.4:", type=('build', 'run')) @@ -56,7 +56,7 @@ class PyYt(PythonPackage): depends_on("py-setuptools@19.6:", type=('build', 'run')) depends_on("py-sympy@1.0:", type=('build', 'run')) depends_on("rockstar@yt", type=('build', 'run'), when="+rockstar") - depends_on("python@2.7.0:2.7.99,3.5:", type=('build', 'run')) + depends_on("python@2.7.0:2.7,3.5:", type=('build', 'run')) @run_before('install') def prep_yt(self): diff --git a/var/spack/repos/builtin/packages/pythia8/package.py b/var/spack/repos/builtin/packages/pythia8/package.py index 0a8a91277d..bf31d82900 100644 --- a/var/spack/repos/builtin/packages/pythia8/package.py +++ b/var/spack/repos/builtin/packages/pythia8/package.py @@ -37,7 +37,7 @@ class Pythia8(AutotoolsPackage): variant('fastjet', default=False, description='Build fastjet extensions') depends_on('rsync', type='build') - depends_on('hepmc@:2.99.99', when="+hepmc") + depends_on('hepmc@:2', when="+hepmc") depends_on('root', when="+root") depends_on('evtgen', when="+evtgen") depends_on("fastjet@3.0.0:", when="+fastjet") diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 96ddcd4fe7..cd55b6629e 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -202,11 +202,11 @@ class Python(AutotoolsPackage): # Ensure that distutils chooses correct compiler option for RPATH on cray: patch('cray-rpath-2.3.patch', when='@2.3:3.0.1 platform=cray') - patch('cray-rpath-3.1.patch', when='@3.1:3.99 platform=cray') + patch('cray-rpath-3.1.patch', when='@3.1:3 platform=cray') # Ensure that distutils chooses correct compiler option for RPATH on fj: patch('fj-rpath-2.3.patch', when='@2.3:3.0.1 %fj') - patch('fj-rpath-3.1.patch', when='@3.1:3.99 %fj') + patch('fj-rpath-3.1.patch', when='@3.1:3 %fj') # Fixes an alignment problem with more aggressive optimization in gcc8 # https://github.com/python/cpython/commit/0b91f8a668201fc58fa732b8acc496caedfdbae0 @@ -332,7 +332,7 @@ class Python(AutotoolsPackage): # configuration option, so the installation's module setup file needs # to be modified directly in order to point to the correct SSL path. # See: https://stackoverflow.com/a/5939170 - if self.spec.satisfies('@:3.6.999+ssl'): + if self.spec.satisfies('@:3.6+ssl'): ff = FileFilter(join_path('Modules', 'Setup.dist')) ff.filter(r'^#(((SSL=)|(_ssl))(.*))$', r'\1') ff.filter(r'^#((.*)(\$\(SSL\))(.*))$', r'\1') @@ -343,7 +343,7 @@ class Python(AutotoolsPackage): # Because Python uses compiler system paths during install, it's # possible to pick up a system OpenSSL when building 'python~ssl'. # To avoid this scenario, we disable the 'ssl' module with patching. - elif self.spec.satisfies('@:3.6.999~ssl'): + elif self.spec.satisfies('@:3.6~ssl'): ff = FileFilter('setup.py') ff.filter( r'^(\s+(ssl_((incs)|(libs)))\s+=\s+)(.*)$', diff --git a/var/spack/repos/builtin/packages/qbox/package.py b/var/spack/repos/builtin/packages/qbox/package.py index 68179eaf1b..caf3870518 100644 --- a/var/spack/repos/builtin/packages/qbox/package.py +++ b/var/spack/repos/builtin/packages/qbox/package.py @@ -43,7 +43,7 @@ class Qbox(MakefilePackage): depends_on('scalapack') depends_on('fftw') depends_on('xerces-c') - depends_on('python@:2.999', type='run') + depends_on('python@:2', type='run') depends_on('gnuplot', type='run') # Change /usr/bin/python shebangs to /usr/bin/env python diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py index 95a45656cf..ab7f60c91c 100644 --- a/var/spack/repos/builtin/packages/qgis/package.py +++ b/var/spack/repos/builtin/packages/qgis/package.py @@ -124,9 +124,9 @@ class Qgis(CMakePackage): depends_on('pkgconfig', type='build') # Take care of conflicts using depends_on - depends_on('qt@5.9.0:5.12.99', when='@3.8') + depends_on('qt@5.9.0:5.12', when='@3.8') depends_on('qt@5.9.0:', when='@3.10.0:') - depends_on('qtkeychain@:1.5.99', when='^qt@4') + depends_on('qtkeychain@:1.5', when='^qt@4') depends_on('qt@:4', when='@2') # Help concretizer # +qsci_api is implied by qscintilla+python dependency diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index eeb48391ea..ecee1f94d0 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -164,7 +164,7 @@ class Qt(Package): depends_on("libsm", when='@3') depends_on("pcre+multibyte", when='@5.0:5.8') depends_on("inputproto", when='@:5.8') - depends_on("openssl@:1.0.999", when='@4:5.9+ssl') + depends_on("openssl@:1.0", when='@4:5.9+ssl') depends_on("glib", when='@4:') depends_on("libpng", when='@4:') @@ -190,7 +190,7 @@ class Qt(Package): depends_on("flex", type='build') depends_on("bison", type='build') depends_on("gperf") - depends_on("python@2.7.5:2.999", type='build') + depends_on("python@2.7.5:2", type='build') with when('@5.7:'): depends_on("nss") @@ -205,7 +205,7 @@ class Qt(Package): # gcc@4 is not supported as of Qt@5.14 # https://doc.qt.io/qt-5.14/supported-platforms.html - conflicts('%gcc@:4.99', when='@5.14:') + conflicts('%gcc@:4', when='@5.14:') # Non-macOS dependencies and special macOS constraints if MACOS_VERSION is None: diff --git a/var/spack/repos/builtin/packages/qthreads/package.py b/var/spack/repos/builtin/packages/qthreads/package.py index 2a5b2ed5ec..f66ba996da 100644 --- a/var/spack/repos/builtin/packages/qthreads/package.py +++ b/var/spack/repos/builtin/packages/qthreads/package.py @@ -64,8 +64,8 @@ class Qthreads(AutotoolsPackage): description='Specify number of bytes to use in a stack', values=is_integer) - depends_on("hwloc@1.0:1.99", when="@:1.15 +hwloc") - depends_on("hwloc@1.5:2.99", when="@1.16: +hwloc") + depends_on("hwloc@1.0:1", when="@:1.15 +hwloc") + depends_on("hwloc@1.5:2", when="@1.16: +hwloc") def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/quantum-espresso/package.py b/var/spack/repos/builtin/packages/quantum-espresso/package.py index 5d87ef6645..3753504c1e 100644 --- a/var/spack/repos/builtin/packages/quantum-espresso/package.py +++ b/var/spack/repos/builtin/packages/quantum-espresso/package.py @@ -36,14 +36,14 @@ class QuantumEspresso(Package): resource(name='environ', git='https://github.com/environ-developers/Environ.git', tag='v1.1', - when='@6.3:6.4.99 +environ', + when='@6.3:6.4 +environ', destination='.' ) resource(name='environ', git='https://github.com/environ-developers/Environ.git', tag='v1.0', - when='@6.2.1:6.2.99 +environ', + when='@6.2.1:6.2 +environ', destination='.' ) @@ -181,7 +181,7 @@ class QuantumEspresso(Package): conflicts('+epw', when='~mpi', msg='EPW needs MPI') # EPW doesn't gets along well with OpenMPI 2.x.x - conflicts('+epw', when='^openmpi@2.0.0:2.999.999', + conflicts('+epw', when='^openmpi@2.0.0:2', msg='OpenMPI version incompatible with EPW') # EPW also doesn't gets along well with PGI 17.x + OpenMPI 1.10.7 diff --git a/var/spack/repos/builtin/packages/r-sf/package.py b/var/spack/repos/builtin/packages/r-sf/package.py index 6ac15a1e0f..1895f164c8 100644 --- a/var/spack/repos/builtin/packages/r-sf/package.py +++ b/var/spack/repos/builtin/packages/r-sf/package.py @@ -33,6 +33,6 @@ class RSf(RPackage): depends_on('r-rcpp@0.12.18:', type=('build', 'run')) depends_on('gdal@2.0.1:') depends_on('geos@3.4.0:') - depends_on('proj@4.8.0:5.999', when='@:0.7-3') - depends_on('proj@4.8.0:6.999', when='@0.7-4:') + depends_on('proj@4.8.0:5', when='@:0.7-3') + depends_on('proj@4.8.0:6', when='@0.7-4:') depends_on('sqlite', when='@0.9-7') diff --git a/var/spack/repos/builtin/packages/r-xlconnect/package.py b/var/spack/repos/builtin/packages/r-xlconnect/package.py index 206eb4420e..870e312604 100644 --- a/var/spack/repos/builtin/packages/r-xlconnect/package.py +++ b/var/spack/repos/builtin/packages/r-xlconnect/package.py @@ -29,4 +29,4 @@ class RXlconnect(RPackage): depends_on('r-xlconnectjars@0.2-14', when='@0.2-14', type=('build', 'run')) depends_on('r-xlconnectjars@0.2-15', when='@0.2-15', type=('build', 'run')) depends_on('java@6:') - depends_on('java@8:11.999', when='@1.0.1:') + depends_on('java@8:11', when='@1.0.1:') diff --git a/var/spack/repos/builtin/packages/range-v3/package.py b/var/spack/repos/builtin/packages/range-v3/package.py index 342a240bb2..b9f093bd83 100644 --- a/var/spack/repos/builtin/packages/range-v3/package.py +++ b/var/spack/repos/builtin/packages/range-v3/package.py @@ -62,10 +62,10 @@ class RangeV3(CMakePackage): # Known compiler conflicts. Your favorite compiler may also conflict # depending on its C++ standard support. conflicts('%clang@:3.6.1') - conflicts('%clang@:3.9.99', when='@0.11.0:') + conflicts('%clang@:3.9', when='@0.11.0:') conflicts('%gcc@:4.9.0') conflicts('%gcc@:5.2.0', when='cxxstd=14') - conflicts('%gcc@:5.99.99', when='cxxstd=17') + conflicts('%gcc@:5', when='cxxstd=17') depends_on('cmake@3.6:', type='build') depends_on('doxygen+graphviz', type='build', when='+doc') diff --git a/var/spack/repos/builtin/packages/reframe/package.py b/var/spack/repos/builtin/packages/reframe/package.py index 5d4a680674..80b36c8c19 100644 --- a/var/spack/repos/builtin/packages/reframe/package.py +++ b/var/spack/repos/builtin/packages/reframe/package.py @@ -61,7 +61,7 @@ class Reframe(Package): depends_on('git', when='@2.0:3.1', type='run') # supported python versions - depends_on('python@3.5:', when='@2.0:2.999', type='run') + depends_on('python@3.5:', when='@2.0:2', type='run') depends_on('python@3.6:', when='@3.0:', type='run') # build dependencies diff --git a/var/spack/repos/builtin/packages/relax/package.py b/var/spack/repos/builtin/packages/relax/package.py index 7ef85fb96c..3ae679db77 100644 --- a/var/spack/repos/builtin/packages/relax/package.py +++ b/var/spack/repos/builtin/packages/relax/package.py @@ -21,7 +21,7 @@ class Relax(CMakePackage): depends_on('clhep') depends_on('gsl') - depends_on('hepmc@:2.99.99') + depends_on('hepmc@:2') depends_on('root@6.0.0:') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/rivet/package.py b/var/spack/repos/builtin/packages/rivet/package.py index 9f08ff67a0..2ca4014449 100644 --- a/var/spack/repos/builtin/packages/rivet/package.py +++ b/var/spack/repos/builtin/packages/rivet/package.py @@ -67,7 +67,7 @@ class Rivet(AutotoolsPackage): variant('hepmc', default='2', values=('2', '3'), description="HepMC version to link against") - conflicts('hepmc=3', when='@:2.99', msg='HepMC support was added in 3.0') + conflicts('hepmc=3', when='@:2', msg='HepMC support was added in 3.0') # According to A. Buckley (main Rivet developer): # "typically a given Rivet version will work with @@ -103,15 +103,15 @@ class Rivet(AutotoolsPackage): # The following versions were not a part of LCG stack # and thus the exact version of YODA is unknown - depends_on('yoda@1.7.0:1.7.999', when='@2.6.0,2.7.0,2.7.1,3.0.0,3.0.2') - depends_on('yoda@1.5.0:1.5.999', when='@2.4.1') + depends_on('yoda@1.7.0:1.7', when='@2.6.0,2.7.0,2.7.1,3.0.0,3.0.2') + depends_on('yoda@1.5.0:1.5', when='@2.4.1') depends_on('hepmc', type=('build', 'link', 'run'), when='hepmc=2') depends_on('hepmc3', type=('build', 'link', 'run'), when='hepmc=3') depends_on('boost', when='@:2.5.0', type=('build', 'run')) depends_on('fastjet', type=('build', 'run')) depends_on('fjcontrib', type=('build', 'run'), when='@3.0.0:') - depends_on('gsl', type=('build', 'run'), when='@:2.6.0,2.6.2:2.99.99') + depends_on('gsl', type=('build', 'run'), when='@:2.6.0,2.6.2:2') depends_on('python', type=('build', 'run')) depends_on('py-cython@0.24.0:', type='build') depends_on('swig', type=('build', 'run')) @@ -170,7 +170,7 @@ class Rivet(AutotoolsPackage): else: args += ['--with-hepmc3=' + self.spec['hepmc'].prefix] - if self.spec.satisfies('@:1.999.999'): + if self.spec.satisfies('@:1'): args += ['--with-boost-incpath=' + self.spec['boost'].includes] else: if self.spec.satisfies('@:2.5.0'): @@ -180,7 +180,7 @@ class Rivet(AutotoolsPackage): if self.spec.satisfies('@2:'): args += ['--with-yoda=' + self.spec['yoda'].prefix] - if self.spec.satisfies('@:2.6.0,2.6.2:2.99.99'): + if self.spec.satisfies('@:2.6.0,2.6.2:2'): args += ['--with-gsl=' + self.spec['gsl'].prefix] if self.spec.satisfies('@3.0.0:'): @@ -189,7 +189,7 @@ class Rivet(AutotoolsPackage): if self.spec.satisfies('@:2.5.1'): args += ['--enable-unvalidated'] - if self.spec.satisfies('@2:2.4.99'): + if self.spec.satisfies('@2:2.4'): args += ['--enable-stdcxx11'] args += ['--disable-pdfmanual'] diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index d14320adcc..ad99453d28 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -74,7 +74,7 @@ class Root(CMakePackage): # Some ROOT versions did not honor the option to avoid building an # internal version of unuran, _cf_ # https://github.com/root-project/ROOT/commit/3e60764f133218b6938e5aa4986de760e8f058d9. - patch('honor-unuran-switch.patch', level=1, when='@6.08.06:6.13.99') + patch('honor-unuran-switch.patch', level=1, when='@6.08.06:6.13') # 6.16.00 fails to handle particular build option combinations, _cf_ # https://github.com/root-project/ROOT/commit/e0ae0483985d90a71a6cabd10d3622dfd1c15611. patch('root7-webgui.patch', level=1, when='@6.16.00') @@ -197,7 +197,7 @@ class Root(CMakePackage): # ###################### Dependencies ###################### - depends_on('cmake@3.4.3:', type='build', when='@:6.16.99') + depends_on('cmake@3.4.3:', type='build', when='@:6.16') depends_on('cmake@3.9:', type='build', when='@6.18.00:') depends_on('pkgconfig', type='build') @@ -230,7 +230,7 @@ class Root(CMakePackage): depends_on('gl2ps', when="+x+opengl") # Qt4 - depends_on('qt@:4.999', when='+qt4') + depends_on('qt@:4', when='+qt4') # Python depends_on('python@2.7:', when='+python', type=('build', 'run')) @@ -275,7 +275,7 @@ class Root(CMakePackage): depends_on('veccore', when='+veccore') depends_on('libxml2', when='+xml') depends_on('xrootd', when='+xrootd') - depends_on('xrootd@:4.99.99', when='@:6.22.03 +xrootd') + depends_on('xrootd@:4', when='@:6.22.03 +xrootd') # ###################### Conflicts ###################### @@ -284,14 +284,14 @@ class Root(CMakePackage): conflicts('%intel') # ROOT <6.08 was incompatible with the GCC 5+ ABI - conflicts('%gcc@5.0.0:', when='@:6.07.99') + conflicts('%gcc@5.0.0:', when='@:6.07') # The version of Clang featured in ROOT <6.12 fails to build with # GCC 9.2.1, which we can safely extrapolate to the GCC 9 series. - conflicts('%gcc@9.0.0:', when='@:6.11.99') + conflicts('%gcc@9.0.0:', when='@:6.11') # ROOT <6.14 was incompatible with Python 3.7+ - conflicts('^python@3.7:', when='@:6.13.99 +python') + conflicts('^python@3.7:', when='@:6.13 +python') # See README.md conflicts('+http', @@ -445,7 +445,7 @@ class Root(CMakePackage): define('builtin_glew', False), define('builtin_gsl', False), define('builtin_llvm', True), - define('builtin_lz4', self.spec.satisfies('@6.12.02:6.12.99')), + define('builtin_lz4', self.spec.satisfies('@6.12.02:6.12')), define('builtin_lzma', False), define('builtin_nlohmannjson', False), define('builtin_openssl', False), @@ -456,7 +456,7 @@ class Root(CMakePackage): define('builtin_vdt', False), define('builtin_veccore', False), define('builtin_xrootd', False), - define('builtin_xxhash', self.spec.satisfies('@6.12.02:6.12.99')), + define('builtin_xxhash', self.spec.satisfies('@6.12.02:6.12')), define('builtin_zlib', False) ] @@ -594,10 +594,10 @@ class Root(CMakePackage): env.append_path('SPACK_INCLUDE_DIRS', include_path) # With that done, let's go fixing those deps - if spec.satisfies('@:6.12.99'): + if spec.satisfies('@:6.12'): add_include_path('zlib') if '+x' in spec: - if spec.satisfies('@:6.08.99') or spec.satisfies('@6.22:'): + if spec.satisfies('@:6.08') or spec.satisfies('@6.22:'): add_include_path('xextproto') add_include_path('fontconfig') add_include_path('libx11') diff --git a/var/spack/repos/builtin/packages/rose/package.py b/var/spack/repos/builtin/packages/rose/package.py index ac2b9f0baf..59eea9a9d7 100644 --- a/var/spack/repos/builtin/packages/rose/package.py +++ b/var/spack/repos/builtin/packages/rose/package.py @@ -28,28 +28,28 @@ class Rose(AutotoolsPackage): resource(name="roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-4.9-5.0.9.12.52.tar.gz", expand=False, placement="rose-build/src/frontend/CxxFrontend/", - when="@0.9.13.0 %gcc@4.9.0:4.9.99", + when="@0.9.13.0 %gcc@4.9.0:4.9", url="http://edg-binaries.rosecompiler.org/roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-4.9-5.0.9.12.52.tar.gz", sha256="fb4b50606bdc681b864bbece46d344d7775780ffe7883aa96305d732c9c04a1c") resource(name="roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-5-5.0.9.12.52.tar.gz", expand=False, placement="rose-build/src/frontend/CxxFrontend/", - when="@0.9.13.0 %gcc@5.0:5.99", + when="@0.9.13.0 %gcc@5.0:5", url="http://edg-binaries.rosecompiler.org/roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-5-5.0.9.12.52.tar.gz", sha256="584f8f721274f0f2d5c9a0c7701c045af99580ea7cd1d50999e20c2a897298fb") resource(name="roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-6-5.0.9.12.52.tar.gz", expand=False, placement="rose-build/src/frontend/CxxFrontend/", - when="@0.9.13.0 %gcc@6.0:6.99", + when="@0.9.13.0 %gcc@6.0:6", url="http://edg-binaries.rosecompiler.org/roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-6-5.0.9.12.52.tar.gz", sha256="561cd5a944d0dd01689aa0bea8eccf30fc994cd20c4c05da7943c6f36cec25b5") resource(name="roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-7-5.0.9.12.52.tar.gz", expand=False, placement="rose-build/src/frontend/CxxFrontend/", - when="@0.9.13.0 %gcc@7.0:7.99", + when="@0.9.13.0 %gcc@7.0:7", url="http://edg-binaries.rosecompiler.org/roseBinaryEDG-5-0-x86_64-pc-linux-gnu-gnu-7-5.0.9.12.52.tar.gz", sha256="800a178804e8b5e936942b4eb036cc61e5d5ad43551cb4fd901ec42ba7e7a176") diff --git a/var/spack/repos/builtin/packages/ruby-narray/package.py b/var/spack/repos/builtin/packages/ruby-narray/package.py index 00af435e33..61aefb9533 100644 --- a/var/spack/repos/builtin/packages/ruby-narray/package.py +++ b/var/spack/repos/builtin/packages/ruby-narray/package.py @@ -16,4 +16,4 @@ class RubyNarray(RubyPackage): version('master', branch='master') version('0.9.1.8', sha256='48814c6ebf2c4846fcf6cfd2705a15a97a608960c1676cb6c7b5c9254b0dd51b') - depends_on('ruby@2.2:2.999', type=('build', 'run')) + depends_on('ruby@2.2:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py index 0abd0f6bb6..62da9d663a 100644 --- a/var/spack/repos/builtin/packages/ruby-rubyinline/package.py +++ b/var/spack/repos/builtin/packages/ruby-rubyinline/package.py @@ -15,4 +15,4 @@ class RubyRubyinline(RubyPackage): version('3.12.5', sha256='d4559cb86b7fedd2e9b4b0a3bd99a1955186dbc09f1269920a0dd5c67639c156', expand=False) - depends_on('ruby-zentest@4.3:4.999', type=('build', 'run')) + depends_on('ruby-zentest@4.3:4', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py index 7523aa42ec..3797332dca 100644 --- a/var/spack/repos/builtin/packages/ruby-terminal-table/package.py +++ b/var/spack/repos/builtin/packages/ruby-terminal-table/package.py @@ -12,4 +12,4 @@ class RubyTerminalTable(RubyPackage): version('1.8.0', sha256='69b8e157f5dc3f056b5242923ab3e729a16c6f893b3a5d540e71135a973e5fbe') - depends_on('ruby-unicode-display-width@1.1.1:1.999', type=('build', 'run')) + depends_on('ruby-unicode-display-width@1.1.1:1', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py b/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py index d5066fe027..0e127732cd 100644 --- a/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py +++ b/var/spack/repos/builtin/packages/ruby-tmuxinator/package.py @@ -13,6 +13,6 @@ class RubyTmuxinator(RubyPackage): version('2.0.1', sha256='a2c8428d239a6e869da516cecee3ac64db47ba1f1932317eb397b1afd698ee09') depends_on('ruby@2.5.8:', type=('build', 'run')) - depends_on('ruby-erubis@2.6:2.999', type=('build', 'run')) - depends_on('ruby-thor@1.0:1.999', type=('build', 'run')) - depends_on('ruby-xdg@2.2.5:2.999', type=('build', 'run')) + depends_on('ruby-erubis@2.6:2', type=('build', 'run')) + depends_on('ruby-thor@1.0:1', type=('build', 'run')) + depends_on('ruby-xdg@2.2.5:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/ruby-zentest/package.py b/var/spack/repos/builtin/packages/ruby-zentest/package.py index e5a6ba7b44..f3cd4a7972 100644 --- a/var/spack/repos/builtin/packages/ruby-zentest/package.py +++ b/var/spack/repos/builtin/packages/ruby-zentest/package.py @@ -16,4 +16,4 @@ class RubyZentest(RubyPackage): version('4.12.0', sha256='5301757c3ab29dd2222795c1b076dd348f4d92fe0426e97a13ae56fea47a786e', expand=False) - depends_on('ruby@1.8:2.999', type=('build', 'run')) + depends_on('ruby@1.8:2', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/ruby/package.py b/var/spack/repos/builtin/packages/ruby/package.py index f37017b8d0..d92e8cf419 100644 --- a/var/spack/repos/builtin/packages/ruby/package.py +++ b/var/spack/repos/builtin/packages/ruby/package.py @@ -46,7 +46,7 @@ class Ruby(AutotoolsPackage): # TODO: add check for this and warn user # gcc-7-based build requires patches (cf. https://bugs.ruby-lang.org/issues/13150) - patch('ruby_23_gcc7.patch', level=0, when='@2.2.0:2.2.999 %gcc@7:') + patch('ruby_23_gcc7.patch', level=0, when='@2.2.0:2.2 %gcc@7:') patch('ruby_23_gcc7.patch', level=0, when='@2.3.0:2.3.4 %gcc@7:') patch('ruby_24_gcc7.patch', level=1, when='@2.4.0 %gcc@7:') diff --git a/var/spack/repos/builtin/packages/saga-gis/package.py b/var/spack/repos/builtin/packages/saga-gis/package.py index c659a44e6c..0999e4daf0 100644 --- a/var/spack/repos/builtin/packages/saga-gis/package.py +++ b/var/spack/repos/builtin/packages/saga-gis/package.py @@ -66,7 +66,7 @@ class SagaGis(AutotoolsPackage, SourceforgePackage): # SAGA-GIS requires projects.h from proj depends_on('proj') # https://sourceforge.net/p/saga-gis/bugs/271/ - depends_on('proj@:5', when='@:7.2.999') + depends_on('proj@:5', when='@:7.2') # Saga-Gis depends on legacy opencv API removed in opencv 4.x depends_on('opencv@:3', when='+opencv') @@ -78,8 +78,8 @@ class SagaGis(AutotoolsPackage, SourceforgePackage): # write support for grib2 is available since 2.3.0 (https://gdal.org/drivers/raster/grib.html) depends_on('gdal@2.3:+grib+hdf5+netcdf') - depends_on('gdal@2.3:2.4+grib+hdf5+netcdf', when='@:7.2.999') - depends_on('libgeotiff@:1.4', when='@:7.2.999') + depends_on('gdal@2.3:2.4+grib+hdf5+netcdf', when='@:7.2') + depends_on('libgeotiff@:1.4', when='@:7.2') # FIXME Saga-Gis uses a wrong include path # depends_on('qhull', when='~triangle') diff --git a/var/spack/repos/builtin/packages/samrai/package.py b/var/spack/repos/builtin/packages/samrai/package.py index dc79110f6e..b554dd63d6 100644 --- a/var/spack/repos/builtin/packages/samrai/package.py +++ b/var/spack/repos/builtin/packages/samrai/package.py @@ -49,7 +49,7 @@ class Samrai(AutotoolsPackage): depends_on('zlib') depends_on('hdf5+mpi') depends_on('m4', type='build') - depends_on('boost@:1.64.0', when='@3.0.0:3.11.99', type='build') + depends_on('boost@:1.64.0', when='@3.0.0:3.11', type='build') depends_on('silo+mpi', when='+silo') # don't build SAMRAI 3+ with tools with gcc @@ -91,7 +91,7 @@ class Samrai(AutotoolsPackage): if '+silo' in self.spec: options.append('--with-silo=%s' % self.spec['silo'].prefix) - if self.spec.satisfies('@3.0:3.11.99'): + if self.spec.satisfies('@3.0:3.11'): options.append('--with-boost=%s' % self.spec['boost'].prefix) return options diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py index 248c44f0d1..c332874594 100644 --- a/var/spack/repos/builtin/packages/scalasca/package.py +++ b/var/spack/repos/builtin/packages/scalasca/package.py @@ -40,8 +40,8 @@ class Scalasca(AutotoolsPackage): depends_on('cube@4.3', when='@2.3:2.3.99') # version 2.1 - 2.2 - depends_on('cube@4.2', when='@2.1:2.2.999') - depends_on('otf2@1.4', when='@2.1:2.2.999') + depends_on('cube@4.2', when='@2.1:2.2') + depends_on('otf2@1.4', when='@2.1:2.2') def url_for_version(self, version): return 'http://apps.fz-juelich.de/scalasca/releases/scalasca/{0}/dist/scalasca-{1}.tar.gz'.format(version.up_to(2), version) diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 4ea8337b0c..403734a7a0 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -49,12 +49,12 @@ class Scorep(AutotoolsPackage): depends_on('otf2@2.2:', when='@6:') # SCOREP 4 and 5 depends_on('otf2@2.1:', when='@4:') - depends_on('cubew@4.4:4.5', when='@4:6.99') - depends_on('cubelib@4.4:4.5', when='@4:6.99') + depends_on('cubew@4.4:4.5', when='@4:6') + depends_on('cubelib@4.4:4.5', when='@4:6') # SCOREP 3 - depends_on('otf2@2:', when='@3:3.99') - depends_on('opari2@2.0:2.0.5', when='@3:6.99') - depends_on('cube@4.3:4.3.5', when='@3:3.99') + depends_on('otf2@2:', when='@3.0:3') + depends_on('opari2@2.0:2.0.5', when='@3:6') + depends_on('cube@4.3:4.3.5', when='@3.0:3') # SCOREP 2.0.2 depends_on('otf2@2.0', when='@2.0.2') depends_on('opari2@2.0', when='@2.0.2') diff --git a/var/spack/repos/builtin/packages/scr/package.py b/var/spack/repos/builtin/packages/scr/package.py index a34865c792..d963ddf99f 100644 --- a/var/spack/repos/builtin/packages/scr/package.py +++ b/var/spack/repos/builtin/packages/scr/package.py @@ -65,7 +65,7 @@ class Scr(CMakePackage): variant('dtcmp', default=True, description="Build with DTCMP. " "Necessary to enable user directory naming at runtime") - depends_on('dtcmp', when="@:2.999 +dtcmp") + depends_on('dtcmp', when="@:2 +dtcmp") # DTCMP is a required dependency with 3.x and later conflicts('~dtcmp', when="@3:", msg="<SCR> DTCMP required for versions >=3") @@ -156,7 +156,7 @@ class Scr(CMakePackage): args.append('-DSCR_RESOURCE_MANAGER={0}'.format( spec.variants['resource_manager'].value.upper())) - if spec.satisfies('@:2.999'): + if spec.satisfies('@:2'): args.append('-DSCR_ASYNC_API={0}'.format( spec.variants['async_api'].value.upper())) diff --git a/var/spack/repos/builtin/packages/shiro/package.py b/var/spack/repos/builtin/packages/shiro/package.py index 863c77c1b7..dd24f46a3c 100644 --- a/var/spack/repos/builtin/packages/shiro/package.py +++ b/var/spack/repos/builtin/packages/shiro/package.py @@ -20,4 +20,4 @@ class Shiro(MavenPackage): version('1.5.3', sha256='25c5d99eddf790969e0f80bd9769f773465c9c9e1e8ec1f549f476bdae8c6983') depends_on('java@8:', type=('build', 'run')) - depends_on('maven@3.5:3.999', type='build') + depends_on('maven@3.5:3', type='build') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index 1c8576bf96..39df0ed56c 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -40,7 +40,7 @@ class Silo(AutotoolsPackage): depends_on('automake', type='build', when='+shared') depends_on('libtool', type='build', when='+shared') depends_on('mpi', when='+mpi') - depends_on('hdf5@:1.10.999', when='@:4.10.2+hdf5') + depends_on('hdf5@:1.10', when='@:4.10.2+hdf5') depends_on('hdf5', when='+hdf5') depends_on('qt+gui~framework@4.8:4.9', when='+silex') depends_on('libx11', when='+silex') diff --git a/var/spack/repos/builtin/packages/simgrid/package.py b/var/spack/repos/builtin/packages/simgrid/package.py index cbcbfb44f4..b440eaa5fa 100644 --- a/var/spack/repos/builtin/packages/simgrid/package.py +++ b/var/spack/repos/builtin/packages/simgrid/package.py @@ -71,7 +71,7 @@ class Simgrid(CMakePackage): conflicts('%gcc@10:', when='@:3.23', msg='simgrid <= v3.23 cannot be built with gcc >= 10,' - ' please use an older release (e.g., %gcc@:9.99).') + ' please use an older release (e.g., %gcc@:9).') def setup_dependent_package(self, module, dep_spec): diff --git a/var/spack/repos/builtin/packages/sirius/package.py b/var/spack/repos/builtin/packages/sirius/package.py index a5231fe065..e53fec9aae 100644 --- a/var/spack/repos/builtin/packages/sirius/package.py +++ b/var/spack/repos/builtin/packages/sirius/package.py @@ -127,7 +127,7 @@ class Sirius(CMakePackage, CudaPackage): extends('python', when='+python') - conflicts('+shared', when='@6.3.0:6.4.999') + conflicts('+shared', when='@6.3.0:6.4') conflicts('+boost_filesystem', when='~apps') conflicts('^libxc@5.0.0') # known to produce incorrect results conflicts('+single_precision', when='@:7.2.4') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 1719b59e65..6058c43b58 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -58,20 +58,20 @@ class Slepc(Package, CudaPackage, ROCmPackage): variant('blopex', default=False, description='Enables BLOPEX wrappers') # NOTE: make sure PETSc and SLEPc use the same python. - depends_on('python@2.6:2.8', type='build', when='@:3.10.99') + depends_on('python@2.6:2.8', type='build', when='@:3.10') depends_on('python@2.6:2.8,3.4:', type='build', when='@3.11:') # Cannot mix release and development versions of SLEPc and PETSc: depends_on('petsc@main', when='@main') - depends_on('petsc@3.16:3.16.99', when='@3.16:3.16.99') - depends_on('petsc@3.15:3.15.99', when='@3.15:3.15.99') - depends_on('petsc@3.14:3.14.99', when='@3.14:3.14.99') - depends_on('petsc@3.13:3.13.99', when='@3.13:3.13.99') - depends_on('petsc@3.12:3.12.99', when='@3.12:3.12.99') - depends_on('petsc@3.11:3.11.99', when='@3.11:3.11.99') - depends_on('petsc@3.10:3.10.99', when='@3.10:3.10.99') - depends_on('petsc@3.9:3.9.99', when='@3.9:3.9.99') - depends_on('petsc@3.8:3.8.99', when='@3.8:3.8.99') + depends_on('petsc@3.16.0:3.16', when='@3.16.0:3.16') + depends_on('petsc@3.15.0:3.15', when='@3.15.0:3.15') + depends_on('petsc@3.14.0:3.14', when='@3.14.0:3.14') + depends_on('petsc@3.13.0:3.13', when='@3.13.0:3.13') + depends_on('petsc@3.12.0:3.12', when='@3.12.0:3.12') + depends_on('petsc@3.11.0:3.11', when='@3.11.0:3.11') + depends_on('petsc@3.10.0:3.10', when='@3.10.0:3.10') + depends_on('petsc@3.9.0:3.9', when='@3.9.0:3.9') + depends_on('petsc@3.8.0:3.8', when='@3.8.0:3.8') depends_on('petsc@3.7:3.7.7', when='@3.7.1:3.7.4') depends_on('petsc@3.6.3:3.6.4', when='@3.6.2:3.6.3') depends_on('petsc+cuda', when='+cuda') @@ -82,7 +82,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): patch('install_name_371.patch', when='@3.7.1') # Arpack can not be used with 64bit integers. - conflicts('+arpack', when='@:3.12.99 ^petsc+int64') + conflicts('+arpack', when='@:3.12 ^petsc+int64') conflicts('+blopex', when='^petsc+int64') resource(name='blopex', @@ -90,7 +90,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): sha256='0081ee4c4242e635a8113b32f655910ada057c59043f29af4b613508a762f3ac', destination=join_path('installed-arch-' + sys.platform + '-c-opt', 'externalpackages'), - when='@:3.12.99+blopex') + when='@:3.12+blopex') resource(name='blopex', git='https://github.com/lobpcg/blopex', @@ -115,7 +115,7 @@ class Slepc(Package, CudaPackage, ROCmPackage): options.extend([ '--with-arpack-dir=%s' % spec['arpack-ng'].prefix, ]) - if spec.satisfies('@:3.12.99'): + if spec.satisfies('@:3.12'): arpackopt = '--with-arpack-flags' else: arpackopt = '--with-arpack-lib' diff --git a/var/spack/repos/builtin/packages/slider/package.py b/var/spack/repos/builtin/packages/slider/package.py index 824f2292f0..930e51da4d 100644 --- a/var/spack/repos/builtin/packages/slider/package.py +++ b/var/spack/repos/builtin/packages/slider/package.py @@ -18,7 +18,7 @@ class Slider(MavenPackage): version('0.90.2', sha256='410941f772d29f564c4bb90ca0631f29dc895f509048cb6052f8695302e3f944') depends_on('java@8', type=('build', 'run')) - depends_on('python@2.7.0:2.7.99', type='run') + depends_on('python@2.7.0:2.7', type='run') def url_for_version(self, version): return "http://archive.apache.org/dist/incubator/slider/{0}-incubating/apache-slider-{0}-incubating-source-release.tar.gz".format(version) diff --git a/var/spack/repos/builtin/packages/snakemake/package.py b/var/spack/repos/builtin/packages/snakemake/package.py index 8e8fbb7756..3cc12feacd 100644 --- a/var/spack/repos/builtin/packages/snakemake/package.py +++ b/var/spack/repos/builtin/packages/snakemake/package.py @@ -14,7 +14,7 @@ class Snakemake(PythonPackage): version('3.11.2', sha256='f7a3b586bc2195f2dce4a4817b7ec828b6d2a0cff74a04e0f7566dcd923f9761') - depends_on('python@3.3:3.6.999') + depends_on('python@3.3:3.6') depends_on('py-requests', type=('build', 'run')) depends_on('py-setuptools', type=('build', 'run')) depends_on('py-wrapt', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/sollve/package.py b/var/spack/repos/builtin/packages/sollve/package.py index 93462b031c..f617f636b6 100644 --- a/var/spack/repos/builtin/packages/sollve/package.py +++ b/var/spack/repos/builtin/packages/sollve/package.py @@ -136,7 +136,7 @@ class Sollve(CMakePackage): conflicts('+clang_extra', when='~clang') conflicts('+lldb', when='~clang') - conflicts('%gcc@:5.0.999') + conflicts('%gcc@:5.0') conflicts('+omp_tsan') patch('disable_unused_lock.patch', when='@1.0a2', working_dir='projects/openmp') diff --git a/var/spack/repos/builtin/packages/sqlite/package.py b/var/spack/repos/builtin/packages/sqlite/package.py index 57e4b78622..53e24e1c48 100644 --- a/var/spack/repos/builtin/packages/sqlite/package.py +++ b/var/spack/repos/builtin/packages/sqlite/package.py @@ -52,7 +52,7 @@ class Sqlite(AutotoolsPackage): variant('column_metadata', default=True, description="Build with COLUMN_METADATA") # See https://blade.tencent.com/magellan/index_en.html - conflicts('+fts', when='@:3.25.99.99') + conflicts('+fts', when='@:3.25') resource(name='extension-functions', url='https://sqlite.org/contrib/download/extension-functions.c/download/extension-functions.c?get=25', diff --git a/var/spack/repos/builtin/packages/squashfuse/package.py b/var/spack/repos/builtin/packages/squashfuse/package.py index 7a4e995b82..05db957328 100644 --- a/var/spack/repos/builtin/packages/squashfuse/package.py +++ b/var/spack/repos/builtin/packages/squashfuse/package.py @@ -32,7 +32,7 @@ class Squashfuse(AutotoolsPackage): conflicts('~shared', when='~static', msg="Enable shared, static or both") depends_on('fuse@2.5:') - depends_on('fuse@:2.99', when='@:0.1.103') + depends_on('fuse@:2', when='@:0.1.103') # Note: typically libfuse is external, but this implies that you have to make # pkg-config external too, because spack's pkg-config doesn't know how to diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index 0027cfd1ea..8bb8e2895e 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -46,7 +46,7 @@ class Stat(AutotoolsPackage): depends_on('automake', type='build') depends_on('libtool', type='build') depends_on('dyninst', when='~dysect') - depends_on('dyninst@:9.99', when='@:4.0.1') + depends_on('dyninst@:9', when='@:4.0.1') depends_on('dyninst@8.2.1+stat_dysect', when='+dysect') # we depend on fgfs@master to avoid seg faults with fgfs 1.1 depends_on('fast-global-file-status@master', when='+fgfs') diff --git a/var/spack/repos/builtin/packages/stata/package.py b/var/spack/repos/builtin/packages/stata/package.py index 0c5ae83576..81a25c12a7 100644 --- a/var/spack/repos/builtin/packages/stata/package.py +++ b/var/spack/repos/builtin/packages/stata/package.py @@ -33,7 +33,7 @@ class Stata(Package): version('15', '2486f4c7db1e7b453004c7bd3f8da40ba1e30be150613065c7b82b1915259016') depends_on('libpng@1.2.57', when='@15', type='run') - depends_on('libpng@1.6:1.6.99', when='@16', type='run') + depends_on('libpng@1.6.0:1.6', when='@16', type='run') # STATA is downloaded from user/pass protected ftp as Stata15Linux64.tar.gz def url_for_version(self, version): diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index 328e955a6f..e4323bb20c 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -73,7 +73,7 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage): depends_on('parmetis', when='+parmetis') depends_on('scotch~metis', when='+scotch') depends_on('scotch~metis+mpi', when='+scotch+mpi') - depends_on('butterflypack@1.1.0', when='@3.3.0:3.9.999 +butterflypack+mpi') + depends_on('butterflypack@1.1.0', when='@3.3.0:3.9 +butterflypack+mpi') depends_on('butterflypack@1.2.0:', when='@4.0.0: +butterflypack+mpi') depends_on('cuda', when='@4.0.0: +cuda') depends_on('zfp', when='+zfp') @@ -89,9 +89,9 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage): conflicts('+parmetis', when='~mpi') conflicts('+butterflypack', when='~mpi') conflicts('+butterflypack', when='@:3.2.0') - conflicts('+zfp', when='@:3.9.999') - conflicts('+cuda', when='@:3.9.999') - conflicts('+rocm', when='@:5.0.999') + conflicts('+zfp', when='@:3.9') + conflicts('+cuda', when='@:3.9') + conflicts('+rocm', when='@:5.0') conflicts('+rocm', when='+cuda') conflicts('+slate', when='@:5.1.1') conflicts('+slate', when='~mpi') @@ -124,7 +124,7 @@ class Strumpack(CMakePackage, CudaPackage, ROCmPackage): '-DTPL_SCALAPACK_LIBRARIES=%s' % spec['scalapack']. libs.joined(";")) - if spec.satisfies('@:3.9.999'): + if spec.satisfies('@:3.9'): if '+mpi' in spec: args.extend([ '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc, diff --git a/var/spack/repos/builtin/packages/suite-sparse/package.py b/var/spack/repos/builtin/packages/suite-sparse/package.py index 0182658afc..748a598078 100644 --- a/var/spack/repos/builtin/packages/suite-sparse/package.py +++ b/var/spack/repos/builtin/packages/suite-sparse/package.py @@ -60,7 +60,7 @@ class SuiteSparse(Package): # This patch adds '-lm' when linking libgraphblas and when using clang. # Fixes 'libgraphblas.so.2.0.1: undefined reference to `__fpclassify'' - patch('graphblas_libm_dep.patch', when='@5.2.0:5.2.99%clang') + patch('graphblas_libm_dep.patch', when='@5.2.0:5.2%clang') # CUDA-11 dropped sm_30 code generation, remove hardcoded sm_30 from makefile # open issue: https://github.com/DrTimothyAldenDavis/SuiteSparse/issues/56 diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 7c604bb809..7f87809df4 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -45,7 +45,7 @@ class SuperluDist(CMakePackage, CudaPackage): depends_on('parmetis') depends_on('metis@5:') - conflicts('+cuda', when='@:6.3.999') + conflicts('+cuda', when='@:6.3') patch('xl-611.patch', when='@:6.1.1 %xl') patch('xl-611.patch', when='@:6.1.1 %xl_r') diff --git a/var/spack/repos/builtin/packages/superlu/package.py b/var/spack/repos/builtin/packages/superlu/package.py index bae7da2266..be45ac5e02 100644 --- a/var/spack/repos/builtin/packages/superlu/package.py +++ b/var/spack/repos/builtin/packages/superlu/package.py @@ -49,7 +49,7 @@ class Superlu(CMakePackage): return args # Pre-cmake installation method - @when("@:4.999") + @when("@:4") def cmake(self, spec, prefix): """Use autotools before version 5""" config = [] @@ -141,7 +141,7 @@ class Superlu(CMakePackage): return config_args # Pre-cmake configuration - @when('@:4.999') + @when('@:4') def _generate_make_hdr_for_test(self): config_args = [] diff --git a/var/spack/repos/builtin/packages/texstudio/package.py b/var/spack/repos/builtin/packages/texstudio/package.py index b47b0e11af..5363d23ac9 100644 --- a/var/spack/repos/builtin/packages/texstudio/package.py +++ b/var/spack/repos/builtin/packages/texstudio/package.py @@ -29,7 +29,7 @@ class Texstudio(QMakePackage): depends_on('poppler+qt', when="+poppler") # There is a known issue with QT 5.10 # See https://github.com/texstudio-org/texstudio/wiki/Compiling - depends_on('qt@4.4.4:5.9.999,5.11.0:') + depends_on('qt@4.4.4:5.9,5.11.0:') conflicts('target=aarch64:', when='@:2.12.22') diff --git a/var/spack/repos/builtin/packages/thepeg/package.py b/var/spack/repos/builtin/packages/thepeg/package.py index 59d07b97d2..f228f8410f 100644 --- a/var/spack/repos/builtin/packages/thepeg/package.py +++ b/var/spack/repos/builtin/packages/thepeg/package.py @@ -59,10 +59,10 @@ class Thepeg(AutotoolsPackage): depends_on('gsl') depends_on('lhapdf') - depends_on('lhapdf@:6.2.999', when='@:1.9.999') + depends_on('lhapdf@:6.2', when='@:1.9') depends_on('hepmc', when='hepmc=2') depends_on('hepmc3', when='hepmc=3') - conflicts('hepmc=3', when='@:2.1.999', msg='HepMC3 support was added in 2.2.0') + conflicts('hepmc=3', when='@:2.1', msg='HepMC3 support was added in 2.2.0') depends_on('fastjet', when='@2.0.0:') depends_on('rivet', when='@2.0.3:') depends_on('boost', when='@2.1.1:') @@ -79,7 +79,7 @@ class Thepeg(AutotoolsPackage): def configure_args(self): args = ['--with-gsl=' + self.spec['gsl'].prefix, '--without-javagui'] - if self.spec.satisfies('@:1.8.999'): + if self.spec.satisfies('@:1.8'): args += ['--with-LHAPDF=' + self.spec['lhapdf'].prefix] else: args += ['--with-lhapdf=' + self.spec['lhapdf'].prefix] @@ -99,7 +99,7 @@ class Thepeg(AutotoolsPackage): if self.spec.satisfies('@2.0.3:'): args += ['--with-rivet=' + self.spec['rivet'].prefix] - if self.spec.satisfies('@:2.1.999'): + if self.spec.satisfies('@:2.1'): args += ['--with-boost=' + self.spec['boost'].prefix] args += ['CFLAGS=-O2', 'CXXFLAGS=-O2', 'FFLAGS=-O2'] diff --git a/var/spack/repos/builtin/packages/tppred/package.py b/var/spack/repos/builtin/packages/tppred/package.py index 00606e0303..7a2a314c8a 100644 --- a/var/spack/repos/builtin/packages/tppred/package.py +++ b/var/spack/repos/builtin/packages/tppred/package.py @@ -15,7 +15,7 @@ class Tppred(Package): version('2.0', sha256='0e180d5ce1f0bccfdbc3dbf9981b3fbe2101c85491c58c58c88856861688a4f5') - depends_on('python@2.7:2.999', type='run') + depends_on('python@2.7:2', type='run') depends_on('py-scikit-learn@0.13.1', type='run') depends_on('emboss') diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 081cc90c70..fc58595224 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -142,13 +142,13 @@ class Trilinos(CMakePackage, CudaPackage): git='https://github.com/ornl-cees/DataTransferKit.git', commit='4fe4d9d56cfd4f8a61f392b81d8efd0e389ee764', # branch dtk-3.0 placement='DataTransferKit', - when='+dtk @12.14.0:12.14.99') + when='+dtk @12.14.0:12.14') resource(name='dtk', git='https://github.com/ornl-cees/DataTransferKit.git', commit='edfa050cd46e2274ab0a0b7558caca0079c2e4ca', # tag 3.1-rc1 placement='DataTransferKit', submodules=True, - when='+dtk @12.18:12.18.99') + when='+dtk @12.18.0:12.18') resource(name='scorec', git='https://github.com/SCOREC/core.git', commit='73c16eae073b179e45ec625a5abe4915bc589af2', # tag v2.2.5 @@ -158,12 +158,12 @@ class Trilinos(CMakePackage, CudaPackage): url='https://github.com/trilinos/mesquite/archive/trilinos-release-12-12-1.tar.gz', sha256='e0d09b0939dbd461822477449dca611417316e8e8d8268fd795debb068edcbb5', placement='packages/mesquite', - when='+mesquite @12.12.1:12.16.99') + when='+mesquite @12.12.1:12.16') resource(name='mesquite', git='https://github.com/trilinos/mesquite.git', commit='20a679679b5cdf15bf573d66c5dc2b016e8b9ca1', # branch trilinos-release-12-12-1 placement='packages/mesquite', - when='+mesquite @12.18.1:12.18.99') + when='+mesquite @12.18.1:12.18') resource(name='mesquite', git='https://github.com/trilinos/mesquite.git', tag='develop', @@ -235,9 +235,9 @@ class Trilinos(CMakePackage, CudaPackage): # see https://github.com/trilinos/Trilinos/issues/3346 conflicts('+exodus', when='~fortran') # Only allow Mesquite with Trilinos 12.12 and up, and master - conflicts('+mesquite', when='@:12.10.99,master') + conflicts('+mesquite', when='@:12.10,master') # Strumpack is only available as of mid-2021 - conflicts('+strumpack', when='@:13.0.99') + conflicts('+strumpack', when='@:13.0') # Can only use one type of SuperLU conflicts('+superlu-dist', when='+superlu') # For Trilinos v11 we need to force SuperLUDist=OFF, since only the diff --git a/var/spack/repos/builtin/packages/upcxx/package.py b/var/spack/repos/builtin/packages/upcxx/package.py index af16447f1f..5b55de5c2f 100644 --- a/var/spack/repos/builtin/packages/upcxx/package.py +++ b/var/spack/repos/builtin/packages/upcxx/package.py @@ -62,7 +62,7 @@ class Upcxx(Package): depends_on('mpi', when='+mpi') depends_on('cuda', when='+cuda') # Require Python2 2.7.5+ up to v2019.9.0 - depends_on('python@2.7.5:2.999', + depends_on('python@2.7.5:2', type=("build", "run"), when='@:2019.9.0') # v2020.3.0 and later also permit Python3 depends_on('python@2.7.5:', type=("build", "run"), when='@2020.3.0:') diff --git a/var/spack/repos/builtin/packages/vapor/package.py b/var/spack/repos/builtin/packages/vapor/package.py index e171c1950d..749e08d129 100644 --- a/var/spack/repos/builtin/packages/vapor/package.py +++ b/var/spack/repos/builtin/packages/vapor/package.py @@ -32,7 +32,7 @@ class Vapor(CMakePackage): depends_on('libtiff') depends_on('proj') depends_on('glm@0.9.9.1:') - depends_on('python@3.6.0:3.6.99') + depends_on('python@3.6.0:3.6') depends_on('py-numpy') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py index 273c1ba6a2..2a9d0aea0c 100644 --- a/var/spack/repos/builtin/packages/verrou/package.py +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -44,12 +44,12 @@ class Verrou(AutotoolsPackage): resource(name='valgrind-3.14.0', url='https://sourceware.org/pub/valgrind/valgrind-3.14.0.tar.bz2', sha256='037c11bfefd477cc6e9ebe8f193bb237fe397f7ce791b4a4ce3fa1c6a520baa5', - when='@2.1.0:2.1.99', + when='@2.1.0:2.1', fetch_options=timeout) resource(name='valgrind-3.13.0', url='https://sourceware.org/pub/valgrind/valgrind-3.13.0.tar.bz2', sha256='d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b', - when='@1.1.0:2.0.99', + when='@1.1.0:2.0', fetch_options=timeout) variant('fma', default=True, @@ -60,7 +60,7 @@ class Verrou(AutotoolsPackage): depends_on('libtool', type='build') depends_on('m4', type='build') - depends_on('python@:2.99.99', when='@1.1.0:2.0.99', type=('build', 'run')) + depends_on('python@:2', when='@1.1.0:2.0', type=('build', 'run')) depends_on('python@3.0:', when='@2.1.0:', type=('build', 'run')) extends('python') @@ -83,7 +83,7 @@ class Verrou(AutotoolsPackage): os.rmdir(valgrind_dir) # Once this is done, we can patch valgrind - if self.spec.satisfies('@:2.0.99'): + if self.spec.satisfies('@:2.0'): which('patch')('-p0', '--input=verrou/valgrind.diff') else: which('patch')('-p1', '--input=verrou/valgrind.diff') diff --git a/var/spack/repos/builtin/packages/virtuoso/package.py b/var/spack/repos/builtin/packages/virtuoso/package.py index f23626411a..75a3f53124 100644 --- a/var/spack/repos/builtin/packages/virtuoso/package.py +++ b/var/spack/repos/builtin/packages/virtuoso/package.py @@ -35,7 +35,7 @@ class Virtuoso(AutotoolsPackage): depends_on('flex', type='build') depends_on('gperf') depends_on('readline') - depends_on('openssl@0.9.8:1.1.99') + depends_on('openssl@0.9.8:1.1') def autoreconf(self, spec, prefix): bash = which('bash') diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index 46a7721916..3bd6bb0e17 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -177,14 +177,14 @@ class Visit(CMakePackage): depends_on('cmake@3.0:', type='build') # https://github.com/visit-dav/visit/issues/3498 - depends_on('vtk@8.1.0:8.1.999+opengl2~python', when='~python @3.0:3.999,develop') - depends_on('vtk@8.1.0:8.1.999+opengl2+python', when='+python @3.0:3.999,develop') + depends_on('vtk@8.1.0:8.1+opengl2~python', when='~python @3.0:3,develop') + depends_on('vtk@8.1.0:8.1+opengl2+python', when='+python @3.0:3,develop') depends_on('glu', when='platform=linux') - depends_on('vtk@6.1.0~opengl2', when='@:2.999') + depends_on('vtk@6.1.0~opengl2', when='@:2') depends_on('vtk+python', when='+python @3.0:,develop') depends_on('vtk~mpi', when='~mpi') depends_on('vtk+qt', when='+gui') - depends_on('qt+gui@4.8.6:4.999', when='+gui @:2.999') + depends_on('qt+gui@4.8.6:4', when='+gui @:2') depends_on('qt+gui@5.10:', when='+gui @3.0:,develop') depends_on('qwt', when='+gui') depends_on('python@2.6:2.8', when='+python') @@ -198,13 +198,13 @@ class Visit(CMakePackage): depends_on('mpi', when='+mpi') depends_on('adios2', when='+adios2') - conflicts('+adios2', when='@:2.999') - conflicts('+hdf5', when='~gui @:2.999') - conflicts('+silo', when='~gui @:2.999') + conflicts('+adios2', when='@:2') + conflicts('+hdf5', when='~gui @:2') + conflicts('+silo', when='~gui @:2') root_cmakelists_dir = 'src' - @when('@3.0.0:3.999,develop') + @when('@3.0.0:3,develop') def patch(self): # Some of VTK's targets don't create explicit libraries, so there is no # 'vtktiff'. Instead, replace with the library variable defined from diff --git a/var/spack/repos/builtin/packages/votca-csg/package.py b/var/spack/repos/builtin/packages/votca-csg/package.py index dcc9da5fa4..986d064e87 100644 --- a/var/spack/repos/builtin/packages/votca-csg/package.py +++ b/var/spack/repos/builtin/packages/votca-csg/package.py @@ -41,5 +41,5 @@ class VotcaCsg(CMakePackage): "stable"]: depends_on('votca-tools@%s' % v, when="@%s:%s.0" % (v, v)) depends_on("boost") - depends_on("gromacs~mpi@5.1:2019.9999") + depends_on("gromacs~mpi@5.1:2019") depends_on("hdf5~mpi") diff --git a/var/spack/repos/builtin/packages/votca-tools/package.py b/var/spack/repos/builtin/packages/votca-tools/package.py index 199919bf3a..0c72242b0c 100644 --- a/var/spack/repos/builtin/packages/votca-tools/package.py +++ b/var/spack/repos/builtin/packages/votca-tools/package.py @@ -41,7 +41,7 @@ class VotcaTools(CMakePackage): patch("https://github.com/votca/tools/commit/6bb7e35ba7d1a31247eafb323be2777ec0439cfe.patch", sha256="3c9fa5ac9cf45c54ac475bcb22350793efaccd6b5154e3d30c24b8aa754fe47b", when="@2021:2021.0") variant('mkl', default=False, description='Build with MKL support') - conflicts('+mkl', when='@1.4:1.5.9999') + conflicts('+mkl', when='@1.4:1.5') depends_on("cmake@2.8:", type='build') depends_on("expat") @@ -49,7 +49,7 @@ class VotcaTools(CMakePackage): depends_on("gsl", when="@1.4:1.4.9999") depends_on("eigen@3.3:", when="@stable,1.5:") depends_on("boost") - depends_on("sqlite", when="@1.4:1.5.9999") + depends_on("sqlite", when="@1.4:1.5") depends_on('mkl', when='+mkl') def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index 66ccee6c32..278a6cb373 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -68,7 +68,7 @@ class VtkH(Package, CudaPackage): variant("contourtree", default=False, description="Enable contour tree support") # Certain CMake versions have been found to break for our use cases - depends_on("cmake@3.14.1:3.14.99,3.18.2:", type='build') + depends_on("cmake@3.14.1:3.14,3.18.2:", type='build') depends_on("mpi", when="+mpi") depends_on("cuda", when="+cuda") diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 636c8e049a..b151c61b93 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -60,7 +60,7 @@ class Vtk(CMakePackage): # We need vtk at least 8.0.1 for python@3, # and at least 9.0 for python@3.8 depends_on('python@2.7:2.9', when='@:8.0 +python', type=('build', 'run')) - depends_on('python@2.7:3.7.99', when='@8.0.1:8.9 +python', + depends_on('python@2.7:3.7', when='@8.0.1:8.9 +python', type=('build', 'run')) depends_on('python@2.7:', when='@9.0: +python', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py index 093916b851..883a18c983 100644 --- a/var/spack/repos/builtin/packages/whizard/package.py +++ b/var/spack/repos/builtin/packages/whizard/package.py @@ -59,7 +59,7 @@ class Whizard(AutotoolsPackage): description="data visualization with latex") depends_on('ocaml@4.02.3:', type='build', when="@3:") - depends_on('ocaml@4.02.3:~force-safe-string', type='build', when="@:2.99.99") + depends_on('ocaml@4.02.3:~force-safe-string', type='build', when="@:2") depends_on('hepmc', when="hepmc=2") depends_on('hepmc3', when="hepmc=3") depends_on('lcio', when="+lcio") @@ -72,7 +72,7 @@ class Whizard(AutotoolsPackage): depends_on('texlive', when="+latex") depends_on('zlib') - conflicts('%gcc@:5.0.99', + conflicts('%gcc@:5.0', msg='gfortran needs to support Fortran 2008. For more detailed information see https://whizard.hepforge.org/compilers.html') conflicts('%gcc@6.5.0', msg='Due to severe regressions, gfortran 6.5.0 can not be used. See https://whizard.hepforge.org/compilers.html') diff --git a/var/spack/repos/builtin/packages/wireshark/package.py b/var/spack/repos/builtin/packages/wireshark/package.py index d6c72ac1a2..0290ed3356 100644 --- a/var/spack/repos/builtin/packages/wireshark/package.py +++ b/var/spack/repos/builtin/packages/wireshark/package.py @@ -32,7 +32,7 @@ class Wireshark(CMakePackage): depends_on('libmaxminddb') depends_on('libtool@2.2.2:', type='build') depends_on('libpcap') - depends_on('lua@5.0.0:5.2.99') + depends_on('lua@5.0.0:5.2') depends_on('krb5') depends_on('pkgconfig', type='build') depends_on('libssh', when='+libssh') diff --git a/var/spack/repos/builtin/packages/wxparaver/package.py b/var/spack/repos/builtin/packages/wxparaver/package.py index 1aa9eb9665..ce475d3eac 100644 --- a/var/spack/repos/builtin/packages/wxparaver/package.py +++ b/var/spack/repos/builtin/packages/wxparaver/package.py @@ -36,7 +36,7 @@ class Wxparaver(AutotoolsPackage): args.append('--with-boost=%s' % spec['boost'].prefix) args.append('--with-wx-config=%s/wx-config' % spec['wxwidgets'].prefix.bin) - if spec['wxwidgets'].satisfies('@:2.999'): + if spec['wxwidgets'].satisfies('@:2'): args.append('--with-wxpropgrid=%s' % spec['wxpropgrid'].prefix) return args diff --git a/var/spack/repos/builtin/packages/xeus/package.py b/var/spack/repos/builtin/packages/xeus/package.py index 8f3c899a05..39a70ed5bf 100644 --- a/var/spack/repos/builtin/packages/xeus/package.py +++ b/var/spack/repos/builtin/packages/xeus/package.py @@ -36,7 +36,7 @@ class Xeus(CMakePackage): depends_on('openssl@1.0.1:', when='@1.0.4:') depends_on('xtl@0.4.0:', when='@:0.15.0') - depends_on('xtl@0.7.0:0.7.999', when='@1.0.4:') + depends_on('xtl@0.7.0:0.7', when='@1.0.4:') depends_on('nlohmann-json@3.4.0:', when='@1.0.4:') depends_on('nlohmann-json@3.2.0', when='@0.15.0') diff --git a/var/spack/repos/builtin/packages/xgboost/package.py b/var/spack/repos/builtin/packages/xgboost/package.py index 5b9476faf6..85e9c26de0 100644 --- a/var/spack/repos/builtin/packages/xgboost/package.py +++ b/var/spack/repos/builtin/packages/xgboost/package.py @@ -34,7 +34,7 @@ class Xgboost(CMakePackage, CudaPackage): depends_on('nccl', when='+nccl') depends_on('llvm-openmp', when='%apple-clang +openmp') - conflicts('%gcc@:4.999', msg='GCC version must be at least 5.0!') + conflicts('%gcc@:4', msg='GCC version must be at least 5.0!') conflicts('+nccl', when='~cuda', msg='NCCL requires CUDA') conflicts('+cuda', when='~openmp', msg='CUDA requires OpenMP') diff --git a/var/spack/repos/builtin/packages/xproperty/package.py b/var/spack/repos/builtin/packages/xproperty/package.py index 80b7e8c14b..3e23910a2c 100644 --- a/var/spack/repos/builtin/packages/xproperty/package.py +++ b/var/spack/repos/builtin/packages/xproperty/package.py @@ -18,7 +18,7 @@ class Xproperty(CMakePackage): version('master', branch='master') version('0.11.0', sha256='bf86a11c6758308aa0aa0f64d8dd24cd3e9d78378467b74002f552bfb75fc0eb') - depends_on('xtl@0.7.0:0.7.999', when='@0.11.0:') + depends_on('xtl@0.7.0:0.7', when='@0.11.0:') # C++14 support conflicts('%gcc@:4.8') diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 52b210b40e..3b75fb86db 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -69,7 +69,7 @@ class Xrootd(CMakePackage): depends_on('zlib') extends('python', when='+python') - patch('python-support.patch', level=1, when='@:4.8.99+python') + patch('python-support.patch', level=1, when='@:4.8+python') def patch(self): """Remove hardcoded -std=c++0x flag diff --git a/var/spack/repos/builtin/packages/xtensor-python/package.py b/var/spack/repos/builtin/packages/xtensor-python/package.py index 16d558af14..d9f17f289e 100644 --- a/var/spack/repos/builtin/packages/xtensor-python/package.py +++ b/var/spack/repos/builtin/packages/xtensor-python/package.py @@ -20,12 +20,12 @@ class XtensorPython(CMakePackage): version('0.17.0', sha256='30f2e8c99376e38f942d62c0d2959bc1e52a562a4f8cc5e27ddc4d572a25e34c') depends_on('xtensor', when='@develop') - depends_on('xtensor@0.20.6:0.20.99', when='@0.23.1') - depends_on('xtensor@0.15.1:0.15.99', when='@0.17.0') + depends_on('xtensor@0.20.6:0.20', when='@0.23.1') + depends_on('xtensor@0.15.1:0.15', when='@0.17.0') depends_on('xtl', when='@develop') - depends_on('xtl@0.6.4:0.6.99', when='@0.23.1') - depends_on('xtl@0.4.0:0.4.99', when='@0.17.0') - depends_on('py-pybind11@2.2.1:2.2.99') + depends_on('xtl@0.6.4:0.6', when='@0.23.1') + depends_on('xtl@0.4.0:0.4', when='@0.17.0') + depends_on('py-pybind11@2.2.1:2.2') depends_on('py-numpy') depends_on('python', type=('build', 'link', 'run')) diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py index 1a82663763..752680d53b 100644 --- a/var/spack/repos/builtin/packages/xtensor/package.py +++ b/var/spack/repos/builtin/packages/xtensor/package.py @@ -29,16 +29,16 @@ class Xtensor(CMakePackage): description='Enable TBB parallelization') depends_on('xtl', when='@develop') - depends_on('xtl@0.7.2:0.7.99', when='@0.23.2:') - depends_on('xtl@0.6.4:0.6.99', when='@0.20.7') - depends_on('xtl@0.4.0:0.4.99', when='@0.15.1') - depends_on('xtl@0.3.3:0.3.99', when='@0.13.1') + depends_on('xtl@0.7.2:0.7', when='@0.23.2:') + depends_on('xtl@0.6.4:0.6', when='@0.20.7') + depends_on('xtl@0.4.0:0.4', when='@0.15.1') + depends_on('xtl@0.3.3:0.3', when='@0.13.1') depends_on('xsimd', when='@develop') - depends_on('xsimd@7.4.10:7.99', when='@0.23.4: +xsimd') - depends_on('xsimd@7.4.9:7.99', when='@0.23.2 +xsimd') - depends_on('xsimd@7.2.3:7.99', when='@0.20.7 +xsimd') - depends_on('xsimd@4.0.0:4.99', when='@0.15.1 +xsimd') - depends_on('xsimd@3.1.0:3.99', when='@0.13.1 +xsimd') + depends_on('xsimd@7.4.10:7', when='@0.23.4: +xsimd') + depends_on('xsimd@7.4.9:7', when='@0.23.2 +xsimd') + depends_on('xsimd@7.2.3:7', when='@0.20.7 +xsimd') + depends_on('xsimd@4.0.0:4', when='@0.15.1 +xsimd') + depends_on('xsimd@3.1.0:3', when='@0.13.1 +xsimd') depends_on('intel-tbb', when='+tbb') # C++14 support diff --git a/var/spack/repos/builtin/packages/xwidgets/package.py b/var/spack/repos/builtin/packages/xwidgets/package.py index 836f2b2fc7..86218ced5a 100644 --- a/var/spack/repos/builtin/packages/xwidgets/package.py +++ b/var/spack/repos/builtin/packages/xwidgets/package.py @@ -18,7 +18,7 @@ class Xwidgets(CMakePackage): version('master', branch='master') version('0.25.0', sha256='7b6d36999e3b926c40389167c48b33f234a075365f089f89571b33a160421d8e') - depends_on('xtl@0.7.0:0.7.999', when='@0.25.0:') - depends_on('xproperty@0.11.0:0.11.999', when='@0.25.0:') - depends_on('xeus@1.0:1.999', when='@0.25.0:') - depends_on('nlohmann-json@3.6.1:3.999.999', when='@0.25.0:') + depends_on('xtl@0.7.0:0.7', when='@0.25.0:') + depends_on('xproperty@0.11.0:0.11', when='@0.25.0:') + depends_on('xeus@1.0:1', when='@0.25.0:') + depends_on('nlohmann-json@3.6.1:3', when='@0.25.0:') diff --git a/var/spack/repos/builtin/packages/yaml-cpp/package.py b/var/spack/repos/builtin/packages/yaml-cpp/package.py index 63d293ef98..0452cabd84 100644 --- a/var/spack/repos/builtin/packages/yaml-cpp/package.py +++ b/var/spack/repos/builtin/packages/yaml-cpp/package.py @@ -30,7 +30,7 @@ class YamlCpp(CMakePackage): variant('tests', default=False, description='Build yaml-cpp tests using internal gtest') - depends_on('boost@:1.66.99', when='@0.5.0:0.5.3') + depends_on('boost@:1.66', when='@0.5.0:0.5.3') conflicts('%gcc@:4.7', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") conflicts('%clang@:3.3.0', when='@0.6.0:', msg="versions 0.6.0: require c++11 support") diff --git a/var/spack/repos/tutorial/packages/hdf5/package.py b/var/spack/repos/tutorial/packages/hdf5/package.py index e188bb94b1..a4d25b62fd 100644 --- a/var/spack/repos/tutorial/packages/hdf5/package.py +++ b/var/spack/repos/tutorial/packages/hdf5/package.py @@ -91,13 +91,13 @@ class Hdf5(CMakePackage): # The compiler wrappers (h5cc, h5fc, etc.) run 'pkg-config'. depends_on('pkgconfig', type='run') - conflicts('api=v114', when='@1.6:1.12.99', + conflicts('api=v114', when='@1.6.0:1.12', msg='v114 is not compatible with this release') - conflicts('api=v112', when='@1.6:1.10.99', + conflicts('api=v112', when='@1.6.0:1.10', msg='v112 is not compatible with this release') - conflicts('api=v110', when='@1.6:1.8.99', + conflicts('api=v110', when='@1.6.0:1.8', msg='v110 is not compatible with this release') - conflicts('api=v18', when='@1.6:1.6.99', + conflicts('api=v18', when='@1.6.0:1.6', msg='v18 is not compatible with this release') # The Java wrappers and associated libhdf5_java library @@ -387,9 +387,9 @@ class Hdf5(CMakePackage): # 1.10.6 and 1.12.0. The current develop versions do not produce 'h5pfc' # at all. Here, we make sure that 'h5pfc' is available when Fortran and # MPI support are enabled (only for versions that generate 'h5fc'). - if self.spec.satisfies('@1.8.22:1.8.999,' - '1.10.6:1.10.999,' - '1.12.0:1.12.999,' + if self.spec.satisfies('@1.8.22:1.8,' + '1.10.6:1.10,' + '1.12.0:1.12,' 'develop:' '+fortran+mpi'): with working_dir(self.prefix.bin): |