diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-11-22 17:02:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-22 15:02:30 -0800 |
| commit | c5883fffd7310f704a8adc2f3666d7539cdfe4e1 (patch) | |
| tree | 6878ac2edd4efab60b0655a25891e8f010c17f1a | |
| parent | 4bf964e6b36e8756b014c2e30343507c1cb71b03 (diff) | |
| download | spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.tar.gz spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.tar.bz2 spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.tar.xz spack-c5883fffd7310f704a8adc2f3666d7539cdfe4e1.zip | |
Python: drop EOL versions (#33898)
This PR removes [end of life](https://endoflife.date/python) versions of Python from Spack. Specifically, this includes all versions of Python older than 3.7.
See https://github.com/spack/spack/discussions/31824 for rationale. Deprecated in #32615. And #28003.
For anyone using software that relies on Python 2, you have a few options:
* Upgrade the software to support Python 3. The `3to2` tool may get you most of the way there, although more complex libraries may need manual tweaking.
* Add Python 2 as an [external package](https://spack.readthedocs.io/en/latest/build_settings.html#external-packages). Many Python libraries do not support Python 2, but you may be able to add older versions that did once upon a time.
* Use Spack 0.19. Spack 0.19 is the last release to officially support Python 3.6 and older
* Create and maintain your own [custom repository](https://spack.readthedocs.io/en/latest/repositories.html). Basically, you would need a package for Python 2 and any other Python 2-specific libraries you need.
542 files changed, 321 insertions, 8285 deletions
diff --git a/var/spack/repos/builtin/packages/alps/alps_climit.patch b/var/spack/repos/builtin/packages/alps/alps_climit.patch deleted file mode 100644 index 63a45a069a..0000000000 --- a/var/spack/repos/builtin/packages/alps/alps_climit.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r -N e/alps/src/alps/osiris/xdrcore.C h/alps/src/alps/osiris/xdrcore.C ---- e/alps/src/alps/osiris/xdrcore.C 2020-11-04 12:59:46.000000000 +0900 -+++ h/alps/src/alps/osiris/xdrcore.C 2020-12-16 11:45:16.000000000 +0900 -@@ -66,6 +66,7 @@ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> -+#include <climits> - - #include <alps/osiris/xdrcore.h> - diff --git a/var/spack/repos/builtin/packages/alps/alps_cmake_time.patch b/var/spack/repos/builtin/packages/alps/alps_cmake_time.patch deleted file mode 100644 index 0b64d830bd..0000000000 --- a/var/spack/repos/builtin/packages/alps/alps_cmake_time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/alps/config/run_test.cmake 2020-12-10 10:05:48.925076699 +0900 -+++ b/alps/config/run_test.cmake 2020-12-10 11:37:18.180959480 +0900 -@@ -3,7 +3,7 @@ - # (See accompanying file LICENSE_1_0.txt or copy at - # http://www.boost.org/LICENSE_1_0.txt) - --find_program(cmd_path ${cmd} ${binarydir} ${dllexedir}) -+find_program(cmd_path ${cmd} ${binarydir} ${dllexedir} NO_SYSTEM_ENVIRONMENT_PATH) - - find_file(input_path ${input}.input ${binarydir} ${sourcedir}) - if(NOT input_path) diff --git a/var/spack/repos/builtin/packages/alps/alps_newgcc.patch b/var/spack/repos/builtin/packages/alps/alps_newgcc.patch deleted file mode 100644 index 27e89ad90f..0000000000 --- a/var/spack/repos/builtin/packages/alps/alps_newgcc.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -u -r -N a/alps/applications/dmrg/dmrg/dmtk/system.h b/alps/applications/dmrg/dmrg/dmtk/system.h ---- a/alps/applications/dmrg/dmrg/dmtk/system.h 2020-10-20 15:38:28.000000000 +0900 -+++ b/alps/applications/dmrg/dmrg/dmtk/system.h 2020-10-20 15:40:15.000000000 +0900 -@@ -577,8 +577,11 @@ - { - s.write((const char *)&_numsweeps, sizeof(size_t)); - for(int i = 1; i <= _numsweeps; i++){ -- s.write((const char *)&_sweeps(0,i), sizeof(double)); -- s.write((const char *)&_sweeps(1,i), sizeof(double)); -+ double x; -+ x = _sweeps(0,i); -+ s.write((const char *)&x, sizeof(double)); -+ x = _sweeps(1,i); -+ s.write((const char *)&x, sizeof(double)); - } - s.write((const char *)&_in_warmup, sizeof(bool)); - s.write((const char *)&_sweep, sizeof(int)); -diff -u -r -N a/alps/applications/dmrg/mps/framework/dmrg/mp_tensors/twositetensor.hpp b/alps/applications/dmrg/mps/framework/dmrg/mp_tensors/twositetensor.hpp ---- a/alps/applications/dmrg/mps/framework/dmrg/mp_tensors/twositetensor.hpp 2020-10-20 14:47:06.000000000 +0900 -+++ b/alps/applications/dmrg/mps/framework/dmrg/mp_tensors/twositetensor.hpp 2020-10-20 14:47:53.000000000 +0900 -@@ -216,8 +216,8 @@ - swap(this->left_i, b.left_i); - swap(this->right_i, b.right_i); - swap(this->data_, b.data_); -- swap(this->cur_storage, b.cur_storage); -- swap(this->cur_normalization, b.cur_normalization); -+ this->swap(this->cur_storage, b.cur_storage); -+ this->swap(this->cur_normalization, b.cur_normalization); - } - - template<class Matrix, class SymmGroup> -diff -u -r -N a/alps/applications/qmc/sse4/model.h b/alps/applications/qmc/sse4/model.h ---- a/alps/applications/qmc/sse4/model.h 2020-10-20 15:12:20.000000000 +0900 -+++ b/alps/applications/qmc/sse4/model.h 2020-12-15 14:56:27.000000000 +0900 -@@ -140,11 +140,6 @@ - return diag_vertex_indices[e_index(state, utype, sites)]; - } - -- double max_diag_me() const -- { -- return _max_diag_me; -- } -- - double c(unsigned unit_type) const - { - return epsilon + _max_diag_me[unit_type]; -diff -u -r -N a/alps/src/alps/alea/histogram.h b/alps/src/alps/alea/histogram.h ---- a/alps/src/alps/alea/histogram.h 2020-10-20 14:49:19.000000000 +0900 -+++ b/alps/src/alps/alea/histogram.h 2020-12-15 14:56:59.000000000 +0900 -@@ -85,9 +85,7 @@ - // forward a few things from container - - const_iterator begin() const { return histogram_.begin();} -- const_iterator rbegin() const { return histogram_.rbegin();} - const_iterator end() const { return histogram_.end();} -- const_iterator rend() const { return histogram_.rend();} - size_type size() const { return histogram_.size();} - value_type operator[](size_type i) const { return histogram_[i];} - value_type at(size_type i) const { return histogram_.at(i);} diff --git a/var/spack/repos/builtin/packages/alps/mpi.patch b/var/spack/repos/builtin/packages/alps/mpi.patch deleted file mode 100644 index bd68181eb7..0000000000 --- a/var/spack/repos/builtin/packages/alps/mpi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/alps/src/alps/CMakeLists.txt b/alps/src/alps/CMakeLists.txt -index ae73f13..0d1ba34 100644 ---- a/alps/src/alps/CMakeLists.txt -+++ b/alps/src/alps/CMakeLists.txt -@@ -93,7 +93,7 @@ if (Boost_FOUND) - set(ALPS_LINK_LIBS ${ALPS_LINK_LIBS} ${PYTHON_LIBRARY} ${PYTHON_EXTRA_LIBS}) - endif(PYTHONLIBS_FOUND) - if(MPI_FOUND) -- set(ALPS_LINK_LIBS ${ALPS_LINK_LIBS} ${MPI_LIBRARIES} ${MPI_EXTRA_LIBRARY}) -+ set(ALPS_LINK_LIBS ${ALPS_LINK_LIBS} ${MPI_LIBRARIES}) - endif(MPI_FOUND) - target_link_libraries(alps ${ALPS_LINK_LIBS}) - else (Boost_FOUND) diff --git a/var/spack/repos/builtin/packages/alps/package.py b/var/spack/repos/builtin/packages/alps/package.py deleted file mode 100644 index 651c204864..0000000000 --- a/var/spack/repos/builtin/packages/alps/package.py +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - -# Refs for building from source and recipes -# https://alps.comp-phys.org/mediawiki/index.php/Building_ALPS_from_source -# https://github.com/easybuilders/easybuild-easyconfigs/tree/master/easybuild/easyconfigs/a/ALPS -# https://github.com/conda-forge/alps-feedstock/tree/master/recipe - - -class Alps(CMakePackage): - """Algorithms for Physics Simulations - - Tags: Condensed Matter Physics, Computational Physics - """ - - homepage = "https://alps.comp-phys.org" - url = "https://alps.comp-phys.org/static/software/releases/alps-2.3.0-src.tar.gz" - - version("2.3.0", sha256="e64208d1e5acdd6f569277413c4867e1fa366cf4a224570eacbf1e9939fca2d2") - - # Package failed to build with boost version >= 1.64 - depends_on( - "boost@:1.63.0" - "+chrono +date_time +filesystem +iostreams +mpi +numpy +program_options" - "+python +regex +serialization +system +test +thread +timer" - ) - depends_on("fftw") - depends_on("hdf5 ~mpi+hl") - depends_on("lapack") - # build fails for latest python@3.7 - 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") - depends_on("py-scipy@:1.5", when="^python@:3.6") - - # fix for gcc@7: - patch("alps_newgcc.patch", when="%gcc@7:") - - # remove a problematic build variable - patch("mpi.patch") - - # include climits to use INT_MAX - patch("alps_climit.patch") - - # ctest tries to test '/usr/bin/time' - patch("alps_cmake_time.patch") - - extends("python") - - root_cmakelists_dir = "alps" - - def cmake_args(self): - args = [] - args.append("Boost_ROOT_DIR=" + self.spec["boost"].prefix) - args.append("-DCMAKE_CXX_FLAGS={0}".format(self.compiler.cxx98_flag)) - return args - - def _single_test(self, target, exename, dataname, opts=[]): - troot = self.prefix.tutorials - copy_tree(join_path(troot, target), target) - - if target == "dmrg-01-dmrg": - test_dir = self.test_suite.current_test_data_dir - copy(join_path(test_dir, dataname), target) - - self.run_test("parameter2xml", options=[dataname, "SEED=123456"], work_dir=target) - options = [] - options.extend(opts) - options.extend(["--write-xml", "{0}.in.xml".format(dataname)]) - self.run_test( - exename, options=options, expected=["Finished with everything."], work_dir=target - ) - - def test(self): - self._single_test("mc-02-susceptibilities", "spinmc", "parm2a", ["--Tmin", "10"]) - self._single_test("ed-01-sparsediag", "sparsediag", "parm1a") - self._single_test("dmrg-01-dmrg", "dmrg", "spin_one_half") diff --git a/var/spack/repos/builtin/packages/alps/test/spin_one_half b/var/spack/repos/builtin/packages/alps/test/spin_one_half deleted file mode 100644 index bb47ce88e7..0000000000 --- a/var/spack/repos/builtin/packages/alps/test/spin_one_half +++ /dev/null @@ -1,9 +0,0 @@ -LATTICE="open chain lattice" -MODEL="spin" -CONSERVED_QUANTUMNUMBERS="N,Sz" -Sz_total=0 -J=1 -SWEEPS=4 -NUMBER_EIGENVALUES=1 -L=32 -{MAXSTATES=100} diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index a251e4376b..a2ba27e02b 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -20,8 +20,6 @@ class Alquimia(CMakePackage): version("1.0.9", commit="2ee3bcfacc63f685864bcac2b6868b48ad235225") # tag v.1.0.9 version("xsdk-0.6.0", commit="9a0aedd3a927d4d5e837f8fd18b74ad5a78c3821") version("xsdk-0.5.0", commit="8397c3b00a09534c5473ff3ab21f0e32bb159380") - version("xsdk-0.4.0", commit="2edad6733106142d014bb6e6a73c2b21d5e3cf2d") - version("xsdk-0.3.0", tag="xsdk-0.3.0") variant("shared", default=True, description="Enables the build of shared libraries") @@ -31,11 +29,7 @@ class Alquimia(CMakePackage): depends_on("pflotran@3.0.2", when="@1.0.9") depends_on("pflotran@xsdk-0.6.0", when="@xsdk-0.6.0") depends_on("pflotran@xsdk-0.5.0", when="@xsdk-0.5.0") - depends_on("pflotran@xsdk-0.4.0", when="@xsdk-0.4.0") - depends_on("pflotran@xsdk-0.3.0", when="@xsdk-0.3.0") depends_on("pflotran@develop", when="@develop") - depends_on("petsc@3.10.0:3.10", when="@xsdk-0.4.0") - depends_on("petsc@3.8.0:3.8", when="@xsdk-0.3.0") depends_on("petsc@3.10:", when="@develop") @when("@1.0.10") diff --git a/var/spack/repos/builtin/packages/ambari/package.py b/var/spack/repos/builtin/packages/ambari/package.py deleted file mode 100644 index 68fcdac590..0000000000 --- a/var/spack/repos/builtin/packages/ambari/package.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Ambari(PythonPackage): - """Apache Ambari is a tool for provisioning, managing, and monitoring - Apache Hadoop clusters. Ambari consists of a set of RESTful APIs and - a browser-based management interface.""" - - homepage = "https://cwiki.apache.org/confluence/display/AMBARI/Ambari" - url = "https://github.com/apache/ambari/archive/release-2.7.5.tar.gz" - - version("2.7.5", sha256="f8c8687b7a61b633b92f83b1c104fd75b1e13836cd8a0e0df6db7b483b23a354") - version("2.7.4", sha256="d6796c7ea913d39c93dad52b4cb74ef411a7dce4ebf68f11b12718117f2c01a4") - version("2.7.3", sha256="30fe72e60fa6b62fe032bd193ebd0cef20b65c54b57cad92f6f44daabd3771cf") - version("2.7.1", sha256="ea4eb28f377ce9d0b9b7648f2020dda4be974c6d9a22ebaafbf1bc97890e4e42") - - 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/amdlibm/package.py b/var/spack/repos/builtin/packages/amdlibm/package.py index 3956a9bf1e..9c4fb448f2 100644 --- a/var/spack/repos/builtin/packages/amdlibm/package.py +++ b/var/spack/repos/builtin/packages/amdlibm/package.py @@ -34,7 +34,6 @@ class Amdlibm(SConsPackage): variant("verbose", default=False, description="Building with verbosity") # Mandatory dependencies - depends_on("python@3.6.2", when="%aocc@3.2.0:", type=("build", "run")) depends_on("python@3.6.1:", type=("build", "run")) depends_on("scons@3.1.2:", type=("build")) depends_on("mpfr", type=("link")) diff --git a/var/spack/repos/builtin/packages/aomp/package.py b/var/spack/repos/builtin/packages/aomp/package.py index 490bda2f22..ebc4ea7ac1 100644 --- a/var/spack/repos/builtin/packages/aomp/package.py +++ b/var/spack/repos/builtin/packages/aomp/package.py @@ -90,19 +90,11 @@ class Aomp(Package): version("3.10.0", sha256=versions_dict["3.10.0"]["aomp"]) version("3.9.0", sha256=versions_dict["3.9.0"]["aomp"]) - version("3.8.0", sha256=versions_dict["3.8.0"]["aomp"]) - version("3.7.0", sha256=versions_dict["3.7.0"]["aomp"]) - version("3.5.0", sha256=versions_dict["3.5.0"]["aomp"]) # Cmake above 3.18 would fail the build on 3.5.0 depends_on("cmake@3:", type="build") depends_on("cmake@3:3.17", when="@3.5.0", type="build") - # Python 2 is needed for 3.5.0 and 3.8.0, limit py-setuptools - # to avoid spec error - depends_on("python@2.7:2.8", when="@3.5.0:3.8.0", type="build") - depends_on("py-setuptools@:44", when="@3.5.0:3.8.0", type="build") - depends_on("python@3:", type="build", when="@3.9.0:") depends_on("py-setuptools", when="@3.9.0:", type="build") diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index 7d7377d461..d2a16e3f16 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -22,25 +22,12 @@ class Asciidoc(AutotoolsPackage): version("9.0.3", sha256="b6ef4accd7959f51b532ab4d3aaa211e15f18fd544c4c3cc3ed712f5590a50de") version("9.0.2", sha256="93fbe32d56380afee2f26389d8ebfdf33de72536449d53308120d3c20d2c1e17") version("8.6.10", sha256="22d6793d4f48cefb4a6963853212a214591a591ece1bcbc56af3c67c642003ea") - version("8.6.9", sha256="45e95bed1e341980f7de0a66fdc467090956fe55d4625bdad8057cd926e0c6c6") depends_on("libxml2", type=("build", "run")) 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", when="@:8.6.9", type=("build", "run")) - depends_on("python@3.5:", when="@9.0.2:", type=("build", "run")) + depends_on("python@3.5:", type=("build", "run")) depends_on("autoconf", type="build") depends_on("automake", type="build") depends_on("libtool", type="build") - - @when("@:8.6.9") - def install(self, spec, prefix): - # Old release demands python2 - mpythpath = spec["python"].command.path - exes = ["asciidoc", "a2x"] - for exe in exes: - fthfile = FileFilter(exe + ".py") - fthfile.filter("#!/usr/bin/env python", "#!" + mpythpath) - - make("install") diff --git a/var/spack/repos/builtin/packages/aws-parallelcluster/enum34.patch b/var/spack/repos/builtin/packages/aws-parallelcluster/enum34.patch deleted file mode 100644 index c96a5c2d41..0000000000 --- a/var/spack/repos/builtin/packages/aws-parallelcluster/enum34.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2020-02-06 15:40:26.000000000 -0600 -+++ b/setup.py 2020-02-06 15:41:17.000000000 -0600 -@@ -27,10 +27,12 @@ - "future>=0.16.0,<=0.18.2", - "tabulate>=0.8.2,<=0.8.3", - "ipaddress>=1.0.22", -- "enum34>=1.1.6", - "PyYAML>=5.1.2", - ] - -+if sys.version_info < (3, 4): -+ REQUIRES.append("enum34>=1.1.6") -+ - if sys.version_info[0] == 2: - REQUIRES.append("configparser>=3.5.0,<=3.8.1") - diff --git a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py index 75cf9a3f83..ad741d01ed 100644 --- a/var/spack/repos/builtin/packages/aws-parallelcluster/package.py +++ b/var/spack/repos/builtin/packages/aws-parallelcluster/package.py @@ -57,23 +57,17 @@ class AwsParallelcluster(PythonPackage): depends_on("py-ipaddress@1.0.22:", type=("build", "run")) - depends_on("py-configparser@3.5.0:3.8.1", when="^python@:2", type=("build", "run")) - - depends_on("py-tabulate@0.8.3:0.8.10", when="@2.11: ^python@:2,3.5:3.9", type=("build", "run")) + depends_on("py-tabulate@0.8.3:0.8.10", when="@2.11: ^python@:3.9", type=("build", "run")) depends_on("py-tabulate@0.8.8:0.8.10", when="@2.11: ^python@3.10:", type=("build", "run")) depends_on("py-tabulate@0.8.2:0.8.3", when="@:2.8", type=("build", "run")) - depends_on("py-tabulate@0.8.5", when="@2.9: ^python@3.0:3.4", type=("build", "run")) - depends_on("py-tabulate@0.8.2:0.8.7", when="@2.9: ^python@:2,3.5:", type=("build", "run")) + depends_on("py-tabulate@0.8.2:0.8.7", when="@2.9:", type=("build", "run")) - depends_on("py-pyyaml@5.3.1:", when="@2.11:", type=("build", "run")) - depends_on("py-pyyaml@5.3.1:", when="@2.9:2.10 ^python@:2,3.5:", type=("build", "run")) - depends_on("py-pyyaml@5.2", when="@2.6:2.10 ^python@3.0:3.4", type=("build", "run")) - depends_on("py-pyyaml@5.1.2:", when="@2.6:2.8 ^python@:2,3.5:", type=("build", "run")) - depends_on("py-pyyaml@5.1.2:", when="@:2.5", type=("build", "run")) + depends_on("py-pyyaml@5.3.1:", when="@2.9:", type=("build", "run")) + depends_on("py-pyyaml@5.2", when="@2.6:2.10", type=("build", "run")) + depends_on("py-pyyaml@5.1.2:", when="@:2.8", type=("build", "run")) depends_on("py-jinja2@2.11.3:", when="@2.11:", type=("build", "run")) - depends_on("py-jinja2@2.10.1", when="@2.9: ^python@3.0:3.4", type=("build", "run")) - depends_on("py-jinja2@2.11.0:", when="@2.9: ^python@:2,3.5:", type=("build", "run")) + depends_on("py-jinja2@2.11.0:", when="@2.9:", type=("build", "run")) depends_on("py-boto3@1.17.27:", when="@2.11:", type=("build", "run")) depends_on("py-boto3@1.16.14:", when="@2.10:", type=("build", "run")) @@ -82,11 +76,6 @@ class AwsParallelcluster(PythonPackage): depends_on("py-setuptools", type=("build", "run")) - depends_on("py-enum34@1.1.6:", when="^python@:3.3", type=("build", "run")) - - # https://github.com/aws/aws-parallelcluster/pull/1633 - patch("enum34.patch", when="@:2.5.1") - @run_after("install") @on_package_attributes(run_tests=True) def install_test(self): diff --git a/var/spack/repos/builtin/packages/awscli/package.py b/var/spack/repos/builtin/packages/awscli/package.py index 0378c94402..a1fcfc71b6 100644 --- a/var/spack/repos/builtin/packages/awscli/package.py +++ b/var/spack/repos/builtin/packages/awscli/package.py @@ -22,10 +22,7 @@ class Awscli(PythonPackage): 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", type=("build", "run")) - depends_on("py-argparse@1.1:", when="^python@:2.6,3.0:3.1", 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")) - depends_on("py-colorama@0.2.5:0.3.9", when="^python@:2.6,3.0:3.3", type=("build", "run")) - depends_on("py-colorama@0.2.5:0.4.1", when="^python@3.4:", type=("build", "run")) + depends_on("py-pyyaml@3.10:5.2", type=("build", "run")) + depends_on("py-colorama@0.2.5:0.4.1", type=("build", "run")) depends_on("py-nose", type="test") depends_on("py-mock@1.3.0:", type="test") diff --git a/var/spack/repos/builtin/packages/berkeleygw/package.py b/var/spack/repos/builtin/packages/berkeleygw/package.py index 2752aed4ea..7d72f6f5ea 100644 --- a/var/spack/repos/builtin/packages/berkeleygw/package.py +++ b/var/spack/repos/builtin/packages/berkeleygw/package.py @@ -37,7 +37,6 @@ class Berkeleygw(MakefilePackage): variant("mpi", default=True, description="Builds with MPI support") variant("elpa", default=True, description="Build with ELPA support") - variant("python", default=False, description="Build with Python support") variant("openmp", default=True, description="Build with OpenMP support") variant("scalapack", default=True, description="Build with ScaLAPACK support") variant("hdf5", default=True, description="Builds with HDF5 support") @@ -56,11 +55,6 @@ class Berkeleygw(MakefilePackage): depends_on("fftw-api@3+openmp", when="+openmp") depends_on("fftw-api@3~openmp", when="~openmp") - depends_on("python@:2", type=("build", "run"), when="+python") - depends_on("py-numpy@:1.16", type=("build", "run"), when="+python") - depends_on("py-setuptools@:44", type=("build", "run"), when="+python") - depends_on("py-h5py@:2", type=("build", "run"), when="+hdf5+python") - depends_on("perl", type="test") conflicts( diff --git a/var/spack/repos/builtin/packages/bigdft-atlab/package.py b/var/spack/repos/builtin/packages/bigdft-atlab/package.py index 899c0230e3..f12384b6fa 100644 --- a/var/spack/repos/builtin/packages/bigdft-atlab/package.py +++ b/var/spack/repos/builtin/packages/bigdft-atlab/package.py @@ -17,7 +17,6 @@ class BigdftAtlab(AutotoolsPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") @@ -26,7 +25,7 @@ class BigdftAtlab(AutotoolsPackage): depends_on("mpi", when="+mpi") depends_on("openbabel", when="+openbabel") - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) build_directory = "atlab" diff --git a/var/spack/repos/builtin/packages/bigdft-chess/package.py b/var/spack/repos/builtin/packages/bigdft-chess/package.py index e068f87d84..c2234eee0e 100644 --- a/var/spack/repos/builtin/packages/bigdft-chess/package.py +++ b/var/spack/repos/builtin/packages/bigdft-chess/package.py @@ -18,9 +18,6 @@ class BigdftChess(AutotoolsPackage, CudaPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") @@ -28,9 +25,7 @@ class BigdftChess(AutotoolsPackage, CudaPackage): variant("ntpoly", default=False, description="Option to use NTPoly") # variant('minpack', default=False, description='Give the link-line for MINPACK') - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("blas") depends_on("lapack") @@ -40,9 +35,8 @@ class BigdftChess(AutotoolsPackage, CudaPackage): depends_on("ntpoly", when="+ntpoly") # depends_on('netlib-minpack', when='+minpack') - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - for vers in ["1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-atlab@{0}".format(vers), when="@{0}".format(vers)) build_directory = "chess" @@ -93,8 +87,7 @@ class BigdftChess(AutotoolsPackage, CudaPackage): else: args.append("--without-openmp") - if spec.satisfies("@1.8.3:") or spec.satisfies("@develop"): - args.append("--with-atlab-libs=%s" % spec["bigdft-atlab"].prefix.lib) + args.append("--with-atlab-libs=%s" % spec["bigdft-atlab"].prefix.lib) if "+cuda" in spec: args.append("--enable-cuda-gpu") diff --git a/var/spack/repos/builtin/packages/bigdft-core/package.py b/var/spack/repos/builtin/packages/bigdft-core/package.py index 38973b9931..2fa1ff5dd7 100644 --- a/var/spack/repos/builtin/packages/bigdft-core/package.py +++ b/var/spack/repos/builtin/packages/bigdft-core/package.py @@ -18,18 +18,13 @@ class BigdftCore(AutotoolsPackage, CudaPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") variant("scalapack", default=True, description="Enable SCALAPACK support") variant("openbabel", default=False, description="Enable detection of openbabel compilation") - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("blas") depends_on("lapack") @@ -42,7 +37,7 @@ class BigdftCore(AutotoolsPackage, CudaPackage): depends_on("libxc@:4.3.4", when="@1.9.2:") depends_on("libxc@:4.3.4", when="@develop") - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-chess@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-psolver@{0}".format(vers), when="@{0}".format(vers)) diff --git a/var/spack/repos/builtin/packages/bigdft-futile/package.py b/var/spack/repos/builtin/packages/bigdft-futile/package.py index db9561384b..1c5caebedf 100644 --- a/var/spack/repos/builtin/packages/bigdft-futile/package.py +++ b/var/spack/repos/builtin/packages/bigdft-futile/package.py @@ -21,16 +21,11 @@ class BigdftFutile(AutotoolsPackage, CudaPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("blas") depends_on("lapack") diff --git a/var/spack/repos/builtin/packages/bigdft-libabinit/m_libpaw_mpi.F90.patch b/var/spack/repos/builtin/packages/bigdft-libabinit/m_libpaw_mpi.F90.patch deleted file mode 100644 index 4ee3c1df31..0000000000 --- a/var/spack/repos/builtin/packages/bigdft-libabinit/m_libpaw_mpi.F90.patch +++ /dev/null @@ -1,222 +0,0 @@ ---- a/libABINIT/src/libpaw/m_libpaw_mpi.F90 -+++ b/libABINIT/src/libpaw/m_libpaw_mpi.F90 -@@ -54,6 +54,24 @@ - integer,public,parameter :: xpaw_mpi_comm_null = 0 - #endif - -+ type xpaw_mpi_attr -+ integer :: attr_data -+ end type -+ -+ interface xpaw_mpi_attr -+ module procedure new_xpaw_mpi_attr -+ end interface -+ -+ interface mod -+ module procedure mod_xpaw_mpi_attr -+ end interface -+ -+#ifdef HAVE_MPI -+ type(xpaw_mpi_attr),public,parameter :: xpaw_mpi_tag_ub = xpaw_mpi_attr(MPI_TAG_UB) -+#else -+ integer,public,parameter :: xpaw_mpi_tag_ub = 1 -+#endif -+ - !---------------------------------------------------------------------- - !MPI public procedures. - -@@ -180,6 +198,32 @@ - CONTAINS !=========================================================== - !!*** - -+function new_xpaw_mpi_attr(key_val) -+ type(xpaw_mpi_attr) :: new_xpaw_mpi_attr -+ integer, intent(in) :: key_val -+!Local variables------------------- -+ integer :: mpierr -+#ifdef HAVE_MPI -+ integer :: attribute_val -+ logical :: lflag -+#endif -+ -+ ! Deprecated in MPI2 but not all MPI2 implementations provide MPI_Comm_get_attr ! -+ call MPI_ATTR_GET(xpaw_mpi_world, key_val, attribute_val, lflag, mpierr) -+ !call MPI_Comm_get_attr(xpaw_mpi_world, key_val, attribute_val, lflag, mpierr) -+ -+ if (lflag) new_xpaw_mpi_attr%attr_data = attribute_val -+end function -+ -+ -+function mod_xpaw_mpi_attr(a, p) -+ integer :: mod_xpaw_mpi_attr -+ integer, intent(in) :: a -+ type(xpaw_mpi_attr), intent(in) :: p -+ -+ mod_xpaw_mpi_attr = mod(a, p%attr_data) -+end function -+ - !!****f* m_libpaw_mpi/xpaw_mpi_abort - !! NAME - !! xpaw_mpi_abort -@@ -2297,7 +2341,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1,MPI_INTEGER,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2358,7 +2402,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2419,7 +2463,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1*n2,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2480,7 +2524,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) ; n3=size(xval,dim=3) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_RECV(xval,n1*n2*n3,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,MPI_STATUS_IGNORE,ier) - end if - #endif -@@ -2541,7 +2585,7 @@ - ierr=0 - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - n1=size(xval) - call MPI_IRECV(xval,n1,MPI_INTEGER,source,my_tag,spaceComm,request,ier) - ierr=ier -@@ -2604,7 +2648,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_IRECV(xval,n1,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -2666,7 +2710,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1);n2=size(xval,dim=2) -- my_tag=MOD(tag,MPI_TAG_UB) -+ my_tag=MOD(tag,xpaw_mpi_tag_ub) - call MPI_IRECV(xval,n1*n2,MPI_DOUBLE_PRECISION,source,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -2727,7 +2771,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1,MPI_INTEGER,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2785,7 +2829,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2843,7 +2887,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1*n2,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2901,7 +2945,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n2=size(xval,dim=2) ; n3=size(xval,dim=3) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_SEND(xval,n1*n2*n3,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,ier) - end if - #endif -@@ -2961,7 +3005,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_ISEND(xval,n1,MPI_INTEGER,dest,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -3020,7 +3064,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_ISEND(xval,n1,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -3079,7 +3123,7 @@ - #if defined HAVE_MPI - if (spaceComm /= xpaw_mpi_comm_self .and. spaceComm /= xpaw_mpi_comm_null) then - n1=size(xval,dim=1) ; n1=size(xval,dim=2) -- my_tag = MOD(tag,MPI_TAG_UB) -+ my_tag = MOD(tag,xpaw_mpi_tag_ub) - call MPI_ISEND(xval,n1*n2,MPI_DOUBLE_PRECISION,dest,my_tag,spaceComm,request,ier) - ierr=ier - end if -@@ -3145,7 +3189,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(n1==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag = MOD(n1,MPI_TAG_UB) -+ tag = MOD(n1,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,n1,MPI_INTEGER,sender,tag,spaceComm,status,ier) - end if -@@ -3212,7 +3256,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(n1==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag = MOD(n1,MPI_TAG_UB) -+ tag = MOD(n1,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,n1,MPI_DOUBLE_PRECISION,sender,tag,spaceComm,status,ier) - end if -@@ -3279,7 +3323,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(nt==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag=MOD(nt,MPI_TAG_UB) -+ tag=MOD(nt,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,nt,MPI_DOUBLE_PRECISION,sender,tag,spaceComm,status,ier) - end if -@@ -3346,7 +3390,7 @@ - #if defined HAVE_MPI - if (sender==recever.or.spaceComm==xpaw_mpi_comm_null.or.(nt==0)) return - call MPI_COMM_RANK(spaceComm,me,ier) -- tag=MOD(nt,MPI_TAG_UB) -+ tag=MOD(nt,xpaw_mpi_tag_ub) - if (recever==me) then - call MPI_RECV(vrecv,nt,MPI_DOUBLE_PRECISION,sender,tag,spaceComm,status,ier) - end if diff --git a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py index 62791417c9..3c772493d7 100644 --- a/var/spack/repos/builtin/packages/bigdft-libabinit/package.py +++ b/var/spack/repos/builtin/packages/bigdft-libabinit/package.py @@ -20,36 +20,25 @@ class BigdftLibabinit(AutotoolsPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") variant("mpi", default=True, description="Enable MPI support") - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("mpi", when="+mpi") depends_on("libxc@:2.2.2", when="@:1.9.1") depends_on("libxc@:4.3.4", when="@1.9.1:") - depends_on("libxc@:4.3.4", when="@develop") - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - patch("m_libpaw_mpi.F90.patch", when="@:1.8.2") - build_directory = "libABINIT" def autoreconf(self, spec, prefix): autoreconf = which("autoreconf") with working_dir(self.build_directory): - if spec.satisfies("@:1.8.2"): - autoreconf("-i") - else: - autoreconf("-fi") + autoreconf("-fi") def configure_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/bigdft-psolver/package.py b/var/spack/repos/builtin/packages/bigdft-psolver/package.py index a1cbcc84d9..95168b39cd 100644 --- a/var/spack/repos/builtin/packages/bigdft-psolver/package.py +++ b/var/spack/repos/builtin/packages/bigdft-psolver/package.py @@ -19,17 +19,12 @@ class BigdftPsolver(AutotoolsPackage, CudaPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") variant("scalapack", default=True, description="Enable SCALAPACK support") - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("blas") depends_on("lapack") @@ -37,9 +32,8 @@ class BigdftPsolver(AutotoolsPackage, CudaPackage): depends_on("mpi", when="+mpi") depends_on("scalapack", when="+scalapack") - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) - for vers in ["1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-atlab@{0}".format(vers), when="@{0}".format(vers)) build_directory = "psolver" @@ -92,8 +86,7 @@ class BigdftPsolver(AutotoolsPackage, CudaPackage): else: args.append("--without-openmp") - if spec.satisfies("@1.8.3:") or spec.satisfies("@develop"): - args.append("--with-atlab-libs=%s" % spec["bigdft-atlab"].prefix.lib) + args.append("--with-atlab-libs=%s" % spec["bigdft-atlab"].prefix.lib) if "+cuda" in spec: args.append("--enable-cuda-gpu") diff --git a/var/spack/repos/builtin/packages/bigdft-spred/package.py b/var/spack/repos/builtin/packages/bigdft-spred/package.py index fc48a7a843..64decca80d 100644 --- a/var/spack/repos/builtin/packages/bigdft-spred/package.py +++ b/var/spack/repos/builtin/packages/bigdft-spred/package.py @@ -18,17 +18,12 @@ class BigdftSpred(AutotoolsPackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") variant("mpi", default=True, description="Enable MPI support") variant("openmp", default=True, description="Enable OpenMP support") variant("scalapack", default=True, description="Enable SCALAPACK support") - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("blas") depends_on("lapack") @@ -36,7 +31,7 @@ class BigdftSpred(AutotoolsPackage): depends_on("mpi", when="+mpi") depends_on("scalapack", when="+scalapack") - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-psolver@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-core@{0}".format(vers), when="@{0}".format(vers)) diff --git a/var/spack/repos/builtin/packages/bigdft-suite/package.py b/var/spack/repos/builtin/packages/bigdft-suite/package.py index 5ef93b9427..a23d47d3e7 100644 --- a/var/spack/repos/builtin/packages/bigdft-suite/package.py +++ b/var/spack/repos/builtin/packages/bigdft-suite/package.py @@ -18,22 +18,15 @@ class BigdftSuite(BundlePackage): version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f") version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - version("1.8.3", sha256="f112bb08833da4d11dd0f14f7ab10d740b62bc924806d77c985eb04ae0629909") - version("1.8.2", sha256="042e5a3b478b1a4c050c450a9b1be7bcf8e13eacbce4759b7f2d79268b298d61") - version("1.8.1", sha256="e09ff0ba381f6ffbe6a3c0cb71db5b73117874beb41f22a982a7e5ba32d018b3") - depends_on("python@:2.8", type=("run"), when="@:1.8.3") - depends_on("python@3.0:", type=("run"), when="@1.9.0:") - depends_on("python@3.0:", type=("run"), when="@develop") + depends_on("python@3.0:", type=("run")) - for vers in ["1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: + for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-futile@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-psolver@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-libabinit@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-chess@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-core@{0}".format(vers), when="@{0}".format(vers)) depends_on("bigdft-spred@{0}".format(vers), when="@{0}".format(vers)) - for vers in ["1.8.3", "1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("bigdft-atlab@{0}".format(vers), when="@{0}".format(vers)) - for vers in ["1.9.0", "1.9.1", "1.9.2", "develop"]: depends_on("py-bigdft@{0}".format(vers), when="@{0}".format(vers)) diff --git a/var/spack/repos/builtin/packages/blasr-libcpp/package.py b/var/spack/repos/builtin/packages/blasr-libcpp/package.py deleted file mode 100644 index b43919c9c8..0000000000 --- a/var/spack/repos/builtin/packages/blasr-libcpp/package.py +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import os - -from spack.package import * - - -class BlasrLibcpp(Package): - """Blasr_libcpp is a library used by blasr - and other executables such as samtoh5, - loadPulses for analyzing PacBio sequences.""" - - homepage = "https://github.com/PacificBiosciences/blasr_libcpp" - url = "https://github.com/PacificBiosciences/blasr_libcpp/archive/5.3.1.tar.gz" - - maintainers = ["robqiao"] - - version("5.3.1", sha256="45a673255bfe7e29ed1f5bdb6410aa45cb6b907400d038c3da9daf1058b09156") - - depends_on("pbbam") - 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 - - depends_on("python@2.7:2.8", type="build") - - @run_before("install") - def configure(self, spec, prefix): - configure_args = [ - "PBBAM_INC={0}".format(self.spec["pbbam"].prefix.include), - "PBBAM_LIB={0}".format(self.spec["pbbam"].prefix.lib), - "HDF5_INC={0}".format(self.spec["hdf5"].prefix.include), - "HDF5_LIB={0}".format(self.spec["hdf5"].prefix.lib), - ] - python("configure.py", *configure_args) - - @run_before("install") - def build(self, spec, prefix): - os.environ["CPLUS_INCLUDE_PATH"] = self.stage.source_path - make() - - def install(self, spec, prefix): - install_tree("alignment", prefix.alignment) - install_tree("hdf", prefix.hdf) - install_tree("pbdata", prefix.pbdata) - - def setup_dependent_build_environment(self, env, dependent_spec): - env.prepend_path("LD_LIBRARY_PATH", self.spec.prefix.hdf) - env.prepend_path("LD_LIBRARY_PATH", self.spec.prefix.alignment) - env.prepend_path("LD_LIBRARY_PATH", self.spec.prefix.pbdata) - - def setup_run_environment(self, env): - env.prepend_path("LD_LIBRARY_PATH", self.spec["blasr-libcpp"].prefix.pbdata) - env.prepend_path("LD_LIBRARY_PATH", self.spec["blasr-libcpp"].prefix.alignment) - env.prepend_path("LD_LIBRARY_PATH", self.spec["blasr-libcpp"].prefix.hdf) diff --git a/var/spack/repos/builtin/packages/blasr/package.py b/var/spack/repos/builtin/packages/blasr/package.py deleted file mode 100644 index 79ae59cd55..0000000000 --- a/var/spack/repos/builtin/packages/blasr/package.py +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import os - -from spack.package import * -from spack.pkg.builtin.boost import Boost - - -class Blasr(Package): - """The PacBio long read aligner.""" - - homepage = "https://github.com/PacificBiosciences/blasr/wiki" - url = "https://github.com/PacificBiosciences/blasr/archive/5.3.1.tar.gz" - - version("5.3.1", sha256="ff7da5a03096294572e6c64340354da5c5ee1c86c277e7b899f2c170c1ac4049") - - depends_on("ncurses") - depends_on("hdf5+cxx@1.8.12:1.8") - depends_on("htslib") - depends_on("zlib") - - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) - depends_on("pbbam") - depends_on("blasr-libcpp") - depends_on("python", type="build") - - def setup_build_environment(self, env): - env.prepend_path("CPATH", self.spec["blasr-libcpp"].prefix) - env.prepend_path("CPATH", self.spec["blasr-libcpp"].prefix.pbdata) - env.prepend_path("CPATH", self.spec["blasr-libcpp"].prefix.alignment) - env.prepend_path("CPATH", self.spec["blasr-libcpp"].prefix.hdf) - - # hdf has +mpi by default, so handle that possibility - if "+mpi" in self.spec["hdf5"]: - env.set("CC", self.spec["mpi"].mpicc) - env.set("CXX", self.spec["mpi"].mpicxx) - - def setup_run_environment(self, env): - env.prepend_path("PATH", self.spec.prefix.utils) - - @run_before("install") - def configure(self, spec, prefix): - configure_args = [ - "LIBPBDATA_INC={0}".format(self.spec["blasr-libcpp"].prefix), - "LIBPBDATA_LIB={0}".format(self.spec["blasr-libcpp"].prefix.pbdata), - "LIBBLASR_LIB={0}".format(self.spec["blasr-libcpp"].prefix.alignment), - "LIBBLASR_INC={0}".format(self.spec["blasr-libcpp"].prefix), - "LIBPBIHDF_INC={0}".format(self.spec["blasr-libcpp"].prefix), - "LIBPBIHDF_LIB={0}".format(self.spec["blasr-libcpp"].prefix.hdf), - "HDF5_INC={0}".format(self.spec["hdf5"].prefix.include), - "HDF5_LIB={0}".format(self.spec["hdf5"].prefix.lib), - "--shared", - ] - python("configure.py", *configure_args) - - @run_before("install") - def build(self, spec, prefix): - os.environ["CPLUS_INCLUDE_PATH"] = join_path(self.stage.source_path, "include") - make() - - def install(self, spec, prefix): - mkdir(prefix.utils) - mkdir(prefix.bin) - install("blasr", prefix.bin.blasr) - install("utils/loadPulses", prefix.utils) - install("utils/pls2fasta", prefix.utils) - install("utils/samFilter", prefix.utils) - install("utils/samtoh5", prefix.utils) - install("utils/samtom4", prefix.utils) - install("utils/sawriter", prefix.utils) - install("utils/sdpMatcher", prefix.utils) - install("utils/toAfg", prefix.utils) diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py index 02d2d876e1..deb956b36b 100644 --- a/var/spack/repos/builtin/packages/blitz/package.py +++ b/var/spack/repos/builtin/packages/blitz/package.py @@ -13,11 +13,8 @@ class Blitz(AutotoolsPackage): url = "https://github.com/blitzpp/blitz/archive/1.0.2.tar.gz" version("1.0.2", sha256="500db9c3b2617e1f03d0e548977aec10d36811ba1c43bb5ef250c0e3853ae1c2") - version("1.0.1", sha256="b62fc3f07b64b264307b01fec5e4f2793e09a68dcb5378984aedbc2e4b3adcef") - version("1.0.0", sha256="79c06ea9a0585ba0e290c8140300e3ad19491c45c1d90feb52819abc3b58a0c1") - depends_on("python@:2.7", type="build", when="@:1.0.1") - depends_on("python@3:", type="build", when="@1.0.2:") + depends_on("python@3:", type="build") build_targets = ["lib"] diff --git a/var/spack/repos/builtin/packages/cantera/package.py b/var/spack/repos/builtin/packages/cantera/package.py index 435b1d31b4..a47f6aba72 100644 --- a/var/spack/repos/builtin/packages/cantera/package.py +++ b/var/spack/repos/builtin/packages/cantera/package.py @@ -45,8 +45,6 @@ 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", 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/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index 4cf688c158..7bd98e73d9 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -21,26 +21,13 @@ class Catalyst(CMakePackage): """ homepage = "http://www.paraview.org" - url = "https://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz" - _urlfmt_gz = "https://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz" - _urlfmt_xz = "https://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.xz" + url = "https://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.xz" maintainers = ["chuckatkins", "danlipsa"] version("5.6.0", sha256="5b49cb96ab78eee0427e25200530ac892f9a3da7725109ce1790f8010cb5b377") - version("5.5.2", sha256="64561f34c4402b88f3cb20a956842394dde5838efd7ebb301157a837114a0e2d") - version("5.5.1", sha256="a6e67a95a7a5711a2b5f95f38ccbff4912262b3e1b1af7d6b9afe8185aa85c0d") - version("5.5.0", sha256="1b619e326ff574de808732ca9a7447e4cd14e94ae6568f55b6581896cd569dff") - version("5.4.1", sha256="390d0f5dc66bf432e202a39b1f34193af4bf8aad2355338fa5e2778ea07a80e4") - version("5.4.0", sha256="f488d84a53b1286d2ee1967e386626c8ad05a6fe4e6cbdaa8d5e042f519f94a9") - version("5.3.0", sha256="046631bbf00775edc927314a3db207509666c9c6aadc7079e5159440fd2f88a0") - version("5.2.0", sha256="894e42ef8475bb49e4e7e64f4ee2c37c714facd18bfbb1d6de7f69676b062c96") - version("5.1.2", sha256="ff02b7307a256b7c6e8ad900dee5796297494df7f9a0804fe801eb2f66e6a187") - version("5.0.1", sha256="caddec83ec284162a2cbc46877b0e5a9d2cca59fb4ab0ea35b0948d2492950bb") - version("4.4.0", sha256="c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73") variant("python", default=False, description="Enable Python support") - variant("python3", default=False, description="Enable Python3 support") variant("essentials", default=False, description="Enable Essentials support") variant("extras", default=False, description="Enable Extras support. Implies Essentials.") variant( @@ -51,61 +38,24 @@ class Catalyst(CMakePackage): variant("osmesa", default=True, description="Use offscreen rendering") conflicts("+osmesa", when="~rendering") - conflicts("+python", when="+python3") - conflicts("+python", when="@5.6:") - conflicts("+python3", when="@:5.5") - - # Workaround for - # adding the following to your packages.yaml - # packages: - # python: - # version: [3, 2] - # without this you'll get: - # paraview requires python version 3:, but spec asked for 2.7.16 - # for `spack spec paraview+python` - # see spack pull request #11539 - # extends('python', when='+python') extends("python", when="+python") - extends("python", when="+python3") # VTK < 8.2.1 can't handle Python 3.8 # This affects Paraview <= 5.7 (VTK 8.2.0) # https://gitlab.kitware.com/vtk/vtk/-/issues/17670 - depends_on("python@3:3.7", when="@:5.7 +python3", type=("build", "run")) - depends_on("python@3:", when="@5.8:+python3", type=("build", "run")) - depends_on("python@2.7:2.8", when="+python", type=("build", "link", "run")) + depends_on("python@3:3.7", when="@:5.7 +python", type=("build", "run")) + depends_on("python@3:", when="@5.8:+python", type=("build", "run")) depends_on("git", type="build") depends_on("mpi") depends_on("py-numpy", when="+python", type=("build", "run")) - depends_on("py-numpy", when="+python3", type=("build", "run")) depends_on("py-mpi4py", when="+python", type=("build", "run")) - depends_on("py-mpi4py", when="+python3", type=("build", "run")) depends_on("gl@3.2:", when="+rendering") depends_on("osmesa", when="+osmesa") depends_on("glx", when="~osmesa") depends_on("cmake@3.3:", type="build") - @when("@5.5.0:5.5.2") - def patch(self): - """Apply the patch (it should be fixed in Paraview 5.6) - at the package dir to the source code in - root_cmakelists_dir.""" - patch_name = "vtkm-catalyst-pv551.patch" - patch = which("patch", required=True) - with working_dir(self.root_cmakelists_dir): - patch("-s", "-p", "1", "-i", join_path(self.package_dir, patch_name), "-d", ".") - - def url_for_version(self, version): - """Handle ParaView version-based custom URLs.""" - if version < Version("5.1.0"): - return self._urlfmt_gz.format(version.up_to(2), version, "-source") - elif version < Version("5.6.0"): - return self._urlfmt_gz.format(version.up_to(2), version, "") - else: - return self._urlfmt_xz.format(version.up_to(2), version, "") - @property def paraview_subdir(self): """The paraview subdirectory name as paraview-major.minor""" @@ -116,7 +66,7 @@ class Catalyst(CMakePackage): """Transcribe spack variants into names of Catalyst Editions""" selected = ["Base"] # Always required - if "+python" in self.spec or "+python3" in self.spec: + if "+python" in self.spec: selected.append("Enable-Python") if "+essentials" in self.spec: @@ -144,9 +94,7 @@ class Catalyst(CMakePackage): catalyst_source_dir = os.path.abspath(self.root_cmakelists_dir) python_path = os.path.realpath( - self.spec["python"].command.path - if ("+python3" in self.spec or "+python" in self.spec) - else sys.executable + self.spec["python"].command.path if "+python" in self.spec else sys.executable ) command = [ @@ -178,13 +126,11 @@ class Catalyst(CMakePackage): else: lib_dir = self.prefix.lib - if self.spec.version <= Version("5.4.1"): - lib_dir = join_path(lib_dir, paraview_subdir) env.set("ParaView_DIR", self.prefix) env.prepend_path("LIBRARY_PATH", lib_dir) env.prepend_path("LD_LIBRARY_PATH", lib_dir) - if "+python" in self.spec or "+python3" in self.spec: + if "+python" in self.spec: python_version = self.spec["python"].version.up_to(2) env.prepend_path( "PYTHONPATH", @@ -234,7 +180,7 @@ class Catalyst(CMakePackage): "-DVTK_USE_OFFSCREEN:BOOL=%s" % variant_bool("+osmesa"), "-DVTK_OPENGL_HAS_OSMESA:BOOL=%s" % variant_bool("+osmesa"), ] - if "+python" in spec or "+python3" in spec: + if "+python" in spec: cmake_args.extend( [ "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON", diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py index 44c05f350d..37a81863b0 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py @@ -18,7 +18,6 @@ class CbtfArgonavisGui(QMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git" version("develop", branch="master") - version("1.3.0.0", branch="1.3.0.0") depends_on("cmake@3.0.2:", type="build") @@ -33,28 +32,20 @@ class CbtfArgonavisGui(QMakePackage): # For MRNet depends_on("mrnet@5.0.1-3:+lwthreads", when="@develop") - depends_on("mrnet@5.0.1-3+lwthreads", when="@1.3.0.0:9999") # Dependencies for the openspeedshop cbtf packages. depends_on("cbtf@develop", when="@develop") - depends_on("cbtf@1.9.3:9999", when="@1.3.0.0:9999") depends_on("cbtf-krell@develop", when="@develop") - depends_on("cbtf-krell@1.9.3:9999", when="@1.3.0.0:9999") depends_on("cbtf-argonavis@develop", when="@develop") - depends_on("cbtf-argonavis@1.9.3:9999", when="@1.3.0.0:9999") depends_on("cuda") - depends_on("openspeedshop-utils+cuda@develop", when="@develop") - depends_on("openspeedshop-utils@2.4.0:+cuda", when="@1.3.0.0:9999") - # For Xerces-C depends_on("xerces-c") depends_on("graphviz@2.40.1:", when="@develop") - depends_on("graphviz@2.40.1", when="@1.3.0.0:9999") depends_on("qtgraph") @@ -66,7 +57,6 @@ class CbtfArgonavisGui(QMakePackage): env.set("CBTF_ROOT", self.spec["cbtf"].prefix) env.set("CBTF_KRELL_ROOT", self.spec["cbtf-krell"].prefix) env.set("CBTF_ARGONAVIS_ROOT", self.spec["cbtf-argonavis"].prefix) - env.set("OSS_CBTF_ROOT", self.spec["openspeedshop-utils"].prefix) env.set("GRAPHVIZ_ROOT", self.spec["graphviz"].prefix) env.set("QTGRAPHLIB_ROOT", self.spec["qtgraph"].prefix) env.set("KRELL_ROOT_MRNET", self.spec["mrnet"].prefix) @@ -89,10 +79,6 @@ class CbtfArgonavisGui(QMakePackage): join_path(qtgraph_lib_dir, "{0}".format(self.spec["qt"].version.up_to(3))), ) - # The openspeedshop libraries are needed to actually load the - # performance information into the GUI. - env.prepend_path("LD_LIBRARY_PATH", self.spec["openspeedshop-utils"].prefix.lib64) - def qmake_args(self): options = ["-o", "Makefile", "openss-gui.pro"] return options diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 6868853fca..a881ebb048 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -16,9 +16,6 @@ class CbtfArgonavis(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-argonavis.git" version("develop", branch="master") - version("1.9.4.1", branch="1.9.4.1") - version("1.9.4", branch="1.9.4") - version("1.9.3", branch="1.9.3") variant( "crayfe", @@ -54,17 +51,12 @@ class CbtfArgonavis(CMakePackage): # For MRNet depends_on("mrnet@5.0.1-3:+lwthreads", when="@develop", type=("build", "link", "run")) - depends_on("mrnet@5.0.1-3+lwthreads", when="@1.9.3:9999", type=("build", "link", "run")) # For CBTF depends_on("cbtf@develop", when="@develop", type=("build", "link", "run")) - depends_on("cbtf@1.9.3:9999", when="@1.9.3:9999", type=("build", "link", "run")) # For CBTF with runtime depends_on("cbtf@develop+runtime", when="@develop+runtime", type=("build", "link", "run")) - depends_on( - "cbtf@1.9.3:9999+runtime", when="@1.9.3:9999+runtime", type=("build", "link", "run") - ) # For libmonitor depends_on("libmonitor@2013.02.18+commrank", type=("build", "link", "run")) @@ -74,14 +66,10 @@ class CbtfArgonavis(CMakePackage): # For CBTF-KRELL depends_on("cbtf-krell@develop", when="@develop", type=("build", "link", "run")) - depends_on("cbtf-krell@1.9.3:9999", when="@1.9.3:9999", type=("build", "link", "run")) depends_on( "cbtf-krell@develop+runtime", when="@develop+runtime", type=("build", "link", "run") ) - depends_on( - "cbtf-krell@1.9.3:9999+runtime", when="@1.9.3:9999+runtime", type=("build", "link", "run") - ) # For CUDA depends_on("cuda") diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 6ce8791635..493cbdbf13 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -19,9 +19,6 @@ class CbtfKrell(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-krell.git" version("develop", branch="master") - version("1.9.4.1", branch="1.9.4.1") - version("1.9.4", branch="1.9.4") - version("1.9.3", branch="1.9.3") # MPI variants variant( @@ -70,30 +67,23 @@ class CbtfKrell(CMakePackage): # For Dyninst depends_on("dyninst@10.1.0", when="@develop") - depends_on("dyninst@10.1.0", when="@1.9.3:9999") # For MRNet depends_on("mrnet@5.0.1-3:+lwthreads", when="@develop", type=("build", "link", "run")) - depends_on("mrnet@5.0.1-3+lwthreads", when="@1.9.3:9999", type=("build", "link", "run")) # For Xerces-C depends_on("xerces-c") # For CBTF depends_on("cbtf@develop", when="@develop", type=("build", "link", "run")) - depends_on("cbtf@1.9.3:9999", when="@1.9.3:9999", type=("build", "link", "run")) # For CBTF with runtime depends_on("cbtf@develop+runtime", when="@develop+runtime", type=("build", "link", "run")) - depends_on( - "cbtf@1.9.3:9999+runtime", when="@1.9.3:9999+runtime", type=("build", "link", "run") - ) # for services and collectors depends_on("libmonitor@2013.02.18+commrank", type=("build", "link", "run")) depends_on("libunwind", when="@develop") - depends_on("libunwind@1.2.1", when="@1.9.3:9999") depends_on("papi@5.4.1:", type=("build", "link", "run")) @@ -106,7 +96,6 @@ class CbtfKrell(CMakePackage): depends_on("mpt", when="+mpt") depends_on("python", when="@develop", type=("build", "run")) - depends_on("python@2.7.14:2.7.15", when="@2.3.1.3:9999", type=("build", "run")) depends_on("gotcha") diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py index 9753cf4f04..a72a3ff429 100644 --- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py +++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py @@ -14,9 +14,6 @@ class CbtfLanl(CMakePackage): git = "https://github.com/OpenSpeedShop/cbtf-lanl.git" version("develop", branch="master") - version("1.9.4.1", branch="1.9.4.1") - version("1.9.4", branch="1.9.4") - version("1.9.3", branch="1.9.3") variant( "build_type", @@ -33,25 +30,20 @@ class CbtfLanl(CMakePackage): # For MRNet depends_on("mrnet@5.0.1-3:+lwthreads", when="@develop") - depends_on("mrnet@5.0.1-3+lwthreads", when="@1.9.3:9999") # For Xerces-C depends_on("xerces-c") # For CBTF depends_on("cbtf@develop", when="@develop") - depends_on("cbtf@1.9.3:9999", when="@1.9.3:9999") # For CBTF with runtime depends_on("cbtf@develop+runtime", when="@develop+runtime") - depends_on("cbtf@1.9.3:9999+runtime", when="@1.9.3:9999+runtime") # For CBTF-KRELL depends_on("cbtf-krell@develop", when="@develop") - depends_on("cbtf-krell@1.9.3:9999", when="@1.9.3:9999") depends_on("cbtf-krell@develop+runtime", when="@develop+runtime") - depends_on("cbtf-krell@1.9.3:9999+runtime", when="@1.9.3:9999+runtime") parallel = False diff --git a/var/spack/repos/builtin/packages/cctools/package.py b/var/spack/repos/builtin/packages/cctools/package.py index 3ddb493135..fc82df6086 100644 --- a/var/spack/repos/builtin/packages/cctools/package.py +++ b/var/spack/repos/builtin/packages/cctools/package.py @@ -75,29 +75,15 @@ class Cctools(AutotoolsPackage): # make sure we do not pick a python outside spack: if self.spec.satisfies("@6.1.1"): - if self.spec.satisfies("^python@3:"): - args.extend( - ["--with-python3-path", self.spec["python"].prefix, "--with-python-path", "no"] - ) - elif self.spec.satisfies("^python@:2.9"): - args.extend( - ["--with-python-path", self.spec["python"].prefix, "--with-python3-path", "no"] - ) - else: - args.extend(["--with-python-path", "no", "--with-python3-path", "no"]) + args.extend( + ["--with-python3-path", self.spec["python"].prefix, "--with-python-path", "no"] + ) else: # versions 7 and above, where --with-python-path recognized the # python version: - if self.spec.satisfies("^python@3:"): - args.extend( - ["--with-python-path", self.spec["python"].prefix, "--with-python2-path", "no"] - ) - elif self.spec.satisfies("^python@:2.9"): - args.extend( - ["--with-python-path", self.spec["python"].prefix, "--with-python3-path", "no"] - ) - else: - args.extend(["--with-python2-path", "no", "--with-python3-path", "no"]) + args.extend( + ["--with-python-path", self.spec["python"].prefix, "--with-python2-path", "no"] + ) # disable these bits for p in ["mysql", "xrootd"]: diff --git a/var/spack/repos/builtin/packages/ceed/package.py b/var/spack/repos/builtin/packages/ceed/package.py index e2fb0ffb4f..553bb5769e 100644 --- a/var/spack/repos/builtin/packages/ceed/package.py +++ b/var/spack/repos/builtin/packages/ceed/package.py @@ -27,7 +27,7 @@ class Ceed(BundlePackage, CudaPackage, ROCmPackage): variant("mfem", default=True, description="Build MFEM, Laghos and Remhos") variant("nek", default=True, description="Build Nek5000, GSLIB, Nekbone, and NekCEM") variant("occa", default=True, description="Enable OCCA support") - variant("petsc", default=True, description="Build PETSc and HPGMG") + variant("petsc", default=True, description="Build PETSc and HPGMG", when="@2:") variant("pumi", default=True, description="Build PUMI") variant("omega-h", default=True, description="Build Omega_h") variant( @@ -202,14 +202,8 @@ class Ceed(BundlePackage, CudaPackage, ROCmPackage): depends_on("petsc@3.11.1+mpi+hypre+suite-sparse+mumps+double~int64", when="@2.0.0+petsc+mfem") depends_on("hpgmg@0.4+fe", when="@2.0.0+petsc") # ceed-1.0 - # For a +quickbuild we disable hdf5, and superlu-dist in PETSc. - # Ideally, these can be turned into recommendations to Spack for - # concretizing the PETSc spec, if Spack ever supports recommendations. - depends_on("petsc@3.8.3~hdf5~superlu-dist", when="@1.0.0+petsc+quickbuild") - depends_on("petsc@3.8.3+mpi+double~int64", when="@1.0.0+petsc~mfem") # The mfem petsc examples need the petsc variants +hypre, +suite-sparse, # and +mumps: - depends_on("petsc@3.8.3+mpi+hypre+suite-sparse+mumps+double~int64", when="@1.0.0+petsc+mfem") depends_on("hpgmg@a0a5510df23b+fe", when="@1.0.0+petsc") # MAGMA diff --git a/var/spack/repos/builtin/packages/cget/package.py b/var/spack/repos/builtin/packages/cget/package.py index 16a2a11da5..e45b33ff81 100644 --- a/var/spack/repos/builtin/packages/cget/package.py +++ b/var/spack/repos/builtin/packages/cget/package.py @@ -17,4 +17,3 @@ class Cget(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-six@1.10:", type=("build", "run")) depends_on("py-click@6.6:", type=("build", "run")) - depends_on("py-subprocess32", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/chill/Add-GCC-libquadmath-for-rose.patch b/var/spack/repos/builtin/packages/chill/Add-GCC-libquadmath-for-rose.patch deleted file mode 100644 index 68b335097f..0000000000 --- a/var/spack/repos/builtin/packages/chill/Add-GCC-libquadmath-for-rose.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 15c3cc127d8f48324b00fd654d9630724eedcfcd Mon Sep 17 00:00:00 2001 -From: John Jolly <john.jolly@gmail.com> -Date: Fri, 5 Jun 2020 23:54:13 -0600 -Subject: [PATCH] Add GCC libquadmath for rose - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7dd92b0..a8daba1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,7 @@ core_cxxflags =-g --std=c++11 - - ## Core Libraries ## - core_libs = -lcodegen -lomega --core_libs += -lm -lrose -lrt -lutil -ldl -+core_libs += -lm -lrose -lrt -lutil -ldl -lquadmath - core_libs += -lboost_date_time -lboost_filesystem -lboost_program_options - core_libs += -lboost_regex -lboost_system -lboost_wave -lboost_iostreams - --- -2.25.1 - diff --git a/var/spack/repos/builtin/packages/chill/Add-GMPHOME-option.patch b/var/spack/repos/builtin/packages/chill/Add-GMPHOME-option.patch deleted file mode 100644 index ba6b19693a..0000000000 --- a/var/spack/repos/builtin/packages/chill/Add-GMPHOME-option.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 336dfb3a1c314b6eec23ab4f99114be94c5e518e Mon Sep 17 00:00:00 2001 -From: John Jolly <john.jolly@gmail.com> -Date: Fri, 5 Jun 2020 23:45:39 -0600 -Subject: [PATCH] Add GMPHOME option - ---- - Makefile.am | 4 ++++ - configure.ac | 7 +++++++ - 2 files changed, 11 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 541cb99..7dd92b0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -16,6 +16,8 @@ core_libs += -liegenlib -lisl -lgmp - core_libdirs = -Lomega/code_gen/obj -Lomega/omega_lib/obj - core_libdirs += -L$(ROSEHOME)/lib -L$(BOOSTHOME)/lib - -+core_libdirs += -L$(GMPHOME)/lib -+ - core_libdirs += -L$(ISLHOME)/lib - - core_libdirs += -L$(IEGENHOME)/lib -@@ -32,6 +34,8 @@ core_includes += -I$(srcdir)/include/chill - core_includes += -I$(ROSEHOME)/include/rose - core_includes += -I$(BOOSTHOME)/include - -+core_includes += -I$(GSLHOME)/include -+ - core_includes += -I$(ISLHOME)/include - - core_includes += -I$(IEGENHOME)/include/iegenlib -diff --git a/configure.ac b/configure.ac -index e146839..18ecf76 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,13 @@ AC_ARG_WITH([boost],[ - ],[ - AC_SUBST([BOOSTHOME], ["${BOOSTHOME}"])]) - -+AC_ARG_WITH([gmp],[ -+ AS_HELP_STRING([--with-gmp],[set path to gmp]) -+ ],[ -+ AC_SUBST([GMPHOME], [$withval]) -+ ],[ -+ AC_SUBST([GMPHOME], ["${GMPHOME}"])]) -+ - AC_ARG_WITH([iegen],[ - AS_HELP_STRING([--with-iegen],[set path to iegenlib]) - ],[ --- -2.25.1 - diff --git a/var/spack/repos/builtin/packages/chill/Add-ISLHOME-option.patch b/var/spack/repos/builtin/packages/chill/Add-ISLHOME-option.patch deleted file mode 100644 index e15456cd57..0000000000 --- a/var/spack/repos/builtin/packages/chill/Add-ISLHOME-option.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 3b4094b9cf1beec0b870e9ca0c3e51ed9b10dc39 Mon Sep 17 00:00:00 2001 -From: John Jolly <john.jolly@gmail.com> -Date: Fri, 5 Jun 2020 23:21:18 -0600 -Subject: [PATCH] Add ISLHOME option - ---- - Makefile.am | 4 ++++ - configure.ac | 7 +++++++ - 2 files changed, 11 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 30667a8..541cb99 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -16,6 +16,8 @@ core_libs += -liegenlib -lisl -lgmp - core_libdirs = -Lomega/code_gen/obj -Lomega/omega_lib/obj - core_libdirs += -L$(ROSEHOME)/lib -L$(BOOSTHOME)/lib - -+core_libdirs += -L$(ISLHOME)/lib -+ - core_libdirs += -L$(IEGENHOME)/lib - core_libdirs += -L$(IEGENHOME)/../lib/installed/lib - -@@ -30,6 +32,8 @@ core_includes += -I$(srcdir)/include/chill - core_includes += -I$(ROSEHOME)/include/rose - core_includes += -I$(BOOSTHOME)/include - -+core_includes += -I$(ISLHOME)/include -+ - core_includes += -I$(IEGENHOME)/include/iegenlib - core_includes += -I$(IEGENHOME)/../lib/installed/include - -diff --git a/configure.ac b/configure.ac -index 8e163cd..e146839 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,6 +65,13 @@ AC_ARG_WITH([iegen],[ - ],[ - AC_SUBST([IEGENHOME], ["${IEGENHOME}"])]) - -+AC_ARG_WITH([isl],[ -+ AS_HELP_STRING([--with-isl],[set path to isl]) -+ ],[ -+ AC_SUBST([ISLHOME], [$withval]) -+ ],[ -+ AC_SUBST([ISLHOME], ["${ISLHOME}"])]) -+ - AC_ARG_WITH([omega],[ - AS_HELP_STRING([--with-omega],[set omega home])],[ - AC_SUBST([OMEGAHOME], [$withval])],[ --- -2.25.1 - diff --git a/var/spack/repos/builtin/packages/chill/package.py b/var/spack/repos/builtin/packages/chill/package.py deleted file mode 100644 index 64a188d513..0000000000 --- a/var/spack/repos/builtin/packages/chill/package.py +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * -from spack.pkg.builtin.boost import Boost - - -class Chill(AutotoolsPackage): - """A polyheadral compiler for autotuning""" - - homepage = "https://github.com/CtopCsUtahEdu/chill" - url = "https://github.com/CtopCsUtahEdu/chill/archive/v0.3.tar.gz" - git = "https://github.com/CtopCsUtahEdu/chill.git" - - maintainers = ["dhuth"] - - version("master", branch="master") - version("0.3", sha256="574b622368a6bfaadbe9c1fa02fabefdc6c006069246f67d299f943b7e1d8aa3") - - depends_on("boost@1.66.0 cxxstd=11", type="build") - - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants, type="build") - depends_on("rose@0.9.13.0: +cxx11", type=("build", "run")) - depends_on("autoconf", type="build") - depends_on("automake@1.14:", type="build") - depends_on("libtool", type="build") - depends_on("m4", type="build") - depends_on("iegenlib", type=("build", "run")) - depends_on("bison@3.4.2:", type="build") - depends_on("flex", type="build") - # Does not currrently work with Python3 - depends_on("python@2.7:2.8") - depends_on("isl", type="build") - depends_on("gmp", type="build") - - patch("Add-ISLHOME-option.patch") - patch("Add-GMPHOME-option.patch") - patch("Add-GCC-libquadmath-for-rose.patch") - - build_directory = "spack-build" - - def autoreconf(self, spec, prefix): - bash = which("bash") - bash("./bootstrap") - - def setup_build_environment(self, env): - rose_home = self.spec["rose"].prefix - boost_home = self.spec["boost"].prefix - iegen_home = self.spec["iegenlib"].prefix - isl_home = self.spec["isl"].prefix - gmp_home = self.spec["gmp"].prefix - - env.set("ROSEHOME", rose_home) - env.set("BOOSTHOME", boost_home) - env.set("IEGENHOME", iegen_home) - env.set("ISLHOME", isl_home) - env.set("GMPHOME", gmp_home) - - env.append_path("LD_LIBRARY_PATH", rose_home.lib) - env.append_path("LD_LIBRARY_PATH", boost_home.lib) - env.append_path("LD_LIBRARY_PATH", iegen_home.lib) - env.append_path("LD_LIBRARY_PATH", isl_home.lib) - env.append_path("LD_LIBRARY_PATH", gmp_home.lib) - - def setup_run_environment(self, env): - rose_home = self.spec["rose"].prefix - boost_home = self.spec["boost"].prefix - iegen_home = self.spec["iegenlib"].prefix - isl_home = self.spec["isl"].prefix - gmp_home = self.spec["gmp"].prefix - - env.append_path("LD_LIBRARY_PATH", rose_home.lib) - env.append_path("LD_LIBRARY_PATH", boost_home.lib) - env.append_path("LD_LIBRARY_PATH", iegen_home.lib) - env.append_path("LD_LIBRARY_PATH", isl_home.lib) - env.append_path("LD_LIBRARY_PATH", gmp_home.lib) - - def configure_args(self): - args = [ - "--with-rose={0}".format(self.spec["rose"].prefix), - "--with-boost={0}".format(self.spec["boost"].prefix), - "--with-iegen={0}".format(self.spec["iegenlib"].prefix), - "--with-isl={0}".format(self.spec["isl"].prefix), - "--with-gmp={0}".format(self.spec["gmp"].prefix), - ] - - return args diff --git a/var/spack/repos/builtin/packages/citcoms/package.py b/var/spack/repos/builtin/packages/citcoms/package.py index 18279085b1..897e71a5df 100644 --- a/var/spack/repos/builtin/packages/citcoms/package.py +++ b/var/spack/repos/builtin/packages/citcoms/package.py @@ -27,7 +27,6 @@ class Citcoms(AutotoolsPackage): # Required dependencies depends_on("mpi") depends_on("zlib") - depends_on("python@:2", type="run") # needed for post-processing scripts depends_on("automake", when="@master", type="build") depends_on("autoconf", when="@master", type="build") depends_on("libtool", when="@master", type="build") diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index 9ef89399ba..434e9a2fa4 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -24,7 +24,7 @@ class Cmor(AutotoolsPackage): version("3.1.2", sha256="ee58b6d405f081e4e0633af931b7992f1a570953b71ece17c01ab9e15889211a") variant("fortran", default=True, description="Enable Fortran API") - variant("python", default=False, description="Enable PYTHON support") + variant("python", default=False, description="Enable PYTHON support", when="@3.4:") # older releases require another implementation providing uuid_create() # 3.6.1 requires libuuid(only the lib) or util-linux-uuid providing uuid_generate() @@ -37,7 +37,6 @@ class Cmor(AutotoolsPackage): depends_on("udunits") extends("python", when="+python") - depends_on("python@:2", when="@:3.3 +python", type=("build", "run")) depends_on("py-pip", when="+python", type="build") depends_on("py-wheel", when="+python", type="build") depends_on("py-numpy", type=("build", "run"), when="+python") diff --git a/var/spack/repos/builtin/packages/couchdb/package.py b/var/spack/repos/builtin/packages/couchdb/package.py deleted file mode 100644 index 65cd32d299..0000000000 --- a/var/spack/repos/builtin/packages/couchdb/package.py +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Couchdb(AutotoolsPackage): - """A CouchDB server hosts named databases, which store documents. Each document - is uniquely named in the database, and CouchDB provides a RESTful HTTP API - for reading and updating (add, edit, delete) database documents.""" - - homepage = "https://couchdb.apache.org/" - url = "https://archive.apache.org/dist/couchdb/source/3.1.0/apache-couchdb-3.1.0.tar.gz" - - version("3.1.0", sha256="4867c796a1ff6f0794b7bd3863089ea6397bd5c47544f9b97db8cdacff90f8ed") - version("3.0.1", sha256="08d61d5c779957d074d5097f28a2dfc9eb518af3c479d5318135ff31212cc522") - version("3.0.0", sha256="d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9") - - depends_on("icu4c") - depends_on("openssl") - depends_on("curl") - depends_on("node-js@6:") - depends_on("mozjs@1.8.5") - depends_on("gmake", type="build") - depends_on("help2man", type="build") - depends_on("python", 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) - - def configure_args(self): - args = ["--disable-docs"] - return args - - def install(self, spec, prefix): - make("release") - with working_dir("rel/couchdb/"): - install_tree(".", prefix) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 34487891a9..452fd8c552 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -53,7 +53,10 @@ class Cp2k(MakefilePackage, CudaPackage): description=("Enable the alternative PEXSI method" "for density matrix evaluation"), ) variant( - "elpa", default=False, description="Enable optimised diagonalisation routines from ELPA" + "elpa", + default=False, + description="Enable optimised diagonalisation routines from ELPA", + when="@8.3:", ) variant( "sirius", @@ -164,9 +167,6 @@ class Cp2k(MakefilePackage, CudaPackage): 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") - 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:") depends_on("elpa@2021.11.001:", when="@9.1:") diff --git a/var/spack/repos/builtin/packages/damaris/package.py b/var/spack/repos/builtin/packages/damaris/package.py index c1e8423640..6b744d8400 100644 --- a/var/spack/repos/builtin/packages/damaris/package.py +++ b/var/spack/repos/builtin/packages/damaris/package.py @@ -51,7 +51,7 @@ class Damaris(CMakePackage): depends_on("xsd") depends_on("xerces-c") depends_on("hdf5@1.8.20:", when="+hdf5") - depends_on("paraview+python3", when="+catalyst") + depends_on("paraview+python", when="+catalyst") depends_on("visit+mpi", when="+visit") depends_on("boost+thread+log+filesystem+date_time+python+numpy @1.67:", when="+python") diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 5b6f16b0ef..2790a8dc20 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -182,10 +182,8 @@ class Dealii(CMakePackage, CudaPackage): depends_on("p4est", when="+p4est+mpi") depends_on("petsc+mpi~int64", when="+petsc+mpi~int64") depends_on("petsc+mpi+int64", when="+petsc+mpi+int64") - depends_on("petsc@:3.6.4", when="@:8.4.1+petsc+mpi") depends_on("scalapack", when="@9.0:+scalapack") depends_on("slepc", when="+slepc+petsc+mpi") - depends_on("slepc@:3.6.3", when="@:8.4.1+slepc+petsc+mpi") depends_on("slepc~arpack", when="+slepc+petsc+mpi+int64") depends_on("sundials@:3~pthread", when="@9.0:9.2+sundials") depends_on("sundials@5:5.8", when="@9.3:9.3.3+sundials") diff --git a/var/spack/repos/builtin/packages/draco/d710-python2.patch b/var/spack/repos/builtin/packages/draco/d710-python2.patch deleted file mode 100644 index 7f50f5d782..0000000000 --- a/var/spack/repos/builtin/packages/draco/d710-python2.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/config/ApplicationUnitTest.cmake b/config/ApplicationUnitTest.cmake -index a0a79858..0c47b72a 100644 ---- a/config/ApplicationUnitTest.cmake -+++ b/config/ApplicationUnitTest.cmake -@@ -249,7 +249,7 @@ macro( aut_register_test ) - endif(VERBOSE_DEBUG) - - # Look for python, which is used to drive application unit tests -- if( NOT PYTHONINTERP_FOUND ) -+ if( NOT Python_Interpreter_FOUND ) - # python should have been found when vendor_libraries.cmake was run. - message( FATAL_ERROR "Draco requires python. Python not found in PATH.") - endif() -@@ -289,7 +289,7 @@ macro( aut_register_test ) - if (${PYTHON_TEST}) - add_test( - NAME ${ctestname_base}${argname} -- COMMAND "${PYTHON_EXECUTABLE}" -+ COMMAND "${Python_EXECUTABLE}" - ${aut_DRIVER} - ${SHARED_ARGUMENTS} - ) -diff --git a/config/draco-config-install.cmake.in b/config/draco-config-install.cmake.in -index c5bf1c75..a16f72f4 100644 ---- a/config/draco-config-install.cmake.in -+++ b/config/draco-config-install.cmake.in -@@ -107,8 +107,9 @@ set( WITH_CUDA "@WITH_CUDA@" ) - #endif() - - # Python --set( PYTHONINTERP_FOUND "@PYTHONINTERP_FOUND@" ) --set( PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@" ) -+set( Python_FOUND "@Python_FOUND@" ) -+set( Python_Interpreter_FOUND "@Python_Interpreter_FOUND@" ) -+set( Python_EXECUTABLE "@Python_EXECUTABLE@" ) - - ## --------------------------------------------------------------------------- - ## Set useful general variables -diff --git a/config/vendor_libraries.cmake b/config/vendor_libraries.cmake -index c3e079bc..6b393eb4 100644 ---- a/config/vendor_libraries.cmake -+++ b/config/vendor_libraries.cmake -@@ -16,7 +16,7 @@ include( setupMPI ) # defines the macros setupMPILibrariesUnix|Windows - macro( setupPython ) - - message( STATUS "Looking for Python...." ) -- find_package(PythonInterp 2.7 QUIET REQUIRED) -+ find_package(Python 2.7 QUIET REQUIRED COMPONENTS Interpreter) - # PYTHONINTERP_FOUND - Was the Python executable found - # PYTHON_EXECUTABLE - path to the Python interpreter - set_package_properties( PythonInterp PROPERTIES -@@ -25,8 +25,8 @@ macro( setupPython ) - TYPE REQUIRED - PURPOSE "Required for running tests and accessing features that rely on matplotlib." - ) -- if( PYTHONINTERP_FOUND ) -- message( STATUS "Looking for Python....found ${PYTHON_EXECUTABLE}" ) -+ if( Python_Interpreter_FOUND ) -+ message( STATUS "Looking for Python....found ${Python_EXECUTABLE}" ) - else() - message( STATUS "Looking for Python....not found" ) - endif() diff --git a/var/spack/repos/builtin/packages/draco/package.py b/var/spack/repos/builtin/packages/draco/package.py index 09601ca23e..5565539a57 100644 --- a/var/spack/repos/builtin/packages/draco/package.py +++ b/var/spack/repos/builtin/packages/draco/package.py @@ -88,8 +88,7 @@ class Draco(CMakePackage): 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") + patch("d710.patch", when="@7.1.0") patch("d730.patch", when="@7.3.0:7.3") patch("d740.patch", when="@7.4.0:7.4") patch("d750-intel17.patch", when="@7.5.0:7.6.99%intel@17.0.0:18.0.0") diff --git a/var/spack/repos/builtin/packages/easybuild/package.py b/var/spack/repos/builtin/packages/easybuild/package.py index c109250d8f..4358dcecb3 100644 --- a/var/spack/repos/builtin/packages/easybuild/package.py +++ b/var/spack/repos/builtin/packages/easybuild/package.py @@ -16,14 +16,12 @@ class Easybuild(PythonPackage): maintainers = ["boegel"] version("4.0.0", sha256="21bcc1048525ad6219667cc97a7421b5388068c670cabba356712e474896de40") - version("3.1.2", sha256="a966a08e41d3557d7fd3dc5322180c006d27281d9ecc1b1fce1b4518c32664d4") - depends_on("python@2.6:2.8", when="@:3", type=("build", "run")) depends_on("python@2.6:2.8,3.5:", when="@4:", type=("build", "run")) # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") - for v in ["@4.0.0", "@3.1.2"]: + for v in ["@4.0.0"]: depends_on("py-easybuild-framework" + v, when=v, type="run") depends_on("py-easybuild-easyblocks" + v, when=v, type="run") depends_on("py-easybuild-easyconfigs" + v, when=v, type="run") diff --git a/var/spack/repos/builtin/packages/eccodes/package.py b/var/spack/repos/builtin/packages/eccodes/package.py index 57e1b80477..5d61b5f35a 100644 --- a/var/spack/repos/builtin/packages/eccodes/package.py +++ b/var/spack/repos/builtin/packages/eccodes/package.py @@ -77,7 +77,6 @@ class Eccodes(CMakePackage): variant( "memfs", default=False, description="Enable memory based access to definitions/samples" ) - variant("python", default=False, description="Enable the Python 2 interface") variant("fortran", default=False, description="Enable the Fortran support") variant("shared", default=True, description="Build shared versions of the libraries") @@ -114,12 +113,6 @@ class Eccodes(CMakePackage): depends_on("libaec", when="+aec") # Can be built with Python 2 or Python 3. depends_on("python", when="+memfs", type="build") - # 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", when="+python", type=("build", "link", "run")) - depends_on("py-numpy", when="+python", type=("build", "run")) - extends("python", when="+python") depends_on("cmake@3.6:", type="build") depends_on("cmake@3.12:", when="@2.19:", type="build") @@ -149,7 +142,7 @@ class Eccodes(CMakePackage): name=center, destination="spack-definitions", placement="definitions.{0}".format(center), - **kwargs + **kwargs, ) # Enforce linking against the specified JPEG2000 backend, see also @@ -236,13 +229,13 @@ class Eccodes(CMakePackage): r"(^\s*kind_of_double\s*=\s*)(\d{1,2})(\s*$)", "\\1kind(real\\2)\\3", "fortran/grib_types.f90", - **kwargs + **kwargs, ) filter_file( r"(^\s*kind_of_\w+\s*=\s*)(\d{1,2})(\s*$)", "\\1kind(x\\2)\\3", "fortran/grib_types.f90", - **kwargs + **kwargs, ) # Replace integer kinds: @@ -251,7 +244,7 @@ class Eccodes(CMakePackage): r"(^\s*integer\((?:kind=)?){0}(\).*)".format(size), "\\1selected_int_kind({0})\\2".format(r), *patch_kind_files, - **kwargs + **kwargs, ) # Replace real kinds: @@ -260,7 +253,7 @@ class Eccodes(CMakePackage): r"(^\s*real\((?:kind=)?){0}(\).*)".format(size), "\\1selected_real_kind({0}, {1})\\2".format(p, r), *patch_kind_files, - **kwargs + **kwargs, ) # Enable getarg and exit subroutines: @@ -268,7 +261,7 @@ class Eccodes(CMakePackage): r"(^\s*program\s+\w+)(\s*$)", "\\1; use f90_unix_env; use f90_unix_proc\\2", *patch_unix_ext_files, - **kwargs + **kwargs, ) @property @@ -332,9 +325,6 @@ class Eccodes(CMakePackage): self.define_from_variant("ENABLE_ECCODES_THREADS", "pthreads"), self.define_from_variant("ENABLE_ECCODES_OMP_THREADS", "openmp"), self.define_from_variant("ENABLE_MEMFS", "memfs"), - self.define_from_variant( - "ENABLE_PYTHON{0}".format("2" if self.spec.satisfies("@2.20.0:") else ""), "python" - ), self.define_from_variant("ENABLE_FORTRAN", "fortran"), self.define("BUILD_SHARED_LIBS", "BOTH" if "+shared" in self.spec else "OFF"), self.define("ENABLE_TESTS", self.run_tests), diff --git a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py index e0f6676600..2c6a89738f 100644 --- a/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py +++ b/var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py @@ -156,7 +156,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage): depends_on("py-cinemasci", when="+cinema") dav_sdk_depends_on( - "paraview@5.10:+mpi+python3+kits+shared", when="+paraview", propagate=["hdf5", "adios2"] + "paraview@5.10:+mpi+python+kits+shared", when="+paraview", propagate=["hdf5", "adios2"] ) # ParaView needs @5.11: in order to use cuda and be compatible with other # SDK packages. diff --git a/var/spack/repos/builtin/packages/elemental/package.py b/var/spack/repos/builtin/packages/elemental/package.py index eaa0e3906c..502cff6a47 100644 --- a/var/spack/repos/builtin/packages/elemental/package.py +++ b/var/spack/repos/builtin/packages/elemental/package.py @@ -27,7 +27,6 @@ class Elemental(CMakePackage): "openmp_blas", default=False, description="Use OpenMP for threading in the BLAS library" ) variant("c", default=False, description="Build C interface") - variant("python", default=False, description="Install Python interface") variant("parmetis", default=False, description="Enable ParMETIS") variant("quad", default=False, description="Enable quad precision") variant("int64", default=False, description="Use 64bit integers") @@ -83,8 +82,6 @@ class Elemental(CMakePackage): depends_on("mpi") # Allow Elemental to build internally when using 8-byte ints depends_on("scalapack", when="+scalapack ~int64_blas") - extends("python", when="+python") - depends_on("python@:2.8", when="+python") depends_on("gmp", when="+mpfr") depends_on("mpc", when="+mpfr") depends_on("mpfr", when="+mpfr") @@ -117,7 +114,6 @@ class Elemental(CMakePackage): "-DBUILD_SHARED_LIBS:BOOL=%s" % ("+shared" in spec), "-DEL_HYBRID:BOOL=%s" % ("+hybrid" in spec), "-DEL_C_INTERFACE:BOOL=%s" % ("+c" in spec), - "-DINSTALL_PYTHON_PACKAGE:BOOL=%s" % ("+python" in spec), "-DEL_DISABLE_PARMETIS:BOOL=%s" % ("~parmetis" in spec), "-DEL_DISABLE_QUAD:BOOL=%s" % ("~quad" in spec), "-DEL_USE_64BIT_INTS:BOOL=%s" % ("+int64" in spec), @@ -175,7 +171,4 @@ class Elemental(CMakePackage): args.extend(["-DMATH_LIBS:STRING={0}".format(math_libs.ld_flags)]) - if "+python" in spec: - args.extend(["-DPYTHON_SITE_PACKAGES:STRING={0}".format(python_platlib)]) - return args diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index e88c11332c..68608d8262 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -24,47 +24,6 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): version( "2021.05.001", sha256="a4f1a4e3964f2473a5f8177f2091a9da5c6b5ef9280b8272dfefcbc3aad44d41" ) - version( - "2020.05.001", sha256="66ff1cf332ce1c82075dc7b5587ae72511d2bcb3a45322c94af6b01996439ce5" - ) - version( - "2019.11.001", sha256="10374a8f042e23c7e1094230f7e2993b6f3580908a213dbdf089792d05aff357" - ) - version( - "2019.05.002", sha256="d2eab5e5d74f53601220b00d18185670da8c00c13e1c1559ecfb0cd7cb2c4e8d" - ) - version( - "2018.11.001", sha256="cc27fe8ba46ce6e6faa8aea02c8c9983052f8e73a00cfea38abf7613cb1e1b16" - ) - version( - "2018.05.001.rc1", - sha256="598c01da20600a4514ea4d503b93e977ac0367e797cab7a7c1b0e0e3e86490db", - ) - version( - "2017.11.001", sha256="59f99c3abe2190fac0db8a301d0b9581ee134f438669dbc92551a54f6f861820" - ) - version( - "2017.05.003", sha256="bccd49ce35a323bd734b17642aed8f2588fea4cc78ee8133d88554753bc3bf1b" - ) - version( - "2017.05.002", sha256="568b71024c094d667b5cbb23045ad197ed5434071152ac608dae490ace5eb0aa" - ) - version( - "2017.05.001", sha256="28f7edad60984d93da299016ad33571dc6db1cdc9fab0ceaef05dc07de2c7dfd" - ) - version( - "2016.11.001.pre", - sha256="69b67f0f6faaa2b3b5fd848127b632be32771636d2ad04583c5269d550956f92", - ) - version( - "2016.05.004", sha256="08c59dc9da458bab856f489d779152e5506e04f0d4b8d6dcf114ca5fbbe46c58" - ) - version( - "2016.05.003", sha256="c8da50c987351514e61491e14390cdea4bdbf5b09045261991876ed5b433fca4" - ) - version( - "2015.11.001", sha256="c0761a92a31c08a4009c9688c85fc3fc8fde9b6ce05e514c3e1587cf045e9eba" - ) variant("openmp", default=True, description="Activates OpenMP support") variant("mpi", default=True, description="Activates MPI support") @@ -75,8 +34,7 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): depends_on("scalapack", when="+mpi") depends_on("rocblas", when="+rocm") depends_on("libtool", type="build") - depends_on("python@:2", type="build", when="@:2020.05.001") - depends_on("python@3:", type="build", when="@2020.11.001:") + depends_on("python@3:", type="build") with when("@2021.11.01:"): variant( @@ -84,15 +42,12 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): ) depends_on("scalapack", when="+autotune") - 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", msg="ELPA-2021.05.001+ requires GCC-8+ for OpenMP support", ) - 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") def url_for_version(self, version): @@ -158,11 +113,6 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): gcc_options = [] gfortran_options = ["-ffree-line-length-none"] - if self.compiler.version >= Version("10.0.0") and spec.version <= Version( - "2019.11.001" - ): - gfortran_options.append("-fallow-argument-mismatch") - space_separator = " " options.extend( [ @@ -174,7 +124,7 @@ class Elpa(AutotoolsPackage, CudaPackage, ROCmPackage): if "%aocc" in spec: options.extend(["FCFLAGS=-O3", "CFLAGS=-O3"]) - cuda_flag = "nvidia-gpu" if "@2021.05.001:" in self.spec else "gpu" + cuda_flag = "nvidia-gpu" if "+cuda" in spec: prefix = spec["cuda"].prefix options.append("--enable-{0}".format(cuda_flag)) diff --git a/var/spack/repos/builtin/packages/elpa/python_shebang.patch b/var/spack/repos/builtin/packages/elpa/python_shebang.patch deleted file mode 100644 index 4b9b2c9530..0000000000 --- a/var/spack/repos/builtin/packages/elpa/python_shebang.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/manual_cpp 2021-01-27 20:21:23.897206207 +0100 -+++ b/manual_cpp 2021-01-27 20:13:08.743822289 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - from __future__ import print_function - import os - import sys diff --git a/var/spack/repos/builtin/packages/find-circ/package.py b/var/spack/repos/builtin/packages/find-circ/package.py deleted file mode 100644 index 46fbe15508..0000000000 --- a/var/spack/repos/builtin/packages/find-circ/package.py +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class FindCirc(Package): - """Find-circ is a collection of python scripts - detecting head-to-tail spliced (back-spliced) sequencing reads, - indicative of circular RNA (circRNA) in RNA-seq data.""" - - homepage = "https://github.com/marvin-jens/find_circ" - url = "https://github.com/marvin-jens/find_circ/archive/v1.2.tar.gz" - - version("1.2", sha256="f88bf9b5d0cc818313074982d4460c96706f555d924e2821832c3d03bf67743e") - - depends_on("python@2.7:2.8", type=("build", "run")) - depends_on("py-pysam", type=("build", "run")) - # Higher version of py-pandas and py-numpy - # depends on python@3: which conflicts with py-rnacocktail - depends_on("py-numpy@:1.16.5", type=("build", "run")) - - def install(self, spec, prefix): - mkdir(prefix.bin) - install("cmp_bed.py", prefix.bin) - install("find_circ.py", prefix.bin) - install("maxlength.py", prefix.bin) - install("unmapped2anchors.py", prefix.bin) - install("README.md", prefix) - install("README.pdf", prefix) - install("LICENSE", prefix) - install_tree("test_data", prefix.test_data) diff --git a/var/spack/repos/builtin/packages/fplo/package.py b/var/spack/repos/builtin/packages/fplo/package.py index 60db293e67..67c34b709f 100644 --- a/var/spack/repos/builtin/packages/fplo/package.py +++ b/var/spack/repos/builtin/packages/fplo/package.py @@ -128,10 +128,7 @@ class Fplo(MakefilePackage): # build python with working_dir("PYTHON"): - if "^python@:2" in self.spec: - make() - else: - make("python3") + make("python3") def install(self, spec, prefix): with working_dir(self.stage.source_path): diff --git a/var/spack/repos/builtin/packages/ganglia/package.py b/var/spack/repos/builtin/packages/ganglia/package.py deleted file mode 100644 index 7ae96c0c05..0000000000 --- a/var/spack/repos/builtin/packages/ganglia/package.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Ganglia(AutotoolsPackage): - """Ganglia is a scalable distributed monitoring system for high-performance - computing systems such as clusters and Grids. It is based on a hierarchical - design targeted at federations of clusters. Supports clusters up to 2000 - nodes in size.""" - - homepage = "http://ganglia.sourceforge.net/" - url = "https://jaist.dl.sourceforge.net/project/ganglia/ganglia%20monitoring%20core/3.7.2/ganglia-3.7.2.tar.gz" - list_url = "http://jaist.dl.sourceforge.net/project/ganglia/ganglia%20monitoring%20core" - list_depth = 1 - - version("3.7.2", sha256="042dbcaf580a661b55ae4d9f9b3566230b2232169a0898e91a797a4c61888409") - - depends_on("m4", type="build") - depends_on("autoconf", type="build") - depends_on("automake", type="build") - depends_on("libtool", type="build") - depends_on("apr") - depends_on("libconfuse") - depends_on("python@:2.7") - depends_on("pcre") - depends_on("libtirpc") - depends_on("expat") - - def setup_build_environment(self, env): - env.prepend_path("CPATH", self.spec["libtirpc"].prefix.include.tirpc) - env.append_flags("LDFLAGS", "-ltirpc") diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 7f38dde544..3ea7226176 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -31,8 +31,6 @@ class Gaudi(CMakePackage): version("33.1", sha256="7eb6b2af64aeb965228d4b6ea66c7f9f57f832f93d5b8ad55c9105235af5b042") version("33.0", sha256="76a967c41f579acc432593d498875dd4dc1f8afd5061e692741a355a9cf233c8") version("32.2", sha256="e9ef3eb57fd9ac7b9d5647e278a84b2e6263f29f0b14dbe1321667d44d969d2e") - version("31.0", commit="aeb156f0c40571b5753a9e1dab31e331491b2f3e") - version("30.5", commit="2c70e73ee5b543b26197b90dd59ea4e4d359d230") maintainers = ["drbenmorgan", "vvolkl"] @@ -71,10 +69,7 @@ class Gaudi(CMakePackage): depends_on("nlohmann-json", when="@35.0:") depends_on("python", type=("build", "run")) 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-networkx@:2.2", when="^python@:2.7") - depends_on("py-networkx", when="^python@3.0.0:") - depends_on("py-setuptools@:45", when="^python@:2.7", type="build") + depends_on("py-networkx", type=("build", "run")) depends_on("py-six", type=("build", "run")) depends_on("py-xenv@1:", when="@:34.9", type=("build", "run")) depends_on("range-v3") diff --git a/var/spack/repos/builtin/packages/gdb/package.py b/var/spack/repos/builtin/packages/gdb/package.py index 92ba4226c3..981003eec0 100644 --- a/var/spack/repos/builtin/packages/gdb/package.py +++ b/var/spack/repos/builtin/packages/gdb/package.py @@ -37,7 +37,7 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): version("7.11.1", sha256="57e9e9aa3172ee16aa1e9c66fef08b4393b51872cc153e3f1ffdf18a57440586") version("7.10.1", sha256="ff14f8050e6484508c73cbfa63731e57901478490ca1672dc0b5e2b03f6af622") - variant("python", default=True, description="Compile with Python support") + variant("python", default=True, description="Compile with Python support", when="@8.2:") variant("xz", default=True, description="Compile with lzma support") variant("source-highlight", default=False, description="Compile with source-highlight support") variant("lto", default=False, description="Enable lto") @@ -73,7 +73,6 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage): # Optional dependencies depends_on("python", when="+python", type=("build", "link", "run")) - depends_on("python@:3.6", when="@:8.1+python", type=("build", "link", "run")) # gdb@9.2 will segmentation fault if it builds with python@3.9. # https://bugzilla.redhat.com/show_bug.cgi?id=1829702 depends_on("python@:3.8", when="@:9.2+python", type=("build", "link", "run")) diff --git a/var/spack/repos/builtin/packages/gdl/package.py b/var/spack/repos/builtin/packages/gdl/package.py index 4cfe69dca7..10a05f7a92 100644 --- a/var/spack/repos/builtin/packages/gdl/package.py +++ b/var/spack/repos/builtin/packages/gdl/package.py @@ -26,7 +26,6 @@ class Gdl(CMakePackage): variant("hdf5", default=True, description="Enable HDF5") variant("openmp", default=True, description="Enable OpenMP") variant("proj", default=True, description="Enable LIBPROJ4") - variant("embed_python", default=False, description="Ability to embed Python within GDL") variant("python", default=False, description="Build the GDL Python module") variant("wx", default=False, description="Enable WxWidgets") variant("x11", default=False, description="Enable X11") @@ -44,8 +43,6 @@ class Gdl(CMakePackage): # Too many dependencies to test if GDL supports PROJ.6, # so restricting to old API depends_on("proj@:5", when="+proj") - depends_on("py-numpy", type=("build", "run"), when="+embed_python") - depends_on("python@2.7:2.8", type=("build", "run"), when="+embed_python") depends_on("wxwidgets", when="+wx") depends_on("eigen") @@ -62,8 +59,6 @@ class Gdl(CMakePackage): depends_on("libtirpc", type="link") depends_on("libgeotiff", type="link") - conflicts("+python", when="~embed_python") - # Building the Python module requires patches currently targetting 0.9.8 # othwerwise asking for the Python module *only* builds the Python module conflicts("+python", when="@:0.9.7,0.9.9:") @@ -113,11 +108,6 @@ class Gdl(CMakePackage): else: args += ["-DLIBPROJ4=OFF"] - if "+embed_python" in self.spec: - args += ["-DPYTHON=ON"] - else: - args += ["-DPYTHON=OFF"] - if "+python" in self.spec: args += ["-DPYTHON_MODULE=ON"] else: diff --git a/var/spack/repos/builtin/packages/genesis/package.py b/var/spack/repos/builtin/packages/genesis/package.py index ea29318671..e23d604fe9 100644 --- a/var/spack/repos/builtin/packages/genesis/package.py +++ b/var/spack/repos/builtin/packages/genesis/package.py @@ -17,7 +17,6 @@ class Genesis(AutotoolsPackage, CudaPackage): url = "https://www.r-ccs.riken.jp/labs/cbrt/wp-content/uploads/2020/09/genesis-1.5.1.tar.bz2" git = "https://github.com/genesis-release-r-ccs/genesis-2.0.git" - version("master", branch="master") version( "1.6.0", sha256="d0185a5464ed4231f6ee81f6dcaa15935a99fa30b96658d2b7c25d7fbc5b38e9", @@ -63,7 +62,6 @@ class Genesis(AutotoolsPackage, CudaPackage): depends_on("mpi", type=("build", "run")) depends_on("lapack") - depends_on("python@2.6.9:2.8.0", type=("build", "run"), when="@master") patch("fj_compiler.patch", when="@master %fj") patch("fj_compiler_1.5.1.patch", when="@1.5.1 %fj") @@ -115,24 +113,3 @@ class Genesis(AutotoolsPackage, CudaPackage): """Copy test files after the package is installed for test().""" if self.spec.satisfies("@master"): self.cache_extra_test_sources(["tests"]) - - def test(self): - """Perform stand-alone/smoke tests using installed package.""" - if not self.spec.satisfies("@master"): - print("Skipping: Tests are only available for the master branch") - return - - test_name = join_path(self.cached_tests_work_dir, "regression_test", "test.py") - bin_name = join_path(self.prefix.bin, "spdyn") - opts = [ - test_name, - self.spec["mpi"].prefix.bin.mpirun + " -np 8 " + bin_name, - ] - env["OMP_NUM_THREADS"] = "1" - self.run_test( - self.spec["python"].command.path, - options=opts, - expected="Passed 53 / 53", - purpose="test: running regression test", - work_dir=self.cached_tests_work_dir, - ) diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py index 3f305a15b9..312367f5f6 100644 --- a/var/spack/repos/builtin/packages/git-imerge/package.py +++ b/var/spack/repos/builtin/packages/git-imerge/package.py @@ -31,7 +31,6 @@ class GitImerge(MakefilePackage): version("1.0.0", sha256="2ef3a49a6d54c4248ef2541efc3c860824fc8295a7226760f24f0bb2c5dd41f2") depends_on("python@2.6:") - depends_on("py-argparse", when="^python@:2.6,3.0:3.1") depends_on("git") # Package copies a Python script and bash-completion files, so diff --git a/var/spack/repos/builtin/packages/gpdb/package.py b/var/spack/repos/builtin/packages/gpdb/package.py deleted file mode 100644 index b2098fe9bd..0000000000 --- a/var/spack/repos/builtin/packages/gpdb/package.py +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Gpdb(AutotoolsPackage): - """ - Greenplum Database (GPDB) is an advanced, fully featured, open source - data warehouse, based on PostgreSQL. It provides powerful and rapid - analytics on petabyte scale data volumes. Uniquely geared toward big - data analytics, Greenplum Database is powered by the world's most - advanced cost-based query optimizer delivering high analytical query - performance on large data volumes. - """ - - homepage = "https://github.com/greenplum-db/gpdb" - url = "https://github.com/greenplum-db/gpdb/archive/6.2.1.tar.gz" - - version("6.2.1", sha256="60c81d71665d623ea98a0e9bd8e6df7fecf6b30eb60a5881ccef781ff5214438") - version("6.1.0", sha256="81fa854b0ac5fe4e0de5fdee9a7b7c2514e1ea1feefa4e4d10518538a5c5b2a8") - version("6.0.1", sha256="8902f5d64386447f61c25686f283a785858760e0dcf9a049266db058d3597156") - version("6.0.0", sha256="8514140bee9db514d18a769034562e7f3464f74828595903a64dbf3d175ab71a") - version("5.24.0", sha256="4ea5cfcc20f149669bb3713378158e15b5c5949b367351a0f497ba1602d61fc1") - version("5.23.0", sha256="b06a797eb941362d5473b84d5def349b5ce12ce87ab116bea7c74ad193738ae9") - - depends_on("zstd") - depends_on("py-setuptools@:44") - depends_on("apr") - depends_on("libevent") - depends_on("curl") - depends_on("xerces-c") - depends_on("bison", type="build") - depends_on("libxml2") - depends_on("flex") - depends_on("readline") - depends_on("py-subprocess32", type=("build", "run")) - depends_on("python@:2.8.0", type=("build", "run")) - depends_on("py-lockfile", type=("build", "run")) - depends_on("py-psutil", type=("build", "run")) - depends_on("py-utils@:1.0.0", type=("build", "run")) - - def configure_args(self): - args = ["--with-python", "--disable-orca", "--enable-depend", "--with-libxml"] - return args - - def setup_run_environment(self, env): - env.append_path("GPHOME", self.prefix) - env.append_path("PYTHONPATH", self.prefix.lib.python) diff --git a/var/spack/repos/builtin/packages/gplates/package.py b/var/spack/repos/builtin/packages/gplates/package.py index e4606f8292..556be8b245 100644 --- a/var/spack/repos/builtin/packages/gplates/package.py +++ b/var/spack/repos/builtin/packages/gplates/package.py @@ -21,7 +21,6 @@ class Gplates(CMakePackage): manual_download = True version("2.3.0", sha256="7d4be9d524d1fcbb6a81de29bd1d4b13133082db23f0808965c5efe30e9538ab") - version("2.1.0", sha256="5a52242520d7e243c541e164c8417b23f4e17fcd79ed81f865b2c13628bb0e07") depends_on("cmake@3.5:", when="@2.3:", type="build") depends_on("cmake@2.8.8:", when="@2.1", type="build") @@ -31,7 +30,6 @@ class Gplates(CMakePackage): depends_on("glu") depends_on("glew") depends_on("python@2:3", when="@2.3:") - depends_on("python@2", when="@:2.1") depends_on("boost@1.35:1.75+program_options+python+system+thread", when="@2.3:") # Boost's Python library has a different name starting with 1.67. depends_on("boost@1.34:1.66+program_options+python+system+thread", when="@2.1") diff --git a/var/spack/repos/builtin/packages/grass/package.py b/var/spack/repos/builtin/packages/grass/package.py index cc4d441e98..31115fd2e1 100644 --- a/var/spack/repos/builtin/packages/grass/package.py +++ b/var/spack/repos/builtin/packages/grass/package.py @@ -25,12 +25,6 @@ class Grass(AutotoolsPackage): version("7.8.2", sha256="33576f7078f805b39ca20c2fa416ac79c64260c0581072a6dc7d813f53aa9abb") version("7.8.1", sha256="6ae578fd67afcce7abec4ba4505dcc55b3d2dfe0ca46b99d966cb148c654abb3") version("7.8.0", sha256="4b1192294e959ffd962282344e4ff325c4472f73abe605e246a1da3beda7ccfa") - version("7.6.1", sha256="9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b") - version("7.4.4", sha256="96a39e273103f7375a670eba94fa3e5dad2819c5c5664c9aee8f145882a94e8c") - version("7.4.3", sha256="004e65693ee97fd4d5dc7ad244e3286a115dccd88964d04be61c07db6574b399") - version("7.4.2", sha256="18eb19bc0aa4cd7be3f30f79ac83f9d0a29c63657f4c1b05bf4c5d5d57a8f46d") - version("7.4.1", sha256="560b8669caaafa9e8dbd4bbf2b4b4bbab7dca1cc46ee828eaf26c744fe0635fc") - version("7.4.0", sha256="cb6fa188e030a3a447fc5451fbe0ecbeb4069ee2fd1bf52ed8e40e9b89e293cc") variant("cxx", default=True, description="Support C++ functionality") variant("tiff", default=False, description="Support TIFF functionality") @@ -67,7 +61,6 @@ class Grass(AutotoolsPackage): depends_on("flex", type="build") depends_on("bison", type="build") depends_on("proj") - depends_on("proj@:4", when="@:7.5") # GRASS 7.8.0 was supposed to support PROJ 6, but it still checks for # share/proj/epsg, which was removed in PROJ 6 depends_on("proj@:5", when="@:7.8.0") @@ -75,7 +68,6 @@ class Grass(AutotoolsPackage): # https://courses.neteler.org/grass-gis-7-8-1-released-with-proj-6-and-gdal-3-support/ depends_on("proj@6:", when="@7.8.1:") depends_on("python@2.7:", type=("build", "run")) - depends_on("python@2.7:2.8", when="@:7.6", type=("build", "run")) depends_on("py-six", when="@7.8:", type=("build", "run")) # Optional packages diff --git a/var/spack/repos/builtin/packages/grib-api/disable_numpy.patch b/var/spack/repos/builtin/packages/grib-api/disable_numpy.patch deleted file mode 100644 index c056388da8..0000000000 --- a/var/spack/repos/builtin/packages/grib-api/disable_numpy.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/python/CMakeLists.txt -+++ b/python/CMakeLists.txt -@@ -6,7 +6,8 @@ if( HAVE_PYTHON ) - #endif() - - # check for Numpy -- find_package( NumPy ) -+ # find_package( NumPy ) -+ set(NUMPY_FOUND FALSE) - - ############################################################################### - # swig python interface diff --git a/var/spack/repos/builtin/packages/grib-api/package.py b/var/spack/repos/builtin/packages/grib-api/package.py index 1aa967d26a..f9f1312b2b 100644 --- a/var/spack/repos/builtin/packages/grib-api/package.py +++ b/var/spack/repos/builtin/packages/grib-api/package.py @@ -55,8 +55,6 @@ class GribApi(CMakePackage): ) variant("pthreads", default=False, description="Enable POSIX threads") variant("openmp", default=False, description="Enable OpenMP threads") - variant("python", default=False, description="Enable the Python interface") - variant("numpy", default=False, description="Enable numpy support in the Python interface") variant("fortran", default=False, description="Enable the Fortran support") variant( "examples", default=True, description="Build the examples (part of the full test suite)" @@ -78,24 +76,13 @@ class GribApi(CMakePackage): depends_on("jasper", when="jp2k=jasper") depends_on("libpng", when="+png") depends_on("libaec", when="+aec") - 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") conflicts("+openmp", when="+pthreads", msg="Cannot enable both POSIX threads and OMP") - conflicts( - "+numpy", - when="~python", - msg="Numpy variant is valid only when the Python interface is " "enabled", - ) # The following enforces linking against the specified JPEG2000 backend. patch("enable_only_openjpeg.patch", when="jp2k=openjpeg") patch("enable_only_jasper.patch", when="jp2k=jasper") - # Disable NumPy even if it's available. - patch("disable_numpy.patch", when="+python~numpy") - # CMAKE_INSTALL_RPATH must be a semicolon-separated list. patch("cmake_install_rpath.patch") @@ -108,7 +95,6 @@ class GribApi(CMakePackage): var_opt_list = [ ("+pthreads", "GRIB_THREADS"), ("+openmp", "GRIB_OMP_THREADS"), - ("+python", "PYTHON"), ("+fortran", "FORTRAN"), ("+examples", "EXAMPLES"), ("+test", "TESTS"), @@ -159,7 +145,4 @@ class GribApi(CMakePackage): else: args.append("-DENABLE_AEC=OFF") - if "^python" in self.spec: - args.append("-DPYTHON_EXECUTABLE:FILEPATH=" + python.path) - return args diff --git a/var/spack/repos/builtin/packages/halc/package.py b/var/spack/repos/builtin/packages/halc/package.py deleted file mode 100644 index 5215349b4d..0000000000 --- a/var/spack/repos/builtin/packages/halc/package.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Halc(MakefilePackage): - """HALC is software that makes error correction for long reads with - high throughput.""" - - homepage = "https://github.com/lanl001/halc" - url = "https://github.com/lanl001/halc/archive/v1.1.tar.gz" - - version("1.1", sha256="79675c3d6c40f567c2e1a5b5e7ec4fb150036582054f6ad079e06b73bd71c1ad") - - depends_on("blasr", type="run") - depends_on("lordec", type="run") - depends_on("dos2unix", type="build") - depends_on("python", type="run") - - parallel = False - - def install(self, spec, prefix): - install_tree("bin", prefix.bin) - install("runHALC.py", prefix.bin) - dos2unix = which("dos2unix") - dos2unix(join_path(self.prefix.bin, "runHALC.py")) diff --git a/var/spack/repos/builtin/packages/herwig3/package.py b/var/spack/repos/builtin/packages/herwig3/package.py index 1a4e32cbee..fbda19fccf 100644 --- a/var/spack/repos/builtin/packages/herwig3/package.py +++ b/var/spack/repos/builtin/packages/herwig3/package.py @@ -36,7 +36,6 @@ class Herwig3(AutotoolsPackage): depends_on("vbfnlo@3:") depends_on("madgraph5amc") depends_on("njet") - depends_on("py-gosam", when="^python@2.7.0:2.7") depends_on("gosam-contrib") depends_on("openloops") @@ -60,9 +59,6 @@ class Herwig3(AutotoolsPackage): "--with-evtgen=" + self.spec["evtgen"].prefix, ] - if self.spec.satisfies("^python@2.7.0:2.7"): - args.append("--with-gosam=" + self.spec["gosam"].prefix) - return args def flag_handler(self, name, flags): diff --git a/var/spack/repos/builtin/packages/hic-pro/package.py b/var/spack/repos/builtin/packages/hic-pro/package.py deleted file mode 100644 index e5e1e606d5..0000000000 --- a/var/spack/repos/builtin/packages/hic-pro/package.py +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class HicPro(MakefilePackage): - """HiC-Pro is a package designed to process Hi-C data, - from raw fastq files (paired-end Illumina data) - to the normalized contact maps""" - - homepage = "https://github.com/nservant/HiC-Pro" - url = "https://github.com/nservant/HiC-Pro/archive/v2.10.0.tar.gz" - - version("2.10.0", sha256="df181ea5c57247caf6b25fd15dfbb03df597ff8c4f57599d88607648bb61f1b7") - - depends_on("bowtie2") - depends_on("samtools") - depends_on("python+ucs4@2.7:2.8") - depends_on("r") - depends_on("py-numpy", type=("build", "run")) - depends_on("py-scipy", type=("build", "run")) - depends_on("py-pysam", type=("build", "run")) - depends_on("py-bx-python", type=("build", "run")) - depends_on("r-rcolorbrewer", type=("build", "run")) - depends_on("r-ggplot2", type=("build", "run")) - - def edit(self, spec, prefix): - config = FileFilter("config-install.txt") - config.filter("PREFIX =.*", "PREFIX = {0}".format(prefix)) - config.filter("BOWTIE2 PATH =.*", "BOWTIE2_PATH = {0}".format(spec["bowtie2"].prefix)) - config.filter("SAMTOOLS_PATH =.*", "SAMTOOLS_PATH = {0}".format(spec["samtools"].prefix)) - config.filter("R_PATH =.*", "R_RPTH ={0}".format(spec["r"].prefix)) - config.filter("PYTHON_PATH =.*", "PYTHON_RPTH ={0}".format(spec["python"].prefix)) - - def build(self, spec, preifx): - make("-f", "./scripts/install/Makefile", "CONFIG_SYS=./config-install.txt") - make("mapbuilder") - make("readstrimming") - make("iced") - - def install(self, spec, prefix): - # Patch INSTALLPATH in config-system.txt - config = FileFilter("config-system.txt") - config.filter("/HiC-Pro_%s" % self.version, "") - # Install - install("config-hicpro.txt", prefix) - install("config-install.txt", prefix) - install("config-system.txt", prefix) - install_tree("bin", prefix.bin) - install_tree("annotation", prefix.annotation) - install_tree("doc", prefix.doc) - install_tree("scripts", prefix.scripts) - install_tree("test-op", join_path(prefix, "test-op")) diff --git a/var/spack/repos/builtin/packages/hicops/package.py b/var/spack/repos/builtin/packages/hicops/package.py index 3646a27412..398697e2dc 100644 --- a/var/spack/repos/builtin/packages/hicops/package.py +++ b/var/spack/repos/builtin/packages/hicops/package.py @@ -81,11 +81,9 @@ class Hicops(CMakePackage): depends_on("py-setuptools") depends_on("py-bottleneck") depends_on("py-pyparsing") - depends_on("py-subprocess32") depends_on("py-six") depends_on("py-setuptools-scm") depends_on("py-et-xmlfile") - depends_on("py-argparse") depends_on("py-cython") depends_on("py-cycler") depends_on("py-pytz") diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py index 7bdfd5938e..b3bdc77cc0 100644 --- a/var/spack/repos/builtin/packages/httpie/package.py +++ b/var/spack/repos/builtin/packages/httpie/package.py @@ -35,4 +35,3 @@ class Httpie(PythonPackage): depends_on("py-requests@2.11:", type=("build", "run")) depends_on("py-requests@2.22:+socks", when="@2.5:", type=("build", "run")) depends_on("py-requests-toolbelt@0.9.1:", when="@2.5:", type=("build", "run")) - depends_on("py-argparse@1.2.1:", type=("build", "run"), when="^python@:2.6,3.0:3.1") diff --git a/var/spack/repos/builtin/packages/isescan/package.py b/var/spack/repos/builtin/packages/isescan/package.py index 4c9eafacb6..3bd7778974 100644 --- a/var/spack/repos/builtin/packages/isescan/package.py +++ b/var/spack/repos/builtin/packages/isescan/package.py @@ -21,7 +21,6 @@ class Isescan(Package): depends_on("py-scipy@0.13.1:", type="run") depends_on("py-biopython@1.62:", type="run") depends_on("py-fastcluster", type="run") - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type="run") depends_on("blast-plus@2.2.31:", type="run") depends_on("fraggenescan@:1.30", type="run") depends_on("hmmer@3.1b2:", type="run") diff --git a/var/spack/repos/builtin/packages/itstool/package.py b/var/spack/repos/builtin/packages/itstool/package.py index b6c73cf561..f89d6aec05 100644 --- a/var/spack/repos/builtin/packages/itstool/package.py +++ b/var/spack/repos/builtin/packages/itstool/package.py @@ -17,10 +17,5 @@ class Itstool(AutotoolsPackage): maintainers = ["agoodLANL"] version("2.0.7", sha256="6b9a7cd29a12bb95598f5750e8763cee78836a1a207f85b74d8b3275b27e87ca") - version("2.0.2", sha256="bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a") - version("2.0.1", sha256="ec6b1b32403cbe338b6ac63c61ab1ecd361f539a6e41ef50eae56a4f577234d1") - version("2.0.0", sha256="14708111b11b4a70e240e3b404d7a58941e61dbb5caf7e18833294d654c09169") - version("1.2.0", sha256="46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa") depends_on("libxml2+python", type=("build", "run")) - depends_on("python@2.0:2", when="@:2.0.2") diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index bed40b3f5e..92c6ee15e1 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -243,7 +243,6 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on("python@3: +shared", type=("build", "run"), when="@:0.90,0.99: +pfe") extends("python", when="+pfe") depends_on("py-setuptools", type="build", when="+pfe") - depends_on("py-argparse", type="run", when="@:0.90,0.99: +pfe ^python@:2.6,3.0:3.1") depends_on("py-protobuf+cpp@3.10.0:", type=("build", "run"), when="@:0.90,0.99: +pfe") depends_on("protobuf+shared@3.10.0:", when="@:0.90,0.99:") diff --git a/var/spack/repos/builtin/packages/lhapdf5/package.py b/var/spack/repos/builtin/packages/lhapdf5/package.py index 34fa2376bb..0d905bea24 100644 --- a/var/spack/repos/builtin/packages/lhapdf5/package.py +++ b/var/spack/repos/builtin/packages/lhapdf5/package.py @@ -27,17 +27,8 @@ class Lhapdf5(AutotoolsPackage): version("5.8.0", sha256="8381ea5f785dde95772a2b6d5890f1cb72012e223e6861823fd81b09eedaa7a3") version("5.7.1", sha256="40529629351598317fbf7b5905661e51b23778019d50451eee78d7b1118e2559") - variant("python2", default=False, description="Enable Python2 extension") - - depends_on("python@2.3:2.7", when="+python2") - def setup_build_environment(self, env): env.append_flags("FFLAGS", "-std=legacy") - if self.spec.satisfies("+python2"): - env.append_flags("PYTHON", join_path(self.spec["python"].prefix.bin, "python")) def configure_args(self): - args = [] - if self.spec.satisfies("-python2"): - args.append("--disable-pyext") - return args + return ["--disable-pyext"] diff --git a/var/spack/repos/builtin/packages/libproxy/package.py b/var/spack/repos/builtin/packages/libproxy/package.py index 84c1123683..b4de7f9c31 100644 --- a/var/spack/repos/builtin/packages/libproxy/package.py +++ b/var/spack/repos/builtin/packages/libproxy/package.py @@ -20,12 +20,11 @@ class Libproxy(CMakePackage): version("0.4.13", sha256="d610bc0ef81a18ba418d759c5f4f87bf7102229a9153fb397d7d490987330ffd") variant("perl", default=False, description="Enable Perl bindings") - variant("python", default=True, description="Enable Python bindings") + variant("python", default=True, description="Enable Python bindings", when="@0.4.16:") depends_on("zlib") depends_on("perl", type=("build", "run"), when="+perl") depends_on("python", type=("build", "run"), when="+python") - depends_on("python@:3.6", type=("build", "run"), when="@:0.4.15 +python") def cmake_args(self): return [ diff --git a/var/spack/repos/builtin/packages/llvm/llvm4-lld-ELF-Symbols.patch b/var/spack/repos/builtin/packages/llvm/llvm4-lld-ELF-Symbols.patch deleted file mode 100644 index 1a86cda358..0000000000 --- a/var/spack/repos/builtin/packages/llvm/llvm4-lld-ELF-Symbols.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- a/lldb/include/lldb/Utility/TaskPool.h -+++ b/lldb/include/lldb/Utility/TaskPool.h -@@ -33,6 +33,7 @@ - #include <queue> - #include <thread> - #include <vector> -+#include <functional> - - // Global TaskPool class for running tasks in parallel on a set of worker thread - // created the first -# Fix lld templates: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230463 ---- a/lld/ELF/LTO.cpp -+++ b/lld/ELF/LTO.cpp -@@ -158,7 +158,7 @@ - return Ret; - } - --template void BitcodeCompiler::template add<ELF32LE>(BitcodeFile &); --template void BitcodeCompiler::template add<ELF32BE>(BitcodeFile &); --template void BitcodeCompiler::template add<ELF64LE>(BitcodeFile &); --template void BitcodeCompiler::template add<ELF64BE>(BitcodeFile &); -+template void BitcodeCompiler::add<ELF32LE>(BitcodeFile &); -+template void BitcodeCompiler::add<ELF32BE>(BitcodeFile &); -+template void BitcodeCompiler::add<ELF64LE>(BitcodeFile &); -+template void BitcodeCompiler::add<ELF64BE>(BitcodeFile &); ---- a/lld/ELF/Symbols.cpp -+++ b/lld/ELF/Symbols.cpp -@@ -343,45 +343,45 @@ - template bool SymbolBody::hasThunk<ELF64LE>() const; - template bool SymbolBody::hasThunk<ELF64BE>() const; - --template uint32_t SymbolBody::template getVA<ELF32LE>(uint32_t) const; --template uint32_t SymbolBody::template getVA<ELF32BE>(uint32_t) const; --template uint64_t SymbolBody::template getVA<ELF64LE>(uint64_t) const; --template uint64_t SymbolBody::template getVA<ELF64BE>(uint64_t) const; -- --template uint32_t SymbolBody::template getGotVA<ELF32LE>() const; --template uint32_t SymbolBody::template getGotVA<ELF32BE>() const; --template uint64_t SymbolBody::template getGotVA<ELF64LE>() const; --template uint64_t SymbolBody::template getGotVA<ELF64BE>() const; -- --template uint32_t SymbolBody::template getGotOffset<ELF32LE>() const; --template uint32_t SymbolBody::template getGotOffset<ELF32BE>() const; --template uint64_t SymbolBody::template getGotOffset<ELF64LE>() const; --template uint64_t SymbolBody::template getGotOffset<ELF64BE>() const; -- --template uint32_t SymbolBody::template getGotPltVA<ELF32LE>() const; --template uint32_t SymbolBody::template getGotPltVA<ELF32BE>() const; --template uint64_t SymbolBody::template getGotPltVA<ELF64LE>() const; --template uint64_t SymbolBody::template getGotPltVA<ELF64BE>() const; -- --template uint32_t SymbolBody::template getThunkVA<ELF32LE>() const; --template uint32_t SymbolBody::template getThunkVA<ELF32BE>() const; --template uint64_t SymbolBody::template getThunkVA<ELF64LE>() const; --template uint64_t SymbolBody::template getThunkVA<ELF64BE>() const; -- --template uint32_t SymbolBody::template getGotPltOffset<ELF32LE>() const; --template uint32_t SymbolBody::template getGotPltOffset<ELF32BE>() const; --template uint64_t SymbolBody::template getGotPltOffset<ELF64LE>() const; --template uint64_t SymbolBody::template getGotPltOffset<ELF64BE>() const; -- --template uint32_t SymbolBody::template getPltVA<ELF32LE>() const; --template uint32_t SymbolBody::template getPltVA<ELF32BE>() const; --template uint64_t SymbolBody::template getPltVA<ELF64LE>() const; --template uint64_t SymbolBody::template getPltVA<ELF64BE>() const; -- --template uint32_t SymbolBody::template getSize<ELF32LE>() const; --template uint32_t SymbolBody::template getSize<ELF32BE>() const; --template uint64_t SymbolBody::template getSize<ELF64LE>() const; --template uint64_t SymbolBody::template getSize<ELF64BE>() const; -+template uint32_t SymbolBody::getVA<ELF32LE>(uint32_t) const; -+template uint32_t SymbolBody::getVA<ELF32BE>(uint32_t) const; -+template uint64_t SymbolBody::getVA<ELF64LE>(uint64_t) const; -+template uint64_t SymbolBody::getVA<ELF64BE>(uint64_t) const; -+ -+template uint32_t SymbolBody::getGotVA<ELF32LE>() const; -+template uint32_t SymbolBody::getGotVA<ELF32BE>() const; -+template uint64_t SymbolBody::getGotVA<ELF64LE>() const; -+template uint64_t SymbolBody::getGotVA<ELF64BE>() const; -+ -+template uint32_t SymbolBody::getGotOffset<ELF32LE>() const; -+template uint32_t SymbolBody::getGotOffset<ELF32BE>() const; -+template uint64_t SymbolBody::getGotOffset<ELF64LE>() const; -+template uint64_t SymbolBody::getGotOffset<ELF64BE>() const; -+ -+template uint32_t SymbolBody::getGotPltVA<ELF32LE>() const; -+template uint32_t SymbolBody::getGotPltVA<ELF32BE>() const; -+template uint64_t SymbolBody::getGotPltVA<ELF64LE>() const; -+template uint64_t SymbolBody::getGotPltVA<ELF64BE>() const; -+ -+template uint32_t SymbolBody::getThunkVA<ELF32LE>() const; -+template uint32_t SymbolBody::getThunkVA<ELF32BE>() const; -+template uint64_t SymbolBody::getThunkVA<ELF64LE>() const; -+template uint64_t SymbolBody::getThunkVA<ELF64BE>() const; -+ -+template uint32_t SymbolBody::getGotPltOffset<ELF32LE>() const; -+template uint32_t SymbolBody::getGotPltOffset<ELF32BE>() const; -+template uint64_t SymbolBody::getGotPltOffset<ELF64LE>() const; -+template uint64_t SymbolBody::getGotPltOffset<ELF64BE>() const; -+ -+template uint32_t SymbolBody::getPltVA<ELF32LE>() const; -+template uint32_t SymbolBody::getPltVA<ELF32BE>() const; -+template uint64_t SymbolBody::getPltVA<ELF64LE>() const; -+template uint64_t SymbolBody::getPltVA<ELF64BE>() const; -+ -+template uint32_t SymbolBody::getSize<ELF32LE>() const; -+template uint32_t SymbolBody::getSize<ELF32BE>() const; -+template uint64_t SymbolBody::getSize<ELF64LE>() const; -+template uint64_t SymbolBody::getSize<ELF64BE>() const; - - template class elf::Undefined<ELF32LE>; - template class elf::Undefined<ELF32BE>; diff --git a/var/spack/repos/builtin/packages/llvm/llvm_gcc7.patch b/var/spack/repos/builtin/packages/llvm/llvm_gcc7.patch deleted file mode 100644 index c6d9d33a08..0000000000 --- a/var/spack/repos/builtin/packages/llvm/llvm_gcc7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lldb/include/lldb/Utility/TaskPool.h 2016-09-06 16:57:50.000000000 -0400 -+++ b/lldb/include/lldb/Utility/TaskPool.h 2017-08-29 16:29:41.448584015 -0400 -@@ -28,6 +28,7 @@ - - #include <cassert> - #include <cstdint> -+#include <functional> - #include <future> - #include <list> - #include <queue> diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index d7dc58d4f5..8e020785ff 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -34,7 +34,6 @@ class Llvm(CMakePackage, CudaPackage): family = "compiler" # Used by lmod - # fmt: off version("main", branch="main") version("15.0.4", sha256="e24b4d3bf7821dcb1c901d1e09096c1f88fb00095c5a6ef893baab4836975e52") version("15.0.3", sha256="8ac8e4c0982bf236526d737d385db5e1e66543ab217a9355d54159659eae3774") @@ -68,17 +67,6 @@ class Llvm(CMakePackage, CudaPackage): version("5.0.2", sha256="fe87aa11558c08856739bfd9bd971263a28657663cb0c3a0af01b94f03b0b795") version("5.0.1", sha256="84ca454abf262579814a2a2b846569f6e0cb3e16dc33ca3642b4f1dff6fbafd3") version("5.0.0", sha256="1f1843315657a4371d8ca37f01265fa9aae17dbcf46d2d0a95c1fdb3c6a4bab6") - version("4.0.1", sha256="cd664fb3eec3208c08fb61189c00c9118c290b3be5adb3215a97b24255618be5") - version("4.0.0", sha256="28ca4b2fc434cb1f558e8865386c233c2a6134437249b8b3765ae745ffa56a34") - version("3.9.1", sha256="f5b6922a5c65f9232f83d89831191f2c3ccf4f41fdd8c63e6645bbf578c4ab92") - version("3.9.0", sha256="9c6563a72c8b5b79941c773937d997dd2b1b5b3f640136d02719ec19f35e0333") - version("3.8.1", sha256="69360f0648fde0dc3d3c4b339624613f3bc2a89c4858933bc3871a250ad02826") - version("3.8.0", sha256="b5cc5974cc2fd4e9e49e1bbd0700f872501a8678bd9694fa2b36c65c026df1d1") - version("3.7.1", sha256="d2cb0eb9b8eb21e07605bfe5e7a5c6c5f5f8c2efdac01ec1da6ffacaabe4195a") - version("3.7.0", sha256="dc00bc230be2006fb87b84f6fe4800ca28bc98e6692811a98195da53c9cb28c6") - version("3.6.2", sha256="f75d703a388ba01d607f9cf96180863a5e4a106827ade17b221d43e6db20778a") - version("3.5.1", sha256="5d739684170d5b2b304e4fb521532d5c8281492f71e1a8568187bfa38eb5909d") - # fmt: on # NOTE: The debug version of LLVM is an order of magnitude larger than # the release version, and may take up 20-30 GB of space. If you want @@ -234,13 +222,11 @@ class Llvm(CMakePackage, CudaPackage): depends_on("cmake@3.4.3:", type="build") depends_on("cmake@3.13.4:", type="build", when="@12:") depends_on("ninja", type="build") - depends_on("python@2.7:2.8", when="@:4 ~python", type="build") - depends_on("python", when="@5: ~python", type="build") + depends_on("python", when="~python", type="build") depends_on("pkgconfig", type="build") # Universal dependency - depends_on("python@2.7:2.8", when="@:4+python") - depends_on("python", when="@5:+python") + depends_on("python", when="+python") # clang and clang-tools dependencies depends_on("z3@4.7.1:", when="+z3") @@ -261,20 +247,14 @@ class Llvm(CMakePackage, CudaPackage): depends_on("swig@3:", when="@12:") depends_on("libedit", when="+lldb") depends_on("ncurses", when="+lldb") - depends_on("py-six", when="@5.0.0: +lldb +python") + depends_on("py-six", when="+lldb+python") # gold support, required for some features depends_on("binutils+gold+ld+plugins", when="+gold") - # polly plugin - depends_on("gmp", when="@:3.6 +polly") - depends_on("isl", when="@:3.6 +polly") - # Older LLVM do not build with newer compilers, and vice versa conflicts("%gcc@8:", when="@:5") conflicts("%gcc@:5.0", when="@8:") - # clang/lib: a lambda parameter cannot shadow an explicitly captured entity - conflicts("%clang@8:", when="@:4") # Internal compiler error on gcc 8.4 on aarch64 https://bugzilla.redhat.com/show_bug.cgi?id=1958295 conflicts("%gcc@8.4:8.4.9", when="@12: target=aarch64:") @@ -290,14 +270,6 @@ class Llvm(CMakePackage, CudaPackage): conflicts("%clang@:10", when="@13:+libcxx") conflicts("%apple-clang@:11", when="@13:+libcxx") - # libcxx-4 and compiler-rt-4 fail to build with "newer" clang and gcc versions: - conflicts("%gcc@7:", when="@:4+libcxx") - conflicts("%clang@6:", when="@:4+libcxx") - conflicts("%apple-clang@6:", when="@:4+libcxx") - conflicts("%gcc@7:", when="@:4+compiler-rt") - conflicts("%clang@6:", when="@:4+compiler-rt") - conflicts("%apple-clang@6:", when="@:4+compiler-rt") - # cuda_arch value must be specified conflicts("cuda_arch=none", when="+cuda", msg="A value for cuda_arch must be specified.") @@ -306,14 +278,10 @@ class Llvm(CMakePackage, CudaPackage): # Fixed in upstream versions of both conflicts("^cmake@3.19.0", when="@6:11.0.0") - # Github issue #4986 - patch("llvm_gcc7.patch", when="@4.0.0:4.0.1+lldb %gcc@7.0:") - # sys/ustat.h has been removed in favour of statfs from glibc-2.28. Use fixed sizes: patch("llvm5-sanitizer-ustat.patch", when="@4:6.0.0+compiler-rt") # Fix lld templates: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230463 - patch("llvm4-lld-ELF-Symbols.patch", when="@4+lld%clang@6:") patch("llvm5-lld-ELF-Symbols.patch", when="@5+lld%clang@7:") # Fix missing std:size_t in 'llvm@4:5' when built with '%clang@7:' diff --git a/var/spack/repos/builtin/packages/madgraph5amc/package.py b/var/spack/repos/builtin/packages/madgraph5amc/package.py index 0e6bb5778b..83b3142258 100644 --- a/var/spack/repos/builtin/packages/madgraph5amc/package.py +++ b/var/spack/repos/builtin/packages/madgraph5amc/package.py @@ -32,11 +32,6 @@ class Madgraph5amc(MakefilePackage): url="https://launchpad.net/mg5amcnlo/2.0/2.8.x/+download/MG5_aMC_v2.8.0.tar.gz", ) version("2.7.3.py3", sha256="400c26f9b15b07baaad9bd62091ceea785c2d3a59618fdc27cad213816bc7225") - version( - "2.7.3.py2", - sha256="0b665356f4d9359e6e382e0f408dc11db594734567c6b2f0ec0e0697f2dbe099", - url="https://launchpad.net/mg5amcnlo/2.0/2.7.x/+download/MG5_aMC_v2.7.3.tar.gz", - ) variant( "atlas", @@ -55,7 +50,6 @@ class Madgraph5amc(MakefilePackage): depends_on("fastjet") depends_on("py-six", when="@2.7.3.py3,2.8.0:", type=("build", "run")) - depends_on("python@2.7.0:2.8.0", when="@2.7.3.py2", type=("build", "run")) depends_on("python@3.7:", when="@2.7.3.py3", type=("build", "run")) depends_on("python@2.7.0:2.8.0,3.7:", when="@2.8.0:", type=("build", "run")) depends_on("libtirpc") diff --git a/var/spack/repos/builtin/packages/magics/package.py b/var/spack/repos/builtin/packages/magics/package.py index 4746c9a953..0a131cc485 100644 --- a/var/spack/repos/builtin/packages/magics/package.py +++ b/var/spack/repos/builtin/packages/magics/package.py @@ -28,22 +28,9 @@ class Magics(CMakePackage): version("4.2.6", sha256="9b34a375d9125ab6e8a715b970da2e479f96370bac6a5bb8a015a079ed9e027c") version("4.2.4", sha256="920c7dbb1aaabe65a31c6c18010829210f8b2f8d614b6c405dc5a4530e346f07") version("4.1.0", sha256="da626c31f53716990754dd72ab7b2f3902a8ad924b23ef3309bd14900d170541") - version("2.34.3", sha256="38487562e83c0470f94d9c7fb9418cbadf92f1e643033237baba2abdc77e6238") - version("2.34.1", sha256="8df27f8f262ebc32a61f8696df15a7b4a6e4203b2a8e53fe7aa13caa1c4e3fa4") - version("2.33.0", sha256="32d3079749f89988715a8c3df01b712d9b989b7fd242828ec09563e47c5a3e82") - version("2.32.0", sha256="233b046c93b84be60ac8011212668de35c2693d89fffcaad333b42b8c4ffad06") - version("2.31.0", sha256="13c314661bb154499a87db9063238d6ecebad0d4fec37b0f3d90fe34aa37eec6") - version("2.29.6", sha256="88cfa5e2bd823c4669a3d2fe0349f14545e810333c1b4d031ce74a7a5218a2db") - version("2.29.4", sha256="82bdb4f7e38776776d2155a82d0acaa017402365a043731708345ac4ac00198f") - version("2.29.0", sha256="4c5067c4630e831bf81d15454476ff0d050c488b768f6a10272aad62ce8d0f92") conflicts("%gcc@11:", when="@:4.4", msg="missing #include <limits>") - # The patch reorders includes and adds namespaces where necessary to - # resolve ambiguity of invocations of isnan and isinf functions. The - # patch is not needed since the version 2.29.1 - patch("resolve_isnan_ambiguity.patch", when="@2.29.0") - variant( "grib", default="eccodes", @@ -52,7 +39,6 @@ class Magics(CMakePackage): ) variant("netcdf", default=False, description="Enable NetCDF support") variant("cairo", default=False, description="Enable cairo support[png/jpeg]") - variant("python", default=False, description="Enable Python interface") variant("fortran", default=False, description="Enable Fortran interface") variant("metview", default=False, description="Enable metview support") variant("qt", default=False, description="Enable metview support with qt") @@ -69,7 +55,6 @@ class Magics(CMakePackage): depends_on("cmake@2.8.11:", type="build") depends_on("pkgconfig", type="build") depends_on("python", type="build") - depends_on("python@:2", type="build", when="@:3") depends_on("perl", type="build") depends_on("perl-xml-parser", type="build") @@ -108,27 +93,8 @@ class Magics(CMakePackage): depends_on("libemos grib=grib-api", when="+bufr grib=grib-api") depends_on("qt", when="+metview+qt") - extends("python", when="+python") - # Python 2 is required for running the building scripts. Since we can't - # have two different versions of Python at the same time, we haven't even - # tested if the Python interface supports Python 3. - depends_on("python", when="+python", type=("link", "run")) - depends_on("py-numpy", when="+python", type=("build", "run")) - depends_on("swig", when="+python", type="build") - # Versions @4: supports python 2.7 and 3.x, and require python - # and py-jinja2 for build (even though does not build python interface) - depends_on("python", when="@4.0.0:", type=("build")) - depends_on("py-jinja2", when="@4.0.0:", type=("build")) - - conflicts("grib=eccodes", when="@:2.29.0", msg="Eccodes is supported starting version 2.29.1") - conflicts( - "+python", when="@:2.28", msg="Python interface is supported starting version 2.29.0" - ) - conflicts( - "+python", - when="@4:", - msg="Python interface is separate from the library " "starting with 4.0.0", - ) + depends_on("python", type=("build")) + depends_on("py-jinja2", type=("build")) # Replace system python and perl by spack versions: def patch(self): @@ -162,12 +128,6 @@ class Magics(CMakePackage): else: args.append("-DENABLE_CAIRO=OFF") - if "+python" in self.spec: - args.append("-DENABLE_PYTHON=ON") - else: - if self.spec.satisfies("@2.29.0:"): - args.append("-DENABLE_PYTHON=OFF") - if "+fortran" in self.spec: args.append("-DENABLE_FORTRAN=ON") else: diff --git a/var/spack/repos/builtin/packages/magics/resolve_isnan_ambiguity.patch b/var/spack/repos/builtin/packages/magics/resolve_isnan_ambiguity.patch deleted file mode 100644 index 54b96ae88e..0000000000 --- a/var/spack/repos/builtin/packages/magics/resolve_isnan_ambiguity.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/src/common/Polyline.cc 2016-04-28 14:38:09.000000000 +0200 -+++ b/src/common/Polyline.cc 2016-09-14 13:31:35.784617803 +0200 -@@ -31,2 +30,0 @@ --#include "TeCoord2D.h" --#include "TeGeometryAlgorithms.h" ---- a/src/decoders/GribRegularInterpretor.cc 2016-04-28 14:38:09.000000000 +0200 -+++ b/src/decoders/GribRegularInterpretor.cc 2016-09-14 13:43:41.673614590 +0200 -@@ -2083,2 +2083,2 @@ -- if (isnan(val1)) { -- if (isnan(val2)) { -+ if (std::isnan(val1)) { -+ if (std::isnan(val2)) { -@@ -2090 +2090 @@ -- if (isnan(val2)) { -+ if (std::isnan(val2)) { -@@ -2101 +2101 @@ -- if (isnan(val) || isinf(val) || isinf(-val)) { -+ if (std::isnan(val) || std::isinf(val) || std::isinf(-val)) { -@@ -2105 +2105 @@ -- if (isnan(val)) -+ if (std::isnan(val)) ---- a/src/decoders/GribSatelliteInterpretor.cc 2016-04-28 14:38:09.000000000 +0200 -+++ b/src/decoders/GribSatelliteInterpretor.cc 2016-09-14 13:48:55.243699910 +0200 -@@ -33,5 +32,0 @@ --#include "TeProjection.h" --#include "TeDataTypes.h" --#include "TeRasterParams.h" --#include "TeDecoderMemory.h" --#include "TeRasterRemap.h" ---- a/src/decoders/NetcdfGeoMatrixInterpretor.cc 2016-04-28 14:38:09.000000000 +0200 -+++ b/src/decoders/NetcdfGeoMatrixInterpretor.cc 2016-09-14 13:52:37.481201085 +0200 -@@ -93 +93 @@ -- if ( !isnan(*d) ) { -+ if ( !std::isnan(*d) ) { ---- a/src/decoders/NetcdfOrcaInterpretor.cc 2016-04-28 14:38:09.000000000 +0200 -+++ b/src/decoders/NetcdfOrcaInterpretor.cc 2016-09-14 13:51:16.248650570 +0200 -@@ -210,2 +210,2 @@ -- if ( isnan(val1) ) { -- if ( isnan(val2) ) { -+ if ( std::isnan(val1) ) { -+ if ( std::isnan(val2) ) { -@@ -218 +218 @@ -- if ( isnan(val2) ) { -+ if ( std::isnan(val2) ) { -@@ -226 +226 @@ -- if (isnan(val) || isinf(val) || isinf(-val) ) { -+ if (std::isnan(val) || std::isinf(val) || std::isinf(-val) ) { -@@ -230 +230 @@ -- if (isnan(val) ) val = missing; -+ if (std::isnan(val) ) val = missing; -@@ -296 +296 @@ -- if (isnan(value) ) -+ if (std::isnan(value) ) ---- a/src/terralib/kernel/TeCentroid.cpp 2016-04-28 14:38:09.000000000 +0200 -+++ b/src/terralib/kernel/TeCentroid.cpp 2016-09-14 14:17:31.675996554 +0200 -@@ -23,0 +24,2 @@ -+#include "TeGeometryAlgorithms.h" -+ -@@ -30 +31,0 @@ --#include "TeGeometryAlgorithms.h" ---- a/src/terralib/kernel/TeDatabase.h 2014-11-07 17:39:24.000000000 +0100 -+++ b/src/terralib/kernel/TeDatabase.h 2016-09-14 14:20:01.041100590 +0200 -@@ -33,0 +34 @@ -+#include "TeGeometry.h" -@@ -38 +38,0 @@ --#include "TeGeometry.h" ---- a/src/terralib/kernel/TeOverlayUtils.h 2014-11-07 17:39:24.000000000 +0100 -+++ b/src/terralib/kernel/TeOverlayUtils.h 2016-09-14 14:21:51.649920405 +0200 -@@ -37,0 +38,2 @@ -+#include "TeGeometry.h"
-+
-@@ -44 +45,0 @@ --#include "TeGeometry.h"
diff --git a/var/spack/repos/builtin/packages/manta/for_aarch64.patch b/var/spack/repos/builtin/packages/manta/for_aarch64.patch deleted file mode 100644 index 86364108e6..0000000000 --- a/var/spack/repos/builtin/packages/manta/for_aarch64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- spack-src/src/cmake/boost.cmake.bak 2019-06-29 07:04:47.000000000 +0900 -+++ spack-src/src/cmake/boost.cmake 2021-03-30 11:36:39.000000000 +0900 -@@ -168,6 +168,8 @@ - message (FATAL_ERROR "Failed to unpack boost library ${THIS_BOOST_VERSION}") - endif () - execute_process( -+ COMMAND "sed" -i "s/-m64//g" ${BOOST_BUILD_DIR}/boost_1_58_0/tools/build/src/tools/gcc.jam) -+ execute_process( - COMMAND ${CMAKE_COMMAND} -E touch "${BOOST_BUILD_DIR}/boost_unpack_complete") - endif () - diff --git a/var/spack/repos/builtin/packages/manta/package.py b/var/spack/repos/builtin/packages/manta/package.py deleted file mode 100644 index 522a9b1f0e..0000000000 --- a/var/spack/repos/builtin/packages/manta/package.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Manta(CMakePackage): - """Structural variant and indel caller for mapped sequencing data""" - - homepage = "https://github.com/Illumina/manta" - url = "https://github.com/Illumina/manta/releases/download/v1.3.2/manta-1.3.2.release_src.tar.bz2" - - version("1.6.0", sha256="c846d61b02483265c09d58bd85dacf5326a94f38179b5ae4f70694be96e1368f") - version("1.5.0", sha256="9aa1a59c9cb8d2dd33724a42959c9398aff7840c5bf3c895d2483a8093b3d2dc") - version("1.4.0", sha256="4f8f827485e3ad9a12318bfcbf62fa622263378767514eb938bc02ad5ad74f10") - version("1.3.2", sha256="eb346d1a44aff1180732dcd03864b89efc1245652e1993107fb60da4ad739f79") - version("1.3.1", sha256="9ba943623088e552a4b45bccea48125a0553905f4cc7ea86a9de567e155a5888") - version("1.3.0", sha256="3db4b5475c33e3aeeb5435969c74364af9d2d77dd3bcf8dc70bf44a851e450dd") - - depends_on("cmake@2.8.12:", type="build") - 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/mbedtls/package.py b/var/spack/repos/builtin/packages/mbedtls/package.py index da5ed25658..e11ba68c2e 100644 --- a/var/spack/repos/builtin/packages/mbedtls/package.py +++ b/var/spack/repos/builtin/packages/mbedtls/package.py @@ -93,7 +93,6 @@ class Mbedtls(MakefilePackage): depends_on("perl", type="test") depends_on("python@3:", type="test", when="@3:") - depends_on("python@:2", type="test", when="@:2") # See https://github.com/Mbed-TLS/mbedtls/issues/4917 # Only 2.16.12, 2.28.0 and 3.1.0 support clang 12. diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 171cc77eaa..a32e2d190d 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -23,16 +23,8 @@ class Mercurial(PythonPackage): version("5.1.1", sha256="35fc8ba5e0379c1b3affa2757e83fb0509e8ac314cbd9f1fd133cf265d16e49f") version("4.9.1", sha256="1bdd21bb87d1e05fb5cd395d488d0e0cc2f2f90ce0fd248e31a03595da5ccb47") version("4.4.1", sha256="8f2a5512d6cc2ffb08988aef639330a2f0378e4ac3ee0e1fbbdb64d9fff56246") - version("4.1.2", sha256="09415253fb409a77e19b9951532a3c22c4e07e74bab80652527064617daab194") - version("3.9.1", sha256="625e4fc7e85ec2278c2828bdc547fce74091b3bbe4d9eeeba2d61af51195df74") - version("3.9", sha256="834f25dcff44994198fb8a7ba161a6e24204dbd63c8e6270577e06e6cedbdabc") - version("3.8.4", sha256="4b2e3ef19d34fa1d781cb7425506a05d4b6b1172bab69d6ea78874175fdf3da6") - version("3.8.3", sha256="f84556cdf9a331984261549d9d08143ab9da33d7c03f0aa323b0ee52d0782a4c") - 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", 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("python+bz2+ssl+zlib@2.7:2.8,3.5.3:3.5,3.6.2:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-docutils", type="build") depends_on("py-pygments", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/mlperf-deepcam/package.py b/var/spack/repos/builtin/packages/mlperf-deepcam/package.py index 1998a35549..48a766e76e 100644 --- a/var/spack/repos/builtin/packages/mlperf-deepcam/package.py +++ b/var/spack/repos/builtin/packages/mlperf-deepcam/package.py @@ -28,7 +28,6 @@ class MlperfDeepcam(Package, CudaPackage): depends_on("py-pillow", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) depends_on("py-pillow", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) depends_on("py-pandas", type=("build", "run")) depends_on("py-apex", type=("build", "run")) depends_on("py-wandb", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/mofem-cephas/package.py b/var/spack/repos/builtin/packages/mofem-cephas/package.py deleted file mode 100644 index e540000956..0000000000 --- a/var/spack/repos/builtin/packages/mofem-cephas/package.py +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * -from spack.pkg.builtin.boost import Boost - - -class MofemCephas(CMakePackage): - """MoFEM is finite element core library""" - - homepage = "http://mofem.eng.gla.ac.uk" - git = "https://bitbucket.org/likask/mofem-cephas.git" - - maintainers = ["likask"] - - version("develop", branch="develop") - version("0.8.17", tag="v0.8.17") - version("0.8.16", tag="v0.8.16") - version("0.8.15", tag="v0.8.15") - version("0.8.14", tag="v0.8.14") - version("0.8.13", tag="v0.8.13") - version("0.8.12", tag="v0.8.12") - version("0.8.11", tag="v0.8.11") - version("0.8.10", tag="v0.8.10") - version("0.8.9", tag="v0.8.9") - version("0.8.8", tag="v0.8.8") - version("0.8.7", tag="v0.8.7") - - # This option can be only used for development of core lib - variant( - "copy_user_modules", - default=True, - description="Copy user modules directory " "instead of linking to source", - ) - variant("adol-c", default=True, description="Compile with ADOL-C") - variant("tetgen", default=True, description="Compile with Tetgen") - variant("med", default=True, description="Compile with Med") - variant("slepc", default=False, description="Compile with Slepc") - - depends_on("mpi") - depends_on("boost@:1.68") - - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) - depends_on("parmetis") - # Fixed version of hdf5, to remove some problems with dependent - # packages, f.e. MED format - depends_on("hdf5@:1.8.19+hl+mpi+fortran") - depends_on("petsc@:3.9.3+mumps+mpi") - depends_on("slepc", when="+slepc") - depends_on("moab") - # Upper bound set to ADOL-C until issues with memory leaks - # for versions 2.6: fully resolved - depends_on("adol-c@2.5.2~examples", when="+adol-c") - depends_on("tetgen", when="+tetgen") - depends_on("med", when="+med") - - extendable = True - - root_cmakelists_dir = "mofem" - - def cmake_args(self): - spec = self.spec - options = [] - - # obligatory options - options.extend( - [ - "-DWITH_SPACK=YES", - "-DPETSC_DIR=%s" % spec["petsc"].prefix, - "-DPETSC_ARCH=", - "-DMOAB_DIR=%s" % spec["moab"].prefix, - "-DBOOST_DIR=%s" % spec["boost"].prefix, - ] - ) - - # build tests - options.append(self.define("MOFEM_BUILD_TESTS", self.run_tests)) - - # variant packages - if "+adol-c" in spec: - options.append("-DADOL-C_DIR=%s" % spec["adol-c"].prefix) - - if "+tetgen" in spec: - options.append("-DTETGEN_DIR=%s" % spec["tetgen"].prefix) - - if "+med" in spec: - options.append("-DMED_DIR=%s" % spec["med"].prefix) - - if "+slepc" in spec: - options.append("-DSLEPC_DIR=%s" % spec["slepc"].prefix) - - # copy users modules, i.e. stand alone vs linked users modules - options.append(self.define_from_variant("STAND_ALLONE_USERS_MODULES", "copy_user_modules")) - return options diff --git a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py b/var/spack/repos/builtin/packages/mofem-fracture-module/package.py deleted file mode 100644 index cdf29d8759..0000000000 --- a/var/spack/repos/builtin/packages/mofem-fracture-module/package.py +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class MofemFractureModule(CMakePackage): - """mofem fracture module""" - - homepage = "http://mofem.eng.gla.ac.uk" - git = "https://bitbucket.org/likask/mofem_um_fracture_mechanics.git" - - maintainers = ["likask"] - - version("develop", branch="develop") - version("0.9.50", tag="v0.9.50") - version("0.9.49", tag="v0.9.49") - version("0.9.48", tag="v0.9.48") - version("0.9.47", tag="v0.9.47") - version("0.9.46", tag="v0.9.46") - version("0.9.45", tag="v0.9.45") - version("0.9.44", tag="v0.9.44") - version("0.9.42", tag="v0.9.42") - - variant( - "copy_user_modules", - default=True, - description="Copy user modules directory instead linking", - ) - - extends("mofem-cephas") - depends_on("mofem-users-modules@0.8.17", when="@0.9.50") - depends_on("mofem-users-modules@0.8.16", when="@0.9.49") - depends_on("mofem-users-modules@0.8.15", when="@0.9.48") - depends_on("mofem-users-modules", type=("build", "link", "run")) - - # The CMakeLists.txt installed with mofem-cephas package set cmake - # environment to install extension from extension repository. It searches - # for modules in user provides paths, for example in Spack source path.Also - # it finds all cmake exported targets installed in lib directory, which are - # built with dependent extensions, f.e.mofem - users - modules or others if - # needed. - @property - def root_cmakelists_dir(self): - """The relative path to the directory containing CMakeLists.txt - - This path is relative to the root of the extracted tarball, - not to the ``build_directory``. Defaults to the current directory. - - :return: directory containing CMakeLists.txt - """ - spec = self.spec - return spec["mofem-users-modules"].prefix.users_modules - - def cmake_args(self): - spec = self.spec - - # obligatory options - options = [ - self.define("WITH_SPACK", True), - self.define("EXTERNAL_MODULES_BUILD", True), - self.define("UM_INSTALL_BREFIX", spec["mofem-users-modules"].prefix), - self.define("EXTERNAL_MODULE_SOURCE_DIRS", self.stage.source_path), - self.define_from_variant("STAND_ALLONE_USERS_MODULES", "copy_user_modules"), - ] - - # Set module version - if self.spec.version == Version("develop"): - options.extend( - [ - "-DFM_VERSION_MAJOR=%s" % 0, - "-DFM_VERSION_MINOR=%s" % 0, - "-DFM_VERSION_BUILD=%s" % 0, - ] - ) - else: - options.extend( - [ - "-DFM_VERSION_MAJOR=%s" % self.spec.version[0], - "-DFM_VERSION_MINOR=%s" % self.spec.version[1], - "-DFM_VERSION_BUILD=%s" % self.spec.version[2], - ] - ) - - # build tests - options.append(self.define("MOFEM_UM_BUILD_TESTS", self.run_tests)) - - return options - - # This function is not needed to run code installed by extension, nor in - # the install process. However, for users like to have access to source - # code to play, change and make it. Having source code at hand one can - # compile in own build directory it in package view when the extension is - # activated. - @run_after("install") - def copy_source_code(self): - source = self.stage.source_path - prefix = self.prefix - install_tree(source, prefix.ext_users_modules.fracture_mechanics) diff --git a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py b/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py deleted file mode 100644 index 4d89d2e8fd..0000000000 --- a/var/spack/repos/builtin/packages/mofem-minimal-surface-equation/package.py +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class MofemMinimalSurfaceEquation(CMakePackage): - """mofem minimal surface equation""" - - homepage = "http://mofem.eng.gla.ac.uk" - git = "https://bitbucket.org/likask/mofem_um_minimal_surface_equation.git" - - maintainers = ["likask"] - - version("develop", branch="develop") - version("0.3.10", tag="v0.3.10") - version("0.3.9", tag="v0.3.9") - - variant( - "copy_user_modules", - default=True, - description="Copy user modules directory instead linking", - ) - - extends("mofem-cephas") - depends_on("mofem-users-modules", type=("build", "link", "run")) - - # The CMakeLists.txt installed with mofem - cephas package set cmake - # environment to install extension from extension repository.It searches - # for modules in user provides paths, for example in Spack source path.Also - # it finds all cmake exported targets installed in lib directory, which are - # built with dependent extensions, f.e.mofem - users - modules or others if - # needed. - @property - def root_cmakelists_dir(self): - """The relative path to the directory containing CMakeLists.txt - - This path is relative to the root of the extracted tarball, - not to the ``build_directory``. Defaults to the current directory. - - :return: directory containing CMakeLists.txt - """ - spec = self.spec - return spec["mofem-users-modules"].prefix.users_modules - - def cmake_args(self): - spec = self.spec - from_variant = self.define_from_variant - source = self.stage.source_path - - options = [] - - # obligatory options - options.extend( - [ - "-DWITH_SPACK=YES", - "-DEXTERNAL_MODULES_BUILD=YES", - "-DUM_INSTALL_BREFIX=%s" % spec["mofem-users-modules"].prefix, - "-DEXTERNAL_MODULE_SOURCE_DIRS=%s" % source, - from_variant("STAND_ALLONE_USERS_MODULES", "copy_user_modules"), - ] - ) - - # build tests - options.append(self.define("MOFEM_UM_BUILD_TESTS", self.run_tests)) - - return options - - # This function is not needed to run code installed by extension, nor in - # the install process. However, for users like to have access to source - # code to play, change and make it. Having source code at hand one can - # compile in own build directory it in package view when the extension is - # activated. - @run_after("install") - def copy_source_code(self): - source = self.stage.source_path - prefix = self.prefix - install_tree(source, prefix.ext_users_modules.minimal_surface_equation) diff --git a/var/spack/repos/builtin/packages/mofem-users-modules/package.py b/var/spack/repos/builtin/packages/mofem-users-modules/package.py deleted file mode 100644 index 5246733547..0000000000 --- a/var/spack/repos/builtin/packages/mofem-users-modules/package.py +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class MofemUsersModules(CMakePackage): - """MofemUsersModules creates installation environment for user-provided - modules and extends of mofem-cephas package. For more information how to - work with Spack and MoFEM see - http://mofem.eng.gla.ac.uk/mofem/html/install_spack.html""" - - homepage = "http://mofem.eng.gla.ac.uk" - git = "https://likask@bitbucket.org/mofem/users-modules-cephas.git" - - version("develop", branch="develop") - version("0.8.17", commit="60b2341f1635f595d571096dd8c70a7cf7538aeb") - version("0.8.16", commit="f6af51ad7db5b5dbc9d9acc6e753277a857c9f24") - version("0.8.15", commit="4843b2d92ec21ad100a8d637698f56b3a2e14af3") - version("0.8.14", commit="cfaa32133c574a31beaeb36202d033280521ddff") - version("0.8.12", commit="7b2ce5595a95d1b919f50103513c44bb2bc9e6d2") - version("0.8.11", commit="329b06d758137f1ec830f157d383b5ea415963de") - version("0.8.10", commit="ca03a8222b20f9c8ff93a2d6f4c3babbcfde2058") - version("0.8.8", commit="eb40f3c218badcd528ab08ee952835fb2ff07fd3") - version("0.8.7", commit="a83b236f26f258f4d6bafc379ddcb9503088df56") - - maintainers = ["likask"] - - variant( - "copy_user_modules", - default=True, - description="Copy user modules directory instead linking", - ) - - extends("mofem-cephas") - depends_on("mofem-cephas@0.8.17", when="@0.8.17") - depends_on("mofem-cephas@0.8.16", when="@0.8.16") - depends_on("mofem-cephas@0.8.15", when="@0.8.15") - depends_on("mofem-cephas@0.8.14", when="@0.8.14") - depends_on("mofem-cephas@0.8.12:0.8.13", when="@0.8.12") - depends_on("mofem-cephas@0.8.11", when="@0.8.11") - depends_on("mofem-cephas@0.8.10", when="@0.8.10") - depends_on("mofem-cephas@0.8.8:0.8.9", when="@0.8.8") - depends_on("mofem-cephas@0.8.7", when="@0.8.7") - depends_on("mofem-cephas@develop", when="@develop") - - def cmake_args(self): - spec = self.spec - from_variant = self.define_from_variant - - options = [] - - # obligatory options - options.extend( - [ - "-DMOFEM_DIR=%s" % spec["mofem-cephas"].prefix.users_module, - "-DWITH_SPACK=YES", - from_variant("STAND_ALLONE_USERS_MODULES", "copy_user_modules"), - ] - ) - - # build tests - options.append(self.define("MOFEM_UM_BUILD_TESTS", self.run_tests)) - - return options - - # This function is not needed to run code installed by extension, nor in - # the install process. However, the source code of users modules is - # necessary to compile other sub-modules. Also, for users like to have - # access to source code to play, change and make it. Having source code at - # hand one can compile in own build directory it in package view when the - # extension is activated. - @run_after("install") - def copy_source_code(self): - source = self.stage.source_path - prefix = self.prefix - install_tree(source, prefix.users_modules) diff --git a/var/spack/repos/builtin/packages/mozjs/Bug-638056-Avoid-The-cacheFlush-support-is-missing-o.patch b/var/spack/repos/builtin/packages/mozjs/Bug-638056-Avoid-The-cacheFlush-support-is-missing-o.patch deleted file mode 100644 index bbd62276e1..0000000000 --- a/var/spack/repos/builtin/packages/mozjs/Bug-638056-Avoid-The-cacheFlush-support-is-missing-o.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Mike Hommey <mh@glandium.org> -Date: Fri, 18 Mar 2011 09:25:57 +0100 -Subject: Bug 638056 - Avoid "The cacheFlush support is missing on this - platform" error on exotic platforms - ---- - js/src/Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -382,7 +382,7 @@ CPPSRCS += checks.cc \ - # END enclude sources for V8 dtoa - ############################################# - --ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU))) -+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU))) - - VPATH += $(srcdir)/assembler \ - $(srcdir)/assembler/wtf \ diff --git a/var/spack/repos/builtin/packages/mozjs/fix-811665.patch b/var/spack/repos/builtin/packages/mozjs/fix-811665.patch deleted file mode 100644 index a3e06d8bb4..0000000000 --- a/var/spack/repos/builtin/packages/mozjs/fix-811665.patch +++ /dev/null @@ -1,153 +0,0 @@ -Description: Fix FTBFS with gcc6 - Most fixes are returning NULL instead of false and a narrowing issues. -Author: Tobias Frost <tobi@debian.org> -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811665 -Last-Update: 2016-09-25 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/js/src/ctypes/CTypes.cpp -+++ b/js/src/ctypes/CTypes.cpp -@@ -4753,7 +4753,7 @@ NewFunctionInfo(JSContext* cx, - for (JSUint32 i = 0; i < argLength; ++i) { - bool isEllipsis; - if (!IsEllipsis(cx, argTypes[i], &isEllipsis)) -- return false; -+ return NULL; - if (isEllipsis) { - fninfo->mIsVariadic = true; - if (i < 1) { ---- a/js/src/jsapi.cpp -+++ b/js/src/jsapi.cpp -@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob - AutoIdVector props(cx); - JSIdArray *ida; - if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida)) -- return false; -+ return NULL; - for (size_t n = 0; n < size_t(ida->length); ++n) - JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]); - return ida; ---- a/js/src/jsfun.cpp -+++ b/js/src/jsfun.cpp -@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje - - JSString *str = JS_DecompileFunction(cx, fun, indent); - if (!str) -- return false; -+ return NULL; - - if (!indent) - cx->compartment->toSourceCache.put(fun, str); -@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon - const Shape *shape = funobj->nativeLookup(id); - if (!shape) { - if (!ResolveInterpretedFunctionPrototype(cx, funobj)) -- return false; -+ return NULL; - shape = funobj->nativeLookup(id); - } - JS_ASSERT(!shape->configurable()); ---- a/js/src/jsiter.cpp -+++ b/js/src/jsiter.cpp -@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f - */ - JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0); - if (!obj) -- return false; -+ return NULL; - obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false); - obj->setMap(cx->compartment->emptyEnumeratorShape); - return obj; ---- a/js/src/jsparse.cpp -+++ b/js/src/jsparse.cpp -@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun - if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) { - JS_ASSERT(pn->pn_cookie.isFree()); - if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom)) -- return false; -+ return NULL; - } - - pn->pn_blockid = outertc->blockid(); ---- a/js/src/jsstr.cpp -+++ b/js/src/jsstr.cpp -@@ -1734,7 +1734,7 @@ class RegExpGuard - if (flat) { - patstr = flattenPattern(cx, fm.patstr); - if (!patstr) -- return false; -+ return NULL; - } else { - patstr = fm.patstr; - } -@@ -3408,7 +3408,7 @@ js_InitStringClass(JSContext *cx, JSObje - UndefinedValue(), NULL, NULL, - JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0, - NULL)) { -- return JS_FALSE; -+ return NULL; - } - - return proto; ---- a/js/src/jstypedarray.cpp -+++ b/js/src/jstypedarray.cpp -@@ -1334,7 +1334,7 @@ class TypedArrayTemplate - if (size != 0 && count >= INT32_MAX / size) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, - JSMSG_NEED_DIET, "size and count"); -- return false; -+ return NULL; - } - - int32 bytelen = size * count; -@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint - - default: - JS_NOT_REACHED("shouldn't have gotten here"); -- return false; -+ return NULL; - } - } - ---- a/js/src/jsxml.cpp -+++ b/js/src/jsxml.cpp -@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS - - obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass); - if (!obj) -- return JS_FALSE; -+ return NULL; - JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal())); - JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal())); - JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared())); -@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb - size_t length = str->length(); - jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar)); - if (!chars) -- return JS_FALSE; -+ return NULL; - *chars = '@'; - const jschar *strChars = str->getChars(cx); - if (!strChars) { ---- a/js/src/methodjit/InvokeHelpers.cpp -+++ b/js/src/methodjit/InvokeHelpers.cpp -@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx) - { - JSStackFrame *fp = cx->fp(); - if (fp->hasImacropc()) -- return false; -+ return NULL; - - JSScript *script = fp->script(); - return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc); ---- a/js/src/nanojit/NativeX64.cpp -+++ b/js/src/nanojit/NativeX64.cpp -@@ -1899,7 +1899,7 @@ namespace nanojit - } - } - -- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0}; -+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {(int64_t) 0x8000000000000000ULL,0}; - - void Assembler::asm_fneg(LIns *ins) { - Register rr, ra; diff --git a/var/spack/repos/builtin/packages/mozjs/package.py b/var/spack/repos/builtin/packages/mozjs/package.py deleted file mode 100644 index 60565272fa..0000000000 --- a/var/spack/repos/builtin/packages/mozjs/package.py +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Mozjs(AutotoolsPackage): - """SpiderMonkey is Mozilla's JavaScript engine written in C/C++. - It is used in various Mozilla products, including Firefox, and is - available under the MPL2.""" - - homepage = "https://firefox-source-docs.mozilla.org/js/index.html" - - version( - "24.2.0", - sha256="e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8", - url="https://ftp.mozilla.org/pub/js/mozjs-24.2.0.tar.bz2", - ) - version( - "17.0.0", - sha256="321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba", - url="https://ftp.mozilla.org/pub/js/mozjs17.0.0.tar.gz", - ) - version( - "1.8.5", - sha256="5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687", - url="https://ftp.mozilla.org/pub/js/js185-1.0.0.tar.gz", - ) - - depends_on("perl@5.6:", type="build") - depends_on("pkgconfig", type="build") - depends_on("python@2.7.3:2.8", type="build") - depends_on("zip", type="build") - depends_on("unzip", type="build") - depends_on("nspr", when="@:27") - depends_on("libffi@3.0.9:") - depends_on("readline", when="@17.0.0:") - depends_on("zlib@1.2.3") - - configure_directory = "js/src" - build_directory = "js/src/spack-build" - - patch("perl-bug.patch") - # Note: According to https://github.com/apache/couchdb-pkg/tree/master/js/rpm/SOURCES - # There is some patch for mozjs@1.8.5 to fix compile issue. - # Patches required to fix the issue:https://bugzilla.mozilla.org/show_bug.cgi?id=638056 - patch( - "Bug-638056-Avoid-The-cacheFlush-support-is-missing-o.patch", - sha256="b1c869a65f5ebc10741d4631cc2e1e166c6ed53035cfa56bede55a4c19b7b118", - when="@1.8.5", - ) - patch( - "fix-811665.patch", - sha256="2b298b8a693865b38e2b0d33277bb5ffe152c6ecf43648e85113fec586aa4752", - when="@1.8.5", - ) - - def configure_args(self): - spec = self.spec - config_args = [ - "--enable-readline", # enables readline support in JS shell - "--enable-threadsafe", # enables support for multiple threads - "--enable-system-ffi", - "--with-system-zlib={0}".format(spec["zlib"].prefix), - "--with-system-nspr", - "--with-nspr-prefix={0}".format(spec["nspr"].prefix), - ] - if spec.target.family == "aarch64": - config_args.append("--host=aarch64-linux-gnu") - if spec.satisfies("@1.8.5"): - config_args.append("--disable-readline") - return config_args diff --git a/var/spack/repos/builtin/packages/mozjs/perl-bug.patch b/var/spack/repos/builtin/packages/mozjs/perl-bug.patch deleted file mode 100644 index a05384c7f4..0000000000 --- a/var/spack/repos/builtin/packages/mozjs/perl-bug.patch +++ /dev/null @@ -1,21 +0,0 @@ -Perl has deprecated the feature: - - defined(@array) - -In Perl 5.22+, this deprecation warning has been converted -to a fatal error. This results in the following error message: - - Can't use 'defined(@array)' (Maybe you should just omit the defined()?) at milestone.pl line 58. - -This patch takes the suggestion of omitting defined(). ---- a/js/src/config/milestone.pl 2017-02-14 15:00:42.234275243 -0600 -+++ b/js/src/config/milestone.pl 2017-02-14 15:01:19.453313360 -0600 -@@ -55,7 +55,7 @@ - # - my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); - --if (defined(@TEMPLATE_FILE)) { -+if (@TEMPLATE_FILE) { - my $TFILE; - - foreach $TFILE (@TEMPLATE_FILE) { diff --git a/var/spack/repos/builtin/packages/mpip/package.py b/var/spack/repos/builtin/packages/mpip/package.py index 70001bd8a6..974639d677 100644 --- a/var/spack/repos/builtin/packages/mpip/package.py +++ b/var/spack/repos/builtin/packages/mpip/package.py @@ -17,7 +17,6 @@ class Mpip(AutotoolsPackage): version("master", branch="master") version("3.5", sha256="e366843d53fa016fb03903e51c8aac901aa5155edabe64698a8d6fa618a03bbd") - version("3.4.1", sha256="66a86dafde61546be80a130c46e4295f47fb764cf312ae62c70a6dc456a59dac") variant("demangling", default=True, description="Build with demangling support") @@ -56,14 +55,12 @@ class Mpip(AutotoolsPackage): conflicts("platform=darwin") # make-wrappers.py wrapper generator script requires python - depends_on("python@2:", when="@3.5:", type="build") - depends_on("python@:2", when="@3.4.1", type="build") + depends_on("python@2:", type="build") depends_on("mpi") # '+setjmp' adds '--disable-libunwind' to the confiure args - depends_on("unwind", when="@3.5: +libunwind ~setjmp") + depends_on("unwind", when="+libunwind ~setjmp") - @when("@3.5:") def configure_args(self): spec = self.spec @@ -122,21 +119,3 @@ class Mpip(AutotoolsPackage): targets.append("shared") return targets - - @when("@3.4.1") - def configure_args(self): - config_args = ["--without-f77"] - config_args.append("--with-cc=%s" % self.spec["mpi"].mpicc) - config_args.append("--with-cxx=%s" % self.spec["mpi"].mpicxx) - - if "+demangling" in self.spec: - config_args.append("--enable-demangling") - else: - config_args.append("--disable-demangling") - - if "+setjmp" in self.spec: - config_args.append("--enable-setjmp") - else: - config_args.append("--disable-setjmp") - - return config_args diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index 009cebdebc..ebd0c8f713 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -110,7 +110,6 @@ class Mxnet(CMakePackage, CudaPackage): depends_on("python@3.6:", when="@2.0.0:+python", type=("build", "run")) depends_on("py-pip", when="+python", type="build") depends_on("py-wheel", when="+python", type="build") - 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")) diff --git a/var/spack/repos/builtin/packages/node-js/package.py b/var/spack/repos/builtin/packages/node-js/package.py index f76e826d53..8364c32f59 100644 --- a/var/spack/repos/builtin/packages/node-js/package.py +++ b/var/spack/repos/builtin/packages/node-js/package.py @@ -38,13 +38,6 @@ class NodeJs(Package): version("12.18.3", sha256="6ea85f80e01b007cc9b566b8836513bc5102667d833bad4c1092be60fa60c2d4") version("12.16.0", sha256="ae2dfe74485d821d4fef7cf1802acd2322cd994c853a2327c4306952f4453441") version("12.14.0", sha256="5c1939867228f3845c808ef84a89c8ee93cc35f857bf7587ecee1b5a6d9da67b") - version("11.1.0", sha256="3f53b5ac25b2d36ad538267083c0e603d9236867a936c22a9116d95fa10c60d5") - version("10.13.0", sha256="aa06825fff375ece7c0d881ae0de5d402a857e8cabff9b4a50f2f0b7b44906be") - version("8.11.4", sha256="459144e361d64ca7362c37cc9717c044ef909d348cb5aa3f2b62538560a6085a") - version("8.9.1", sha256="32491b7fcc4696b2cdead45c47e52ad16bbed8f78885d32e873952fee0f971e1") - version("7.1.0", sha256="595e7e2a37d1e0573044a90077bb12c0f750e5d8851899ffa74038238da9a983") - version("6.3.0", sha256="4ed7a99985f8afee337cc22d5fef61b495ab4238dfff3750ac9019e87fc6aae6") - version("6.2.2", sha256="b6baee57a0ede496c7c7765001f7495ad74c8dfe8c34f1a6fb2cd5d8d526ffce") variant("debug", default=False, description="Include debugger support") variant("doc", default=False, description="Compile with documentation") @@ -66,12 +59,10 @@ class NodeJs(Package): depends_on("gmake@3.81:", type="build") depends_on("libtool", type="build", when=sys.platform != "darwin") depends_on("pkgconfig", type="build") - depends_on("python@2.7:2.8,3.5:", when="@12:", type="build") - depends_on("python@2.7:2.8", when="@:11", type="build") + depends_on("python@2.7:2.8,3.5:", type="build") # depends_on('bash-completion', when="+bash-completion") depends_on("icu4c", when="+icu4c") - depends_on("openssl@1.0.2d:1.0", when="@:9+openssl") - depends_on("openssl@1.1:", when="@10:+openssl") + depends_on("openssl@1.1:", when="+openssl") depends_on("zlib", when="+zlib") phases = ["configure", "build", "install"] @@ -79,7 +70,7 @@ class NodeJs(Package): # https://github.com/spack/spack/issues/19310 conflicts( "%gcc@:4.8", - msg="fails to build with gcc 4.8 " "(see https://github.com/spack/spack/issues/19310", + msg="fails to build with gcc 4.8 (see https://github.com/spack/spack/issues/19310", ) def setup_build_environment(self, env): @@ -135,10 +126,7 @@ class NodeJs(Package): return args def configure(self, spec, prefix): - if self.version >= Version("10.11.0"): - python("configure.py", *self.configure_args()) - else: - python("configure", *self.configure_args()) + python("configure.py", *self.configure_args()) def build(self, spec, prefix): make() diff --git a/var/spack/repos/builtin/packages/nrm/package.py b/var/spack/repos/builtin/packages/nrm/package.py index fcbabcbaba..a7068d4087 100644 --- a/var/spack/repos/builtin/packages/nrm/package.py +++ b/var/spack/repos/builtin/packages/nrm/package.py @@ -20,7 +20,6 @@ class Nrm(PythonPackage): depends_on("py-pyyaml", type=("build", "run")) depends_on("py-tornado@5.1.1", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) - depends_on("py-argparse@1.2.1:", type=("build", "run"), when="^python@:2.6,3.0:3.1") depends_on("py-jsonschema@2.6.0", type=("build", "run")) depends_on("py-warlock", type=("build", "run")) depends_on("py-scipy", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/nwchem/package.py b/var/spack/repos/builtin/packages/nwchem/package.py index 98ea3fb341..2de1793436 100644 --- a/var/spack/repos/builtin/packages/nwchem/package.py +++ b/var/spack/repos/builtin/packages/nwchem/package.py @@ -27,11 +27,6 @@ class Nwchem(Package): sha256="e3c6510627345be596f4079047e5e7b59e6c20599798ecfe122e3527f8ad6eb0", url="https://github.com/nwchemgit/nwchem/releases/download/v7.0.0-release/nwchem-7.0.0-release.revision-2c9a1c7c-srconly.2020-02-26.tar.bz2", ) - version( - "6.8.1", - sha256="fd20f9ca1b410270a815e77e052ec23552f828526cd252709f798f589b2a6431", - url="https://github.com/nwchemgit/nwchem/releases/download/6.8.1-release/nwchem-6.8.1-release.revision-v6.8-133-ge032219-srconly.2018-06-14.tar.bz2", - ) variant("openmp", default=False, description="Enables OpenMP support") variant("mpipr", default=False, description="Enables ARMCI with progress rank") @@ -47,11 +42,7 @@ class Nwchem(Package): depends_on("mpi") depends_on("scalapack") depends_on("fftw-api") - depends_on("python@3:", when="@7:", type=("build", "link", "run")) - depends_on("python@2.7:2.8", when="@:6", type=("build", "link", "run")) - conflicts( - "%gcc@10:", when="@:6", msg="NWChem versions prior to 7.0.0 do not build with GCC 10" - ) + depends_on("python@3:", type=("build", "link", "run")) def install(self, spec, prefix): scalapack = spec["scalapack"].libs @@ -83,14 +74,6 @@ class Nwchem(Package): "USE_NOFSCHECK=TRUE", # FSCHECK, caused problems like code crashes ] ) - if spec.version < Version("7.0.0"): - args.extend( - [ - "PYTHONVERSION=%s" % spec["python"].version.up_to(2), - "PYTHONHOME=%s" % spec["python"].home, - "USE_PYTHONCONFIG=Y", - ] - ) # TODO: query if blas/lapack/scalapack uses 64bit Ints # A flag to distinguish between 32bit and 64bit integers in linear diff --git a/var/spack/repos/builtin/packages/oclint/package.py b/var/spack/repos/builtin/packages/oclint/package.py index 074f04fecd..8b38521380 100644 --- a/var/spack/repos/builtin/packages/oclint/package.py +++ b/var/spack/repos/builtin/packages/oclint/package.py @@ -19,7 +19,6 @@ class Oclint(Package): version("0.13", sha256="a0fd188673863e6357d6585b9bb9c3affe737df134b9383a1a5ed021d09ed848") depends_on("python", type=("build")) - depends_on("py-argparse", type=("build"), when="^python@:2.6,3.0:3.1") depends_on("git", type=("build")) depends_on("subversion", type=("build")) depends_on("cmake", type=("build")) diff --git a/var/spack/repos/builtin/packages/ont-albacore/package.py b/var/spack/repos/builtin/packages/ont-albacore/package.py deleted file mode 100644 index 299e66c072..0000000000 --- a/var/spack/repos/builtin/packages/ont-albacore/package.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class OntAlbacore(PythonPackage): - """Albacore is a software project that provides an entry point to the Oxford - Nanopore basecalling algorithms. It can be run from the command line on - Windows and multiple Linux platforms. A selection of configuration files - allow basecalling DNA libraries made with our current range of sequencing - kits and Flow Cells.""" - - homepage = "https://nanoporetech.com" - url = "https://mirror.oxfordnanoportal.com/software/analysis/ont_albacore-2.3.1-cp35-cp35m-manylinux1_x86_64.whl" - - version( - "2.3.1", - sha256="dc1af11b0f38b26d071e5389c2b4595c496319c987401754e1853de42467a7d1", - expand=False, - ) - - 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")) - depends_on("py-h5py", type=("build", "run")) - depends_on("py-ont-fast5-api", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py index b86858e869..5653858de6 100644 --- a/var/spack/repos/builtin/packages/opencv/package.py +++ b/var/spack/repos/builtin/packages/opencv/package.py @@ -221,7 +221,6 @@ class Opencv(CMakePackage, CudaPackage): "objc_bindings_generator", "objdetect", "photo", - "python2", "python3", "python_bindings_generator", "python_tests", @@ -277,7 +276,7 @@ class Opencv(CMakePackage, CudaPackage): with when("+java"): conflicts("~imgproc") conflicts("~java_bindings_generator") - conflicts("~python2~python3") + conflicts("~python3") with when("+java_bindings_generator"): depends_on("java") @@ -298,16 +297,7 @@ class Opencv(CMakePackage, CudaPackage): with when("+photo"): conflicts("~imgproc") - with when("+python2"): - conflicts("+python3") - conflicts("~python_bindings_generator") - depends_on("python@2.7:2.8", type=("build", "link", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-numpy", type=("build", "run")) - extends("python", when="+python2") - with when("+python3"): - conflicts("+python2") conflicts("~python_bindings_generator") depends_on("python@3.2:", type=("build", "link", "run")) depends_on("py-setuptools", type="build") @@ -557,7 +547,7 @@ class Opencv(CMakePackage, CudaPackage): conflicts("~imgproc") with when("+matlab"): - conflicts("~python2~python3") + conflicts("~python3") depends_on("matlab") depends_on("py-jinja2") @@ -1085,16 +1075,7 @@ class Opencv(CMakePackage, CudaPackage): python_lib = spec["python"].libs[0] python_include_dir = spec["python"].headers.directories[0] - if "+python2" in spec: - args.extend( - [ - self.define("PYTHON2_EXECUTABLE", python_exe), - self.define("PYTHON2_LIBRARY", python_lib), - self.define("PYTHON2_INCLUDE_DIR", python_include_dir), - self.define("PYTHON3_EXECUTABLE", ""), - ] - ) - elif "+python3" in spec: + if "+python3" in spec: args.extend( [ self.define("PYTHON3_EXECUTABLE", python_exe), diff --git a/var/spack/repos/builtin/packages/openpbs/package.py b/var/spack/repos/builtin/packages/openpbs/package.py index bb3e559876..ab268fc5d2 100644 --- a/var/spack/repos/builtin/packages/openpbs/package.py +++ b/var/spack/repos/builtin/packages/openpbs/package.py @@ -18,7 +18,6 @@ class Openpbs(AutotoolsPackage): url = "https://github.com/openpbs/openpbs/archive/v19.1.3.tar.gz" version("20.0.1", sha256="685a4abcea92bf518df02b544d25e237ae8cef76f86525f7bf3554812e9f50fa") - version("19.1.3", sha256="6e9d2614f839ff3d91d0ace3de04752b7c075da60c72fe6def76437aa05c9857") depends_on("autoconf", type="build") depends_on("automake", type="build") @@ -31,8 +30,7 @@ class Openpbs(AutotoolsPackage): depends_on("ssmtp", type=("build", "run")) depends_on("xauth", type=("build", "run")) - depends_on("python@3.5:3.9", type=("build", "link", "run"), when="@20:") - depends_on("python@2.6:2.7", type=("build", "link", "run"), when="@:19") + depends_on("python@3.5:3.9", type=("build", "link", "run")) depends_on("libx11") depends_on("libice") diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/arm.patch b/var/spack/repos/builtin/packages/openspeedshop-utils/arm.patch deleted file mode 100644 index c0099cfd35..0000000000 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/arm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/plugins/views/iot/iot_view.cxx b/plugins/views/iot/iot_view.cxx -index f4cdf48..ef1b81f 100644 ---- a/plugins/views/iot/iot_view.cxx -+++ b/plugins/views/iot/iot_view.cxx -@@ -45,6 +45,20 @@ - # endif - #endif - /* End part 2 of 2 for Hack to get around inconsistent syscall definitions */ -+/* Start Added Hack to get around inconsistent syscall definitions */ -+#ifndef SYS_open -+#define SYS_open SYS_openat -+#endif -+#ifndef SYS_creat -+#define SYS_creat SYS_openat -+#endif -+#ifndef SYS_dup2 -+#define SYS_dup2 SYS_dup3 -+#endif -+#ifndef SYS_pipe -+#define SYS_pipe SYS_pipe2 -+#endif -+/* end Added Hack to get around inconsistent syscall definitions */ - - - diff --git a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py b/var/spack/repos/builtin/packages/openspeedshop-utils/package.py deleted file mode 100644 index 63e8015437..0000000000 --- a/var/spack/repos/builtin/packages/openspeedshop-utils/package.py +++ /dev/null @@ -1,320 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import os - -import spack.store -from spack.package import * -from spack.pkg.builtin.boost import Boost - - -class OpenspeedshopUtils(CMakePackage): - """OpenSpeedShop is a community effort led by Trenza, Inc. - It builds on top of a broad list of community infrastructures, - most notably Dyninst and MRNet from UW, libmonitor from Rice, - and PAPI from UTK. OpenSpeedShop is an open source multi platform - Linux performance tool which is targeted to support performance - analysis of applications running on both single node and large - scale IA64, IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue - Gene and Cray platforms. OpenSpeedShop development is hosted by - Trenza Inc.. The infrastructure and base components of OpenSpeedShop - are released as open source code primarily under LGPL. - openspeedshop-utils is a package that does not have the - qt3 gui. It was created to avoid a conflict between - openspeedshop and cbtf-argonavis-gui based on the fact - that spack will not allow a qt3 and qt4/qt5 dependency in a - packages dependency tree. - """ - - homepage = "http://www.openspeedshop.org" - git = "https://github.com/OpenSpeedShop/openspeedshop.git" - - version("develop", branch="master") - version("2.4.2.1", branch="2.4.2.1") - version("2.4.2", branch="2.4.2") - version("2.4.1", branch="2.4.1") - - variant( - "runtime", default=False, description="build only the runtime libraries and collectors." - ) - variant( - "crayfe", - default=False, - description="build only the FE tool using the runtime_dir \ - to point to target build.", - ) - variant("cuda", default=False, description="build with cuda packages included.") - - variant( - "build_type", - default="RelWithDebInfo", - description="The build type to build", - values=("Debug", "Release", "RelWithDebInfo"), - ) - - # MPI variants - variant( - "openmpi", - default=False, - description="Build mpi collector for openmpi \ - MPI when variant is enabled.", - ) - variant( - "mpt", - default=False, - description="Build mpi collector for SGI \ - MPT MPI when variant is enabled.", - ) - variant( - "mvapich2", - default=False, - description="Build mpi collector for mvapich2\ - MPI when variant is enabled.", - ) - variant( - "mpich2", - default=False, - description="Build mpi collector for mpich2\ - MPI when variant is enabled.", - ) - - depends_on("cmake@3.0.2:", type="build") - - # Dependencies for openspeedshop that are common to all - # the variants of the OpenSpeedShop build - depends_on("libtool", type="build") - depends_on("bison", type="build") - depends_on("flex@2.6.1", type="build") - - # For binutils - depends_on("binutils+plugins~gold@2.32", type="build") - - depends_on("elfutils", type="link") - depends_on("libdwarf") - - depends_on("sqlite") - - # For boost - depends_on("boost@1.66.0:1.69.0") - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) - - depends_on("dyninst@master", when="@develop") - depends_on("dyninst@10:", when="@2.4.0:9999") - - depends_on("python@2.7.14:2.7", type=("build", "run")) - - depends_on("libxml2") - - # Dependencies for the openspeedshop cbtf packages. - depends_on("cbtf@develop", when="@develop", type=("build", "link", "run")) - depends_on("cbtf@1.9.3:9999", when="@2.4.0:9999", type=("build", "link", "run")) - - depends_on("cbtf-krell@develop", when="@develop", type=("build", "link", "run")) - depends_on("cbtf-krell@1.9.3:9999", when="@2.4.0:9999", type=("build", "link", "run")) - - depends_on("cbtf-krell@develop+crayfe", when="@develop+crayfe", type=("build", "link", "run")) - depends_on( - "cbtf-krell@1.9.3:9999+crayfe", when="@2.4.0:9999+crayfe", type=("build", "link", "run") - ) - - depends_on("cbtf-krell@develop+mpich2", when="@develop+mpich2", type=("build", "link", "run")) - depends_on( - "cbtf-krell@1.9.3:9999+mpich2", when="@2.4.0:9999+mpich2", type=("build", "link", "run") - ) - - depends_on("cbtf-krell@develop+mpt", when="@develop+mpt", type=("build", "link", "run")) - depends_on("cbtf-krell@1.9.3:9999+mpt", when="@2.4.0:9999+mpt", type=("build", "link", "run")) - - depends_on( - "cbtf-krell@develop+mvapich2", when="@develop+mvapich2", type=("build", "link", "run") - ) - depends_on( - "cbtf-krell@1.9.3:9999+mvapich2", - when="@2.4.0:9999+mvapich2", - type=("build", "link", "run"), - ) - - depends_on( - "cbtf-krell@develop+openmpi", when="@develop+openmpi", type=("build", "link", "run") - ) - depends_on( - "cbtf-krell@1.9.3:9999+openmpi", when="@2.4.0:9999+openmpi", type=("build", "link", "run") - ) - - depends_on("cbtf-argonavis@develop", when="@develop+cuda", type=("build", "link", "run")) - depends_on("cbtf-argonavis@1.9.3:9999", when="@2.4.0:9999+cuda", type=("build", "link", "run")) - - # For MRNet - depends_on("mrnet@5.0.1-3:+lwthreads", when="@develop", type=("build", "link", "run")) - depends_on("mrnet@5.0.1-3:+lwthreads", when="@2.4.0:9999", type=("build", "link", "run")) - - patch("arm.patch", when="target=aarch64:") - parallel = False - - build_directory = "build_openspeedshop" - - def set_cray_login_node_cmake_options(self, spec, cmake_options): - # Appends to cmake_options the options that will enable the appropriate - # Cray login node libraries - - cray_login_node_options = [] - rt_platform = "cray" - - # How do we get the compute node (CNL) cbtf package install - # directory path? - # spec['cbtf'].prefix is the login node value for this build, as - # we only get here when building the login node components and - # that is all that is known to spack. - be_ck = spack.store.db.query_one("cbtf-krell arch=cray-CNL-haswell") - - # Equivalent to install-tool cmake arg: - # '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' - # % <base dir>/cbtf_v2.4.0elease/compute) - cray_login_node_options.append("-DCBTF_KRELL_CN_RUNTIME_DIR=%s" % be_ck.prefix) - cray_login_node_options.append("-DRUNTIME_PLATFORM=%s" % rt_platform) - - cmake_options.extend(cray_login_node_options) - - def cmake_args(self): - # Appends base options to cmake_args - spec = self.spec - - compile_flags = "-O2 -g -Wall" - - cmake_args = [] - - # Indicate building cbtf vers (transfer rawdata files) - instrumentor_setting = "cbtf" - - if spec.satisfies("+runtime"): - self.set_defaultbase_cmake_options(spec, cmake_args) - - cmake_args.extend( - [ - "-DCMAKE_CXX_FLAGS=%s" % compile_flags, - "-DCMAKE_C_FLAGS=%s" % compile_flags, - "-DINSTRUMENTOR=%s" % instrumentor_setting, - "-DCBTF_DIR=%s" % spec["cbtf"].prefix, - "-DCBTF_KRELL_DIR=%s" % spec["cbtf-krell"].prefix, - "-DMRNET_DIR=%s" % spec["mrnet"].prefix, - ] - ) - - else: - - # Appends base options to cmake_args - self.set_defaultbase_cmake_options(spec, cmake_args) - cmake_args.extend( - [ - "-DCMAKE_CXX_FLAGS=%s" % compile_flags, - "-DCMAKE_C_FLAGS=%s" % compile_flags, - "-DINSTRUMENTOR=%s" % instrumentor_setting, - "-DSQLITE3_DIR=%s" % spec["sqlite"].prefix, - "-DCBTF_DIR=%s" % spec["cbtf"].prefix, - "-DCBTF_KRELL_DIR=%s" % spec["cbtf-krell"].prefix, - "-DMRNET_DIR=%s" % spec["mrnet"].prefix, - ] - ) - - if spec.satisfies("+crayfe"): - # We need to build target/compute node - # components/libraries first then pass - # those libraries to the openspeedshop - # login node build - self.set_cray_login_node_cmake_options(spec, cmake_args) - - cmake_args.extend(["-DBUILD_QT3_GUI=FALSE"]) - - return cmake_args - - def set_defaultbase_cmake_options(self, spec, cmake_options): - # Appends to cmake_options the options that will enable - # the appropriate base level options to the openspeedshop - # cmake build. - python_exe = spec["python"].command.path - python_library = spec["python"].libs[0] - python_include = spec["python"].headers.directories[0] - - base_options = [] - - base_options.append("-DBINUTILS_DIR=%s" % spec["binutils"].prefix) - base_options.append("-DLIBELF_DIR=%s" % spec["elfutils"].prefix) - base_options.append("-DLIBDWARF_DIR=%s" % spec["libdwarf"].prefix) - base_options.append("-DPYTHON_EXECUTABLE=%s" % python_exe) - base_options.append("-DPYTHON_INCLUDE_DIR=%s" % python_include) - base_options.append("-DPYTHON_LIBRARY=%s" % python_library) - base_options.append("-DBoost_NO_SYSTEM_PATHS=TRUE") - base_options.append("-DBoost_NO_BOOST_CMAKE=TRUE") - base_options.append("-DBOOST_ROOT=%s" % spec["boost"].prefix) - base_options.append("-DBoost_DIR=%s" % spec["boost"].prefix) - base_options.append("-DBOOST_LIBRARYDIR=%s" % spec["boost"].prefix.lib) - base_options.append("-DDYNINST_DIR=%s" % spec["dyninst"].prefix) - - cmake_options.extend(base_options) - - def set_mpi_cmake_options(self, spec, cmake_options): - # Appends to cmake_options the options that will enable - # the appropriate MPI implementations - - mpi_options = [] - - # openmpi - if spec.satisfies("+openmpi"): - mpi_options.append("-DOPENMPI_DIR=%s" % spec["openmpi"].prefix) - # mpich - if spec.satisfies("+mpich"): - mpi_options.append("-DMPICH_DIR=%s" % spec["mpich"].prefix) - # mpich2 - if spec.satisfies("+mpich2"): - mpi_options.append("-DMPICH2_DIR=%s" % spec["mpich2"].prefix) - # mvapich - if spec.satisfies("+mvapich"): - mpi_options.append("-DMVAPICH_DIR=%s" % spec["mvapich"].prefix) - # mvapich2 - if spec.satisfies("+mvapich2"): - mpi_options.append("-DMVAPICH2_DIR=%s" % spec["mvapich2"].prefix) - # mpt - if spec.satisfies("+mpt"): - mpi_options.append("-DMPT_DIR=%s" % spec["mpt"].prefix) - - cmake_options.extend(mpi_options) - - def setup_run_environment(self, env): - """Set up the compile and runtime environments for a package.""" - - # Find Dyninst library path, this is needed to - # set the DYNINSTAPI_RT_LIB library which is - # required for OpenSpeedShop to find loop level - # performance information - dyninst_libdir = find_libraries( - "libdyninstAPI_RT", root=self.spec["dyninst"].prefix, shared=True, recursive=True - ) - - # Set Dyninst RT library path to support OSS loop resolution code - env.set("DYNINSTAPI_RT_LIB", dyninst_libdir[0]) - - # Find openspeedshop library path - oss_libdir = find_libraries( - "libopenss-framework", - root=self.spec["openspeedshop-utils"].prefix, - shared=True, - recursive=True, - ) - env.prepend_path("LD_LIBRARY_PATH", os.path.dirname(oss_libdir.joined())) - - env.set("OPENSS_RAWDATA_DIR", ".") - - cbtf_mc = "/sbin/cbtf_mrnet_commnode" - cbtf_lmb = "/sbin/cbtf_libcbtf_mrnet_backend" - env.set("XPLAT_RSH", "ssh") - env.set("MRNET_COMM_PATH", join_path(self.spec["cbtf-krell"].prefix + cbtf_mc)) - env.set("CBTF_MRNET_BACKEND_PATH", join_path(self.spec["cbtf-krell"].prefix + cbtf_lmb)) - env.prepend_path("PATH", self.spec["mrnet"].prefix.bin) - env.prepend_path("PATH", self.spec["cbtf-krell"].prefix.bin) - env.prepend_path("PATH", self.spec["cbtf-krell"].prefix.sbin) - env.prepend_path("PATH", self.spec["python"].prefix.bin) diff --git a/var/spack/repos/builtin/packages/openspeedshop/arm.patch b/var/spack/repos/builtin/packages/openspeedshop/arm.patch deleted file mode 100644 index c0099cfd35..0000000000 --- a/var/spack/repos/builtin/packages/openspeedshop/arm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/plugins/views/iot/iot_view.cxx b/plugins/views/iot/iot_view.cxx -index f4cdf48..ef1b81f 100644 ---- a/plugins/views/iot/iot_view.cxx -+++ b/plugins/views/iot/iot_view.cxx -@@ -45,6 +45,20 @@ - # endif - #endif - /* End part 2 of 2 for Hack to get around inconsistent syscall definitions */ -+/* Start Added Hack to get around inconsistent syscall definitions */ -+#ifndef SYS_open -+#define SYS_open SYS_openat -+#endif -+#ifndef SYS_creat -+#define SYS_creat SYS_openat -+#endif -+#ifndef SYS_dup2 -+#define SYS_dup2 SYS_dup3 -+#endif -+#ifndef SYS_pipe -+#define SYS_pipe SYS_pipe2 -+#endif -+/* end Added Hack to get around inconsistent syscall definitions */ - - - diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py deleted file mode 100644 index 641dd515c9..0000000000 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ /dev/null @@ -1,362 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import os - -import spack.store -from spack.package import * -from spack.pkg.builtin.boost import Boost - - -class Openspeedshop(CMakePackage): - """OpenSpeedShop is a community effort led by Trenza, Inc. - It builds on top of a broad list of community infrastructures, - most notably Dyninst and MRNet from UW, libmonitor from Rice, - and PAPI from UTK. OpenSpeedShop is an open source multi platform - Linux performance tool which is targeted to support performance - analysis of applications running on both single node and large - scale IA64, IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue - Gene and Cray platforms. OpenSpeedShop development is hosted by - Trenza Inc.. The infrastructure and base components of OpenSpeedShop - are released as open source code primarily under LGPL. - """ - - homepage = "http://www.openspeedshop.org" - git = "https://github.com/OpenSpeedShop/openspeedshop.git" - - version("develop", branch="master") - version("2.4.2.1", branch="2.4.2.1") - version("2.4.2", branch="2.4.2") - version("2.4.1", branch="2.4.1") - - variant( - "runtime", default=False, description="build only the runtime libraries and collectors." - ) - variant( - "crayfe", - default=False, - description="build only the FE tool using the runtime_dir \ - to point to target build.", - ) - variant("cuda", default=False, description="build with cuda packages included.") - - variant( - "gui", - default="none", - values=("none", "qt3", "qt4"), - description="Build or not build a GUI of choice", - ) - - variant( - "build_type", - default="RelWithDebInfo", - description="The build type to build", - values=("Debug", "Release", "RelWithDebInfo"), - ) - - # MPI variants - variant( - "openmpi", - default=False, - description="Build mpi collector for openmpi \ - MPI when variant is enabled.", - ) - variant( - "mpt", - default=False, - description="Build mpi collector for SGI \ - MPT MPI when variant is enabled.", - ) - variant( - "mvapich2", - default=False, - description="Build mpi collector for mvapich2\ - MPI when variant is enabled.", - ) - variant( - "mpich2", - default=False, - description="Build mpi collector for mpich2\ - MPI when variant is enabled.", - ) - - depends_on("cmake@3.0.2:", type="build") - - # Dependencies for openspeedshop that are common to all - # the variants of the OpenSpeedShop build - depends_on("libtool", type="build") - depends_on("bison", type="build") - depends_on("flex@2.6.1", type="build") - - # For binutils - depends_on("binutils+plugins~gold@2.32") - - depends_on("elfutils", type="link") - depends_on("libdwarf") - - depends_on("sqlite") - - # For boost - depends_on("boost@1.70.0:") - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) - - depends_on("dyninst@master", when="@develop") - depends_on("dyninst@10:", when="@2.4.0:9999") - - depends_on("python@2.7.14:2.7", type=("build", "run")) - - depends_on("libxml2") - - depends_on("qt@3:3.9", when="gui=qt3") - - # Dependencies for the openspeedshop cbtf packages. - depends_on("cbtf@develop", when="@develop", type=("build", "link", "run")) - depends_on("cbtf@1.9.3:9999", when="@2.4.0:9999", type=("build", "link", "run")) - - depends_on("cbtf-krell@develop", when="@develop", type=("build", "link", "run")) - depends_on("cbtf-krell@1.9.3:9999", when="@2.4.0:9999", type=("build", "link", "run")) - - depends_on("cbtf-krell@develop+crayfe", when="@develop+crayfe", type=("build", "link", "run")) - depends_on( - "cbtf-krell@1.9.3:9999+crayfe", when="@2.4.0:9999+crayfe", type=("build", "link", "run") - ) - - depends_on("cbtf-krell@develop+mpich2", when="@develop+mpich2", type=("build", "link", "run")) - depends_on( - "cbtf-krell@1.9.3:9999+mpich2", when="@2.4.0:9999+mpich2", type=("build", "link", "run") - ) - - depends_on("cbtf-krell@develop+mpt", when="@develop+mpt", type=("build", "link", "run")) - depends_on("cbtf-krell@1.9.3:9999+mpt", when="@2.4.0:9999+mpt", type=("build", "link", "run")) - - depends_on( - "cbtf-krell@develop+mvapich2", when="@develop+mvapich2", type=("build", "link", "run") - ) - depends_on( - "cbtf-krell@1.9.3:9999+mvapich2", - when="@2.4.0:9999+mvapich2", - type=("build", "link", "run"), - ) - - depends_on( - "cbtf-krell@develop+openmpi", when="@develop+openmpi", type=("build", "link", "run") - ) - depends_on( - "cbtf-krell@1.9.3:9999+openmpi", when="@2.4.0:9999+openmpi", type=("build", "link", "run") - ) - - depends_on("cbtf-argonavis@develop", when="@develop+cuda", type=("build", "link", "run")) - depends_on("cbtf-argonavis@1.9.3:9999", when="@2.4.0:9999+cuda", type=("build", "link", "run")) - - # For MRNet - depends_on("mrnet@5.0.1-3:+lwthreads", when="@develop", type=("build", "link", "run")) - depends_on("mrnet@5.0.1-3:+lwthreads", when="@2.4.0:9999", type=("build", "link", "run")) - - patch("arm.patch", when="target=aarch64:") - parallel = False - - build_directory = "build_openspeedshop" - - def set_cray_login_node_cmake_options(self, spec, cmake_options): - # Appends to cmake_options the options that will enable the appropriate - # Cray login node libraries - - cray_login_node_options = [] - rt_platform = "cray" - - # How do we get the compute node (CNL) cbtf package install - # directory path? - # spec['cbtf'].prefix is the login node value for this build, as - # we only get here when building the login node components and - # that is all that is known to spack. - store = spack.store - be_ck = store.db.query_one("cbtf-krell arch=cray-CNL-haswell") - - # Equivalent to install-tool cmake arg: - # '-DCBTF_KRELL_CN_RUNTIME_DIR=%s' - # % <base dir>/cbtf_v2.4.0.release/compute) - cray_login_node_options.append("-DCBTF_KRELL_CN_RUNTIME_DIR=%s" % be_ck.prefix) - cray_login_node_options.append("-DRUNTIME_PLATFORM=%s" % rt_platform) - - cmake_options.extend(cray_login_node_options) - - def cmake_args(self): - - spec = self.spec - - compile_flags = "-O2 -g -Wall" - - cmake_args = [] - - # Indicate building cbtf vers (transfer rawdata files) - instrumentor_setting = "cbtf" - - if spec.satisfies("+runtime"): - # Appends base options to cmake_args - self.set_defaultbase_cmake_options(spec, cmake_args) - cmake_args.extend( - [ - "-DCMAKE_CXX_FLAGS=%s" % compile_flags, - "-DCMAKE_C_FLAGS=%s" % compile_flags, - "-DINSTRUMENTOR=%s" % instrumentor_setting, - "-DCBTF_DIR=%s" % spec["cbtf"].prefix, - "-DCBTF_KRELL_DIR=%s" % spec["cbtf-krell"].prefix, - "-DMRNET_DIR=%s" % spec["mrnet"].prefix, - ] - ) - - if spec.satisfies("+cuda"): - cmake_args.extend(["-DCBTF_ARGONAVIS_DIR=%s" % spec["cbtf-argonavis"].prefix]) - - else: - - # Appends base options to cmake_args - self.set_defaultbase_cmake_options(spec, cmake_args) - guitype = self.spec.variants["gui"].value - cmake_args.extend( - [ - "-DCMAKE_CXX_FLAGS=%s" % compile_flags, - "-DCMAKE_C_FLAGS=%s" % compile_flags, - "-DINSTRUMENTOR=%s" % instrumentor_setting, - "-DSQLITE3_DIR=%s" % spec["sqlite"].prefix, - "-DCBTF_DIR=%s" % spec["cbtf"].prefix, - "-DCBTF_KRELL_DIR=%s" % spec["cbtf-krell"].prefix, - "-DMRNET_DIR=%s" % spec["mrnet"].prefix, - ] - ) - - if guitype == "none": - cmake_args.extend(["-DBUILD_QT3_GUI=FALSE"]) - elif guitype == "qt4": - cmake_args.extend(["-DBUILD_QT3_GUI=FALSE"]) - elif guitype == "qt3": - cmake_args.extend(["-DQTLIB_DIR=%s" % spec["qt"].prefix]) - - if spec.satisfies("+cuda"): - cmake_args.extend(["-DCBTF_ARGONAVIS_DIR=%s" % spec["cbtf-argonavis"].prefix]) - - if spec.satisfies("+crayfe"): - # We need to build target/compute node - # components/libraries first then pass - # those libraries to the openspeedshop - # login node build - self.set_cray_login_node_cmake_options(spec, cmake_args) - - return cmake_args - - def set_defaultbase_cmake_options(self, spec, cmake_options): - # Appends to cmake_options the options that will enable - # the appropriate base level options to the openspeedshop - # cmake build. - python_exe = spec["python"].command.path - python_library = spec["python"].libs[0] - python_include = spec["python"].headers.directories[0] - true_value = "TRUE" - - base_options = [] - - base_options.append("-DBINUTILS_DIR=%s" % spec["binutils"].prefix) - base_options.append("-DLIBELF_DIR=%s" % spec["elfutils"].prefix) - base_options.append("-DLIBDWARF_DIR=%s" % spec["libdwarf"].prefix) - base_options.append("-DPYTHON_EXECUTABLE=%s" % python_exe) - base_options.append("-DPYTHON_INCLUDE_DIR=%s" % python_include) - base_options.append("-DPYTHON_LIBRARY=%s" % python_library) - base_options.append("-DBoost_NO_SYSTEM_PATHS=%s" % true_value) - base_options.append("-DBoost_NO_BOOST_CMAKE=%s" % true_value) - base_options.append("-DBOOST_ROOT=%s" % spec["boost"].prefix) - base_options.append("-DBoost_DIR=%s" % spec["boost"].prefix) - base_options.append("-DBOOST_LIBRARYDIR=%s" % spec["boost"].prefix.lib) - base_options.append("-DDYNINST_DIR=%s" % spec["dyninst"].prefix) - - cmake_options.extend(base_options) - - def set_mpi_cmake_options(self, spec, cmake_options): - # Appends to cmake_options the options that will enable - # the appropriate MPI implementations - - mpi_options = [] - - # openmpi - if spec.satisfies("+openmpi"): - mpi_options.append("-DOPENMPI_DIR=%s" % spec["openmpi"].prefix) - # mpich - if spec.satisfies("+mpich"): - mpi_options.append("-DMPICH_DIR=%s" % spec["mpich"].prefix) - # mpich2 - if spec.satisfies("+mpich2"): - mpi_options.append("-DMPICH2_DIR=%s" % spec["mpich2"].prefix) - # mvapich - if spec.satisfies("+mvapich"): - mpi_options.append("-DMVAPICH_DIR=%s" % spec["mvapich"].prefix) - # mvapich2 - if spec.satisfies("+mvapich2"): - mpi_options.append("-DMVAPICH2_DIR=%s" % spec["mvapich2"].prefix) - # mpt - if spec.satisfies("+mpt"): - mpi_options.append("-DMPT_DIR=%s" % spec["mpt"].prefix) - - cmake_options.extend(mpi_options) - - def setup_run_environment(self, env): - """Set up the compile and runtime environments for a package.""" - - # Find Dyninst library path, this is needed to - # set the DYNINSTAPI_RT_LIB library which is - # required for OpenSpeedShop to find loop level - # performance information - dyninst_libdir = find_libraries( - "libdyninstAPI_RT", root=self.spec["dyninst"].prefix, shared=True, recursive=True - ) - - # Set Dyninst RT library path to support OSS loop resolution code - env.set("DYNINSTAPI_RT_LIB", dyninst_libdir[0]) - - env.set("OPENSS_RAWDATA_DIR", ".") - - # Set the openspeedshop plugin path - if os.path.isdir(self.prefix.lib64): - lib_dir = self.prefix.lib64 - else: - lib_dir = self.prefix.lib - - plugin_path = "/openspeedshop" - oss_plugin_path = lib_dir + plugin_path - env.set("OPENSS_PLUGIN_PATH", oss_plugin_path) - - cbtf_mc = "/sbin/cbtf_mrnet_commnode" - cbtf_lmb = "/sbin/cbtf_libcbtf_mrnet_backend" - env.set("XPLAT_RSH", "ssh") - env.set("MRNET_COMM_PATH", join_path(self.spec["cbtf-krell"].prefix + cbtf_mc)) - - # Set CBTF_MPI_IMPLEMENTATON to the appropriate mpi implementation - # This is needed by O|SS and CBTF tools to deploy the correct - # mpi runtimes for ossmpi, ossmpit, ossmpip, and cbtfsummary - # Users may have to set the CBTF_MPI_IMPLEMENTATION variable - # manually if multiple mpi's are specified in the build - if self.spec.satisfies("+mpich"): - env.set("CBTF_MPI_IMPLEMENTATION", "mpich") - - if self.spec.satisfies("+mvapich"): - env.set("CBTF_MPI_IMPLEMENTATION", "mvapich") - - if self.spec.satisfies("+mvapich2"): - env.set("CBTF_MPI_IMPLEMENTATION", "mvapich2") - - if self.spec.satisfies("+mpt"): - env.set("CBTF_MPI_IMPLEMENTATION", "mpt") - - if self.spec.satisfies("+openmpi"): - env.set("CBTF_MPI_IMPLEMENTATION", "openmpi") - - env.set("CBTF_MRNET_BACKEND_PATH", join_path(self.spec["cbtf-krell"].prefix + cbtf_lmb)) - env.prepend_path("PATH", self.spec["mrnet"].prefix.bin) - env.prepend_path("PATH", self.spec["cbtf-krell"].prefix.bin) - env.prepend_path("PATH", self.spec["cbtf-krell"].prefix.sbin) - mpath = "/share/man" - env.prepend_path("MANPATH", self.spec["cbtf-krell"].prefix + mpath) - env.prepend_path("PATH", self.spec["python"].prefix.bin) diff --git a/var/spack/repos/builtin/packages/opensubdiv/package.py b/var/spack/repos/builtin/packages/opensubdiv/package.py index 18f1c4f056..83897fb5f2 100644 --- a/var/spack/repos/builtin/packages/opensubdiv/package.py +++ b/var/spack/repos/builtin/packages/opensubdiv/package.py @@ -28,13 +28,8 @@ class Opensubdiv(CMakePackage, CudaPackage): variant("tbb", default=False, description="Builds with Intel TBB support") variant("openmp", default=False, description="Builds with OpenMP support") - variant("doc", default=False, description="Builds documentation. Requires Python 2") depends_on("cmake@2.8.6:", type="build") - 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", type="build", when="+doc") depends_on("gl") depends_on("glew@1.9.0:") depends_on("glfw@3.0.0:") @@ -78,11 +73,6 @@ class Opensubdiv(CMakePackage, CudaPackage): else: args.append("-DNO_TBB=1") - if "+doc" in spec: - args.append("-DNO_DOC=0") - else: - args.append("-DNO_DOC=1") - if "+openmp" in spec: args.append("-DNO_OMP=0") else: diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index 41103d4dfb..dfcd08959f 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -57,8 +57,7 @@ class Paraview(CMakePackage, CudaPackage): default=True, description="Install include files for Catalyst or plugins support", ) - variant("python", default=False, description="Enable Python support") - variant("python3", default=False, description="Enable Python3 support") + variant("python", default=False, description="Enable Python support", when="@5.6:") variant("fortran", default=False, description="Enable Fortran support") variant("mpi", default=True, description="Enable MPI support") variant("osmesa", default=False, description="Enable OSMesa support") @@ -105,10 +104,6 @@ class Paraview(CMakePackage, CudaPackage): conflicts("~hdf5", when="+visitbridge") conflicts("+adios2", when="@:5.10 ~mpi") - conflicts("+python", when="+python3") - # Python 2 support dropped with 5.9.0 - conflicts("+python", when="@5.9:") - conflicts("+python3", when="@:5.5") conflicts("~shared", when="+cuda") conflicts("+cuda", when="@5.8:5.10") # Legacy rendering dropped in 5.5 @@ -144,34 +139,19 @@ class Paraview(CMakePackage, CudaPackage): depends_on("ninja", type="build") - # Workaround for - # adding the following to your packages.yaml - # packages: - # python: - # version: [3, 2] - # without this you'll get: - # paraview requires python version 3:, but spec asked for 2.7.16 - # for `spack spec paraview+python+osmesa` - # see spack pull request #11539 extends("python", when="+python") - extends("python", when="+python3") - - depends_on("python@2.7:2.8", when="+python", type=("build", "run")) # VTK < 8.2.1 can't handle Python 3.8 # This affects Paraview <= 5.7 (VTK 8.2.0) # https://gitlab.kitware.com/vtk/vtk/-/issues/17670 - depends_on("python@3:3.7", when="@:5.7 +python3", type=("build", "run")) - depends_on("python@3:", when="@5.8:+python3", type=("build", "run")) + depends_on("python@3:3.7", when="@:5.7 +python", type=("build", "run")) + depends_on("python@3:", when="@5.8:+python", type=("build", "run")) - depends_on("py-numpy@:1.15.4", when="+python", type=("build", "run")) - depends_on("py-numpy", when="+python3", type=("build", "run")) + depends_on("py-numpy", when="+python", type=("build", "run")) depends_on("py-mpi4py", when="+python+mpi", type=("build", "run")) - depends_on("py-mpi4py", when="+python3+mpi", type=("build", "run")) - depends_on("py-matplotlib@:2", when="+python", type="run") - depends_on("py-matplotlib", when="+python3", type="run") - depends_on("py-pandas@0.21:", when="+python3", type="run") + depends_on("py-matplotlib", when="+python", type="run") + depends_on("py-pandas@0.21:", when="+python", type="run") depends_on("mpi", when="+mpi") depends_on("qt+opengl", when="@5.3.0:+qt+opengl2") @@ -223,11 +203,6 @@ class Paraview(CMakePackage, CudaPackage): 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", when="+python") - # Can't contretize with python2 and py-pillow@7.0.0: - depends_on("pil@:6", when="+python") - # ParaView depends on cli11 due to changes in MR # https://gitlab.kitware.com/paraview/paraview/-/merge_requests/4951 depends_on("cli11@1.9.1", when="@5.10:") @@ -349,7 +324,7 @@ class Paraview(CMakePackage, CudaPackage): env.prepend_path("LIBRARY_PATH", lib_dir) env.prepend_path("LD_LIBRARY_PATH", lib_dir) - if "+python" in self.spec or "+python3" in self.spec: + if "+python" in self.spec: if self.spec.version <= Version("5.4.1"): pv_pydir = join_path(lib_dir, "site-packages") env.prepend_path("PYTHONPATH", pv_pydir) @@ -475,10 +450,10 @@ class Paraview(CMakePackage, CudaPackage): # CMake flags for python have changed with newer ParaView versions # Make sure Spack uses the right cmake flags - if "+python" in spec or "+python3" in spec: + if "+python" in spec: py_use_opt = "USE" if spec.satisfies("@5.8:") else "ENABLE" py_ver_opt = "PARAVIEW" if spec.satisfies("@5.7:") else "VTK" - py_ver_val = 3 if "+python3" in spec else 2 + py_ver_val = 3 cmake_args.extend( [ "-DPARAVIEW_%s_PYTHON:BOOL=ON" % py_use_opt, @@ -590,7 +565,7 @@ class Paraview(CMakePackage, CudaPackage): cmake_args.append("-DPARAVIEW_ENABLE_MOTIONFX:BOOL=OFF") # Encourage Paraview to use the correct Python libs - if spec.satisfies("+python") or spec.satisfies("+python3"): + if spec.satisfies("+python"): pylibdirs = spec["python"].libs.directories cmake_args.append("-DCMAKE_INSTALL_RPATH={0}".format(":".join(self.rpath + pylibdirs))) @@ -599,7 +574,7 @@ class Paraview(CMakePackage, CudaPackage): if "+catalyst" in spec: cmake_args.append("-DVTK_MODULE_ENABLE_ParaView_Catalyst=YES") - if "+python3" in spec: + if "+python" in spec: cmake_args.append("-DVTK_MODULE_ENABLE_ParaView_PythonCatalyst=YES") if "+libcatalyst" in spec: diff --git a/var/spack/repos/builtin/packages/partitionfinder/package.py b/var/spack/repos/builtin/packages/partitionfinder/package.py deleted file mode 100644 index 15e8e6ede2..0000000000 --- a/var/spack/repos/builtin/packages/partitionfinder/package.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Partitionfinder(Package): - """PartitionFinder is free open source software to select best-fit - partitioning schemes and models of molecular evolution for - phylogenetic analyses.""" - - homepage = "https://github.com/brettc/partitionfinder" - url = "https://github.com/brettc/partitionfinder/archive/v2.1.1.tar.gz" - - version("2.1.1", sha256="ccf3718996ee6ca496909b4b97d2b075028e0543eba3bc47a8c14b689c84e061") - - 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")) - depends_on("py-pyparsing", type=("build", "run")) - depends_on("py-scipy", type=("build", "run")) - depends_on("py-scikit-learn", type=("build", "run")) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - install_tree("partfinder", prefix.partfinder) - install_tree("timings", prefix.timings) - install("PartitionFinderMorphology.py", prefix.bin) - install("PartitionFinderProtein.py", prefix.bin) - install("PartitionFinder.py", prefix.bin) diff --git a/var/spack/repos/builtin/packages/pasta/package.py b/var/spack/repos/builtin/packages/pasta/package.py index a69368c410..dbc7258c92 100644 --- a/var/spack/repos/builtin/packages/pasta/package.py +++ b/var/spack/repos/builtin/packages/pasta/package.py @@ -16,10 +16,8 @@ class Pasta(PythonPackage): maintainers = ["snehring"] version("1.9.0", commit="370ae2d21ef461bcb2cef7c20cb5a4a1db7ff99d") - version("1.8.3", commit="738bec5e0d5a18d013c193d7453374bed47456c9") - depends_on("python@3:", when="@1.9.0:", type=("build", "run")) - depends_on("python@:2", when="@:1.8.3", type=("build", "run")) + depends_on("python@3:", type=("build", "run")) depends_on("py-dendropy@4:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("java", type="run") diff --git a/var/spack/repos/builtin/packages/pbsuite/package.py b/var/spack/repos/builtin/packages/pbsuite/package.py deleted file mode 100644 index f7e3c61956..0000000000 --- a/var/spack/repos/builtin/packages/pbsuite/package.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Pbsuite(Package, SourceforgePackage): - """PBJelly is a highly automated pipeline that aligns long sequencing - reads (such as PacBio RS reads or long 454 reads in fasta format) - to high-confidence draft assembles.""" - - homepage = "https://sourceforge.net/p/pb-jelly/wiki/Home/" - sourceforge_mirror_path = "pb-jelly/PBSuite_15.8.24.tgz" - - version("15.8.24", sha256="1be082faa62cb3f701c78498db8544c844c3d6d3e3524fecf00a12e82a97e12b") - - depends_on("blasr@1.3.1:", type="run") - depends_on("python@2.7:", type="run") - depends_on("py-networkx@1.1:", type="run") - - def install(self, spec, prefix): - install_tree("pbsuite", prefix.pbsuite) - install_tree("bin", prefix.bin) - - def setup_run_environment(self, env): - env.prepend_path("PYTHONPATH", self.prefix) diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index ad67426495..a934b0b819 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -68,33 +68,6 @@ class Petsc(Package, CudaPackage, ROCmPackage): version("3.11.2", sha256="4d244dd7d1565d6534e776445fcf6977a6ee2a8bb2be4a36ac1e0fc1f9ad9cfa") version("3.11.1", sha256="cb627f99f7ce1540ebbbf338189f89a5f1ecf3ab3b5b0e357f9e46c209f1fb23") version("3.11.0", sha256="b3bed2a9263193c84138052a1b92d47299c3490dd24d1d0bf79fb884e71e678a") - version("3.10.5", sha256="3a81c8406410e0ffa8a3e9f8efcdf2e683cc40613c9bb5cb378a6498f595803e") - version("3.10.4", sha256="6c836df84caa9ae683ae401d3f94eb9471353156fec6db602bf2e857e4ec339f") - version("3.10.3", sha256="cd106babbae091604fee40c258737c84dec048949be779eaef5a745df3dc8de4") - version("3.10.2", sha256="9d3381bcf9c63abe6521b21a88efc70f8e893293503cff497971d0d9c1ec68cc") - version("3.10.1", sha256="b6e64ce062113ee0e2e2a6cfffb4d33c085ec91d5bc3afeb33781074aa5a22a5") - version("3.10.0", sha256="6ebacc010397ea47649495e8363cd7d7d86b876e6df07c6f6ccfa48b22fa555c") - version("3.9.4", sha256="ecc647c9b1ef565a2c113936454c65632eedc1626e0fc99b5a36accb91195a63") - version("3.9.3", sha256="6c7f2c7a28433385d74d647b4934aaeea3c1b3053b207973c9497639b6ebf7c8") - version("3.9.2", sha256="ab396ae5dbfff808df1b5648f5ce30f3021ec70faec3d5cd63df324d416ac6ac") - version("3.9.1", sha256="742e838a35d278693e956ed1ca4592c1d663451f6beea0694bf334aeb67681e8") - version("3.9.0", sha256="dcbcab1f321667be1c6e5f8e7b4ee8670bb09e372e51f1ea6471464519d54b2d") - version("3.8.4", sha256="9f78dc4dd4c58433fa18d3dd3a9029e39a83e4e4b64f845a029dd9fed44bc4c7") - version("3.8.3", sha256="01f9c3ed937eafac6c9e006510b61c7cd07197115ec40c429fc835f346ca3eac") - version("3.8.2", sha256="42690508d408e31fb98be738ac097bc869be14c5bfe08dda2184243283ceb16a") - version("3.8.1", sha256="9b48a9e72d304046923667d2ab1f201778cc56242928a374ff9e074843a334ff") - version("3.8.0", sha256="1e1b4d90ccbf98dc5759a956ac9a771310a6690f1cbb37b31502b29568262d7e") - version("3.7.7", sha256="40fd3bc76998e056c4097704c08f28eb89bf3b93164dc9e69abab393f43bf6f0") - version("3.7.6", sha256="3c8ee051349587d45baa7910c54ce8e0a571592e3b40f3054a7b7f986919d449") - version("3.7.5", sha256="493ab0b6c1b3fe68e71d990eff87c84f499f680e6d2c0c394e78646a82ed4be3") - version("3.7.4", sha256="54b804f924ea5be3b6718b4d4e98f8ccb9d1bd6bbbd1e9c0f18c4a90ddf5db18") - version("3.7.2", sha256="36681dd0df97e0d5cd182d902e89f527eb8f441f05271159dac5340acb4cf0ec") - version("3.6.4", sha256="eb09925a139b52b4dd5a071b3da4fe2165f1d6e8f71d410479603c9976c940f0") - version("3.6.3", sha256="776e2644e4003653c56a44a6f7c02c41427af26f7c5cd9bec3aa84ed90223245") - version("3.5.3", sha256="68e6a42f5ec75bad87f74d4df8f55ad63f0c4d996f162da6713cb3d6f566830d") - version("3.5.2", sha256="1a8f09af654afab787c732e7b2f5d0c1d856777398148351565389d38d30935e") - version("3.5.1", sha256="199af205f62dcc572728600670c7d4c8cb0d4efc4172c26f02b895d9dd1df245") - version("3.4.4", sha256="fa73b99caf70c416a967234f5476cdb1d2c014610ee0619e48f54d8d309631b7") variant("shared", default=True, description="Enables the build of shared libraries") variant("mpi", default=True, description="Activates MPI support") @@ -230,8 +203,7 @@ class Petsc(Package, CudaPackage, ROCmPackage): depends_on("rocprim", when="+rocm") # Build dependencies - 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:") + depends_on("python@2.6:2.8,3.4:", type="build") # Other dependencies depends_on("metis@5:~int64+real64", when="@:3.7+metis~int64+double") diff --git a/var/spack/repos/builtin/packages/pism/package.py b/var/spack/repos/builtin/packages/pism/package.py index edfb3ebd3e..bdb957bd0b 100644 --- a/var/spack/repos/builtin/packages/pism/package.py +++ b/var/spack/repos/builtin/packages/pism/package.py @@ -22,7 +22,7 @@ class Pism(CMakePackage): variant("extra", default=False, description="Build extra executables (testing/verification)") variant("shared", default=True, description="Build shared Pism libraries") - variant("python", default=False, description="Build python bindings") + variant("python", default=False, description="Build python bindings", when="@1.1:") variant("icebin", default=False, description="Build classes needed by IceBin") variant( "proj", @@ -80,8 +80,7 @@ class Pism(CMakePackage): depends_on("everytrace", when="+everytrace") extends("python", when="+python") - depends_on("python@2.7:2.8,3.3:", when="@1.1: +python") - depends_on("python@2.7:2.8", when="@:1.0 +python") + depends_on("python@2.7:2.8,3.3:", when="+python") depends_on("py-matplotlib", when="+python") depends_on("py-numpy", when="+python") diff --git a/var/spack/repos/builtin/packages/platypus/package.py b/var/spack/repos/builtin/packages/platypus/package.py deleted file mode 100644 index 164d85bfd3..0000000000 --- a/var/spack/repos/builtin/packages/platypus/package.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Platypus(Package): - """A Haplotype-Based Variant Caller For Next Generation Sequence Data""" - - homepage = "http://www.well.ox.ac.uk/platypus" - url = "https://www.well.ox.ac.uk/bioinformatics/Software/Platypus-latest.tgz" - - version("0.8.1", sha256="a0f39e800ebdc5590e9b568a791bc6746df0fde4d1c3622140db64dea175622b") - - depends_on("python@2.6:2", type=("build", "run")) - depends_on("py-cython", type="build") - depends_on("htslib") - - def install(self, spec, prefix): - build_platypus = Executable("./buildPlatypus.sh") - build_platypus() - install_tree(".", prefix.bin) diff --git a/var/spack/repos/builtin/packages/plplot/package.py b/var/spack/repos/builtin/packages/plplot/package.py index 4d61b0abaa..57c61995f1 100644 --- a/var/spack/repos/builtin/packages/plplot/package.py +++ b/var/spack/repos/builtin/packages/plplot/package.py @@ -21,7 +21,6 @@ class Plplot(CMakePackage): variant("java", default=False, description="Enable Java binding") variant("lua", default=False, description="Enable Lua binding") variant("pango", default=False, description="Enable Pango") - variant("python", default=False, description="Enable Python binding") variant("qt", default=False, description="Enable QT binding") variant("tcl", default=True, description="Enable TCL binding") variant("wx", default=False, description="Enable WxWidgets") @@ -33,8 +32,6 @@ class Plplot(CMakePackage): depends_on("java", when="+java") depends_on("lua", when="+lua") depends_on("pango", when="+pango") - depends_on("py-numpy", type=("build", "run"), when="+python") - depends_on("python@2.7:2.8", type=("build", "run"), when="+python") depends_on("qt", when="+qt") depends_on("tcl", when="+tcl") depends_on("wxwidgets", when="+wx") @@ -61,11 +58,6 @@ class Plplot(CMakePackage): else: args += ["-DENABLE_lua=OFF"] - if "+python" in self.spec: - args += ["-DENABLE_python=ON"] - else: - args += ["-DENABLE_python=OFF"] - if "+qt" in self.spec: args += ["-DENABLE_qt=ON"] else: diff --git a/var/spack/repos/builtin/packages/precice/package.py b/var/spack/repos/builtin/packages/precice/package.py index f07ad5d3b0..6d4fbd46d8 100644 --- a/var/spack/repos/builtin/packages/precice/package.py +++ b/var/spack/repos/builtin/packages/precice/package.py @@ -44,7 +44,7 @@ class Precice(CMakePackage): variant("mpi", default=True, description="Enable MPI support") variant("petsc", default=True, description="Enable PETSc support") - variant("python", default=False, description="Enable Python support") + variant("python", default=False, description="Enable Python support", when="@2:") variant("shared", default=True, description="Build shared libraries") depends_on("cmake@3.5:", type="build") @@ -73,13 +73,8 @@ class Precice(CMakePackage): depends_on("petsc@3.6:", when="+petsc") depends_on("petsc@3.12:", when="+petsc@2.1.0:") - # Python 3 support was added in version 2.0 - depends_on("python@2.7:2.8", when="@:1.9+python", type=("build", "run")) - depends_on("python@3:", when="@2:+python", type=("build", "run")) - - # numpy 1.17+ requires Python 3 - depends_on("py-numpy@:1.16", when="@:1.9+python", type=("build", "run")) - depends_on("py-numpy@1.17:", when="@2:+python", type=("build", "run")) + depends_on("python@3:", when="+python", type=("build", "run")) + depends_on("py-numpy@1.17:", when="+python", type=("build", "run")) # We require C++14 compiler support conflicts("%gcc@:4") 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 4eea4900ac..2760fd53ff 100644 --- a/var/spack/repos/builtin/packages/py-absl-py/package.py +++ b/var/spack/repos/builtin/packages/py-absl-py/package.py @@ -30,4 +30,3 @@ 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"), when="@0") - depends_on("py-enum34", type=("build", "run"), when="@0 ^python@:3.3") diff --git a/var/spack/repos/builtin/packages/py-aiocontextvars/package.py b/var/spack/repos/builtin/packages/py-aiocontextvars/package.py index 15229e0668..bf2d760708 100644 --- a/var/spack/repos/builtin/packages/py-aiocontextvars/package.py +++ b/var/spack/repos/builtin/packages/py-aiocontextvars/package.py @@ -17,5 +17,4 @@ class PyAiocontextvars(PythonPackage): depends_on("python@3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-contextvars@2.4", when="^python@:3.6", type=("build", "run")) depends_on("py-pytest-runner", type="build") diff --git a/var/spack/repos/builtin/packages/py-aiodns/package.py b/var/spack/repos/builtin/packages/py-aiodns/package.py index a5e9e50a84..45e8183784 100644 --- a/var/spack/repos/builtin/packages/py-aiodns/package.py +++ b/var/spack/repos/builtin/packages/py-aiodns/package.py @@ -18,5 +18,4 @@ class PyAiodns(PythonPackage): version("1.1.1", sha256="d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea") depends_on("py-setuptools", type="build") - 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-cors/package.py b/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py index fa72564860..dd1117ce0c 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp-cors/package.py @@ -19,4 +19,3 @@ class PyAiohttpCors(PythonPackage): depends_on("python@3.4.1:", type=("build", "run")) depends_on("py-setuptools@20.8.1:", type="build") depends_on("py-aiohttp@1.1:", type=("build", "run")) - depends_on("py-typing", when="^python@:3.4", 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 48329012dc..680b2222b9 100644 --- a/var/spack/repos/builtin/packages/py-aiohttp/package.py +++ b/var/spack/repos/builtin/packages/py-aiohttp/package.py @@ -33,7 +33,6 @@ class PyAiohttp(PythonPackage): depends_on("py-async-timeout@4.0:4", type=("build", "run"), when="@3.8.0:") depends_on("py-asynctest@0.13.0", type=("build", "run"), when="@3.8.0: ^python@:3.7") 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.7.4:", type=("build", "run"), when="@3.8: ^python@:3.7") depends_on("py-typing-extensions@3.6.5:", type=("build", "run"), when="@3.7") depends_on("py-typing-extensions@3.6.5:", type=("build", "run"), when="@:3.6 ^python@:3.7") diff --git a/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py b/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py index b6aadb7e66..83efac4857 100644 --- a/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py +++ b/var/spack/repos/builtin/packages/py-antlr4-python3-runtime/package.py @@ -20,4 +20,3 @@ class PyAntlr4Python3Runtime(PythonPackage): depends_on("python@3:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-typing", when="^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-anuga/package.py b/var/spack/repos/builtin/packages/py-anuga/package.py index c2cb938ff4..9dd1eb8293 100644 --- a/var/spack/repos/builtin/packages/py-anuga/package.py +++ b/var/spack/repos/builtin/packages/py-anuga/package.py @@ -17,7 +17,6 @@ class PyAnuga(PythonPackage): # The git main branch of the repo is now python3-only version("main", branch="main") - version("2.1", sha256="0e56c4a7d55570d7b2c36fa9b53ee4e7b85f62be0b4c03ad8ab5f51464321d2f") # Non-versioned dependencies for Anuga main and future versions based on python@3.5: depends_on("python@3.5:", type=("build", "run"), when="@2.2:") @@ -29,17 +28,6 @@ class PyAnuga(PythonPackage): # Replaces pyar in python3 anuga: depends_on("py-mpi4py", type=("build", "run"), when="@2.2:") - # Version-restricted dependencies for anuga@:2.1, converted to use when='@:2.1': - depends_on("python@2.6:2.7.18", type=("build", "run"), when="@:2.1") - depends_on("gdal@:3.2+geos+python", type=("build", "run"), when="@:2.1") - depends_on("py-matplotlib@:2", type=("build", "run"), when="@:2.1") - depends_on("py-numpy@:1.16", type=("build", "run"), when="@:2.1") - depends_on("py-setuptools@:44", type=("build"), when="@:2.1") - # Workaround for problem in the original concretizer selecting 3.6, wanting python3: - depends_on("py-setuptools-scm@:3.5", type=("build"), when="@:2.1") - # pypar is not updated for python3, for python3, py-mpi4py is unsed instead: - depends_on("py-pypar", type=("build", "run"), when="@:2.1") - # Unversioned dependencies of the python2 and python3-based versions depends_on("py-cython", type=("build")) depends_on("py-netcdf4", 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 9aa494ef97..4feda56ff4 100644 --- a/var/spack/repos/builtin/packages/py-anyio/package.py +++ b/var/spack/repos/builtin/packages/py-anyio/package.py @@ -22,10 +22,6 @@ class PyAnyio(PythonPackage): depends_on("py-setuptools@42:", type="build") depends_on("py-setuptools-scm+toml@3.4:", type="build") depends_on("py-wheel@0.29:", type="build") - depends_on("py-contextvars", when="@3.4: ^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", type=("build", "run")) - - depends_on("py-async-generator", when="@:3.2 ^python@:3.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-anytree/package.py b/var/spack/repos/builtin/packages/py-anytree/package.py index 8a70858460..552707258d 100644 --- a/var/spack/repos/builtin/packages/py-anytree/package.py +++ b/var/spack/repos/builtin/packages/py-anytree/package.py @@ -17,4 +17,3 @@ class PyAnytree(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-six@1.9.0:", type=("build", "run")) - depends_on("py-ordereddict", when="^python@:2.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-apache-beam/package.py b/var/spack/repos/builtin/packages/py-apache-beam/package.py index 654e8d81c1..3efd0675b4 100644 --- a/var/spack/repos/builtin/packages/py-apache-beam/package.py +++ b/var/spack/repos/builtin/packages/py-apache-beam/package.py @@ -18,14 +18,11 @@ class PyApacheBeam(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-pip@7.0.0:", type="build") depends_on("py-cython@0.28.1:", type="build") - depends_on("py-avro@1.8.1:1.9", type=("build", "run"), when="^python@:2") - depends_on("py-avro-python3@1.8.1:1.9.1,1.9.3:1.9", type=("build", "run"), when="^python@3:") + depends_on("py-avro-python3@1.8.1:1.9.1,1.9.3:1.9", type=("build", "run")) depends_on("py-crcmod@1.7:1", type=("build", "run")) depends_on("py-dill@0.3.1.1:0.3.1", type=("build", "run")) depends_on("py-fastavro@0.21.4:0.23", type=("build", "run")) - depends_on("py-funcsigs@1.0.2:1", type=("build", "run"), when="^python@:2") depends_on("py-future@0.18.2:0", type=("build", "run")) - depends_on("py-futures@3.2:3", type=("build", "run"), when="^python@:2") depends_on("py-grpcio@1.29:1", type=("build", "run")) depends_on("py-hdfs@2.1:2", type=("build", "run")) depends_on("py-httplib2@0.8:0.17", type=("build", "run")) @@ -34,14 +31,9 @@ class PyApacheBeam(PythonPackage): depends_on("py-pymongo@3.8:3", type=("build", "run")) depends_on("py-oauth2client@2.0.1:3", type=("build", "run")) depends_on("py-protobuf@3.12.2:3", type=("build", "run")) - depends_on("py-pyarrow@0.15.1:0.17", type=("build", "run"), when="platform=cray") - depends_on("py-pyarrow@0.15.1:0.17", type=("build", "run"), when="platform=darwin") - depends_on("py-pyarrow@0.15.1:0.17", type=("build", "run"), when="platform=linux") - depends_on("py-pyarrow@0.15.1:0.17", type=("build", "run"), when="platform=windows ^python@3:") + depends_on("py-pyarrow@0.15.1:0.17", type=("build", "run")) depends_on("py-pydot@1.2.0:1", type=("build", "run")) depends_on("py-python-dateutil@2.8:2", type=("build", "run")) depends_on("py-pytz@2018.3:", type=("build", "run")) - depends_on("py-pyvcf@0.6.8:0.6", type=("build", "run"), when="^python@:2") depends_on("py-requests@2.24:2", type=("build", "run")) - depends_on("py-typing@3.7.0:3.7", type=("build", "run"), when="^python@:3.5.2") depends_on("py-typing-extensions@3.7.0:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-argh/package.py b/var/spack/repos/builtin/packages/py-argh/package.py index 5abe4193ed..79b4f56ae3 100644 --- a/var/spack/repos/builtin/packages/py-argh/package.py +++ b/var/spack/repos/builtin/packages/py-argh/package.py @@ -23,4 +23,3 @@ class PyArgh(PythonPackage): version("0.26.2", sha256="e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65") depends_on("py-setuptools", type="build") - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-argon2-cffi/package.py b/var/spack/repos/builtin/packages/py-argon2-cffi/package.py index adb56f1095..744dbdd99d 100644 --- a/var/spack/repos/builtin/packages/py-argon2-cffi/package.py +++ b/var/spack/repos/builtin/packages/py-argon2-cffi/package.py @@ -25,8 +25,6 @@ class PyArgon2Cffi(PythonPackage): depends_on("py-setuptools", when="@:21.1", type="build") depends_on("py-argon2-cffi-bindings", when="@21.2:", type=("build", "run")) - depends_on("py-dataclasses", when="@21.2: ^python@:3.6", type=("build", "run")) depends_on("py-typing-extensions", when="@21.2: ^python@:3.7", type=("build", "run")) depends_on("py-cffi@1.0.0:", when="@:21.1", type=("build", "run")) depends_on("py-six", when="@:20.1", type=("build", "run")) - depends_on("py-enum34", when="^python@:3.3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-argparse/package.py b/var/spack/repos/builtin/packages/py-argparse/package.py deleted file mode 100644 index 87db304d7d..0000000000 --- a/var/spack/repos/builtin/packages/py-argparse/package.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyArgparse(PythonPackage): - """Python command-line parsing library.""" - - homepage = "https://github.com/ThomasWaldmann/argparse/" - pypi = "argparse/argparse-1.4.0.tar.gz" - - version("1.4.0", sha256="62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4") - - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-arrow/package.py b/var/spack/repos/builtin/packages/py-arrow/package.py index 3557df6467..ec5deaf93b 100644 --- a/var/spack/repos/builtin/packages/py-arrow/package.py +++ b/var/spack/repos/builtin/packages/py-arrow/package.py @@ -27,9 +27,6 @@ class PyArrow(PythonPackage): depends_on("python@3.6:", type=("build", "run"), when="@1.2.1:") depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@:0.16.0") depends_on("py-setuptools", type="build") - depends_on( - "py-backports-functools-lru-cache@1.2.1:", type=("build", "run"), when="^python@2.7:2.8" - ) depends_on("py-python-dateutil", type=("build", "run")) depends_on("py-typing-extensions", type=("build", "run"), when="@1.2.1: ^python@:3.7") depends_on("py-python-dateutil@2.7.0:", type=("build", "run"), when="@1.2.1:") diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py index 555ff3822c..d301b783aa 100644 --- a/var/spack/repos/builtin/packages/py-astroid/package.py +++ b/var/spack/repos/builtin/packages/py-astroid/package.py @@ -56,9 +56,6 @@ class PyAstroid(PythonPackage): depends_on("py-wrapt@1.11:1", when="@2.11", type=("build", "run")) depends_on("py-wrapt@1.14:1", when="@2.12.7: ^python@3.11:", type=("build", "run")) depends_on("py-wrapt@1.11:1", when="@2.12.7: ^python@:3.10", 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:", 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:2.8.4 ^python@:3.7", type=("build", "run")) depends_on("py-typed-ast@1.4.0:1", when="@2.8.5: ^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-asttokens/package.py b/var/spack/repos/builtin/packages/py-asttokens/package.py index e85979d0a1..9970a315d1 100644 --- a/var/spack/repos/builtin/packages/py-asttokens/package.py +++ b/var/spack/repos/builtin/packages/py-asttokens/package.py @@ -19,4 +19,3 @@ class PyAsttokens(PythonPackage): depends_on("py-setuptools-scm+toml@3.4.3:", type="build") depends_on("py-six", type=("build", "run")) - depends_on("py-typing", when="@2.0.7: ^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-auxlib/package.py b/var/spack/repos/builtin/packages/py-auxlib/package.py index 20d814ea12..95a98ae3a3 100644 --- a/var/spack/repos/builtin/packages/py-auxlib/package.py +++ b/var/spack/repos/builtin/packages/py-auxlib/package.py @@ -15,6 +15,4 @@ class PyAuxlib(PythonPackage): version("0.0.43", sha256="0f175637e96a090a785767ce28483cf1aeec316a19afce9b2fbd113e1122786a") depends_on("py-setuptools", type="build") - depends_on("py-enum34", type=("build", "run"), when="^python@:3.3") - depends_on("py-ordereddict", type=("build", "run"), when="^python@:2.6") depends_on("py-wheel", 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 f5ee0c2a67..b17c7be925 100644 --- a/var/spack/repos/builtin/packages/py-azure-batch/package.py +++ b/var/spack/repos/builtin/packages/py-azure-batch/package.py @@ -19,4 +19,3 @@ class PyAzureBatch(PythonPackage): depends_on("py-msrest@0.5.0:", 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 c8299b5861..f47072c1db 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 @@ -35,7 +35,3 @@ class PyAzureCliCore(PythonPackage): 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")) - depends_on("py-enum34", when="^python@:3.3", type=("build", "run")) - depends_on("py-ndg-httpsclient", when="^python@:2.7.8", type=("build", "run")) - depends_on("py-pyasn1", when="^python@:2.7.8", type=("build", "run")) - depends_on("py-futures", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azure-common/package.py b/var/spack/repos/builtin/packages/py-azure-common/package.py index 5ab7c6d3a8..db4ff83951 100644 --- a/var/spack/repos/builtin/packages/py-azure-common/package.py +++ b/var/spack/repos/builtin/packages/py-azure-common/package.py @@ -16,4 +16,3 @@ class PyAzureCommon(PythonPackage): version("1.1.25", sha256="ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054") depends_on("py-setuptools", type="build") - depends_on("py-azure-nspkg", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azure-core/package.py b/var/spack/repos/builtin/packages/py-azure-core/package.py index 3c02ff639a..2ec14195d4 100644 --- a/var/spack/repos/builtin/packages/py-azure-core/package.py +++ b/var/spack/repos/builtin/packages/py-azure-core/package.py @@ -21,6 +21,3 @@ class PyAzureCore(PythonPackage): depends_on("py-requests@2.18.4:", type=("build", "run")) depends_on("py-six@1.6:", when="@:1.21", type=("build", "run")) depends_on("py-six@1.11:", when="@1.21:", type=("build", "run")) - depends_on("py-azure-nspkg", when="^python@:2", type=("build", "run")) - depends_on("py-enum34@1.0.4:", when="^python@:3.3", type=("build", "run")) - depends_on("py-typing", when="^python@:3.4", 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 85b378a54c..5c50a80674 100644 --- a/var/spack/repos/builtin/packages/py-azure-cosmos/package.py +++ b/var/spack/repos/builtin/packages/py-azure-cosmos/package.py @@ -23,7 +23,4 @@ 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", 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")) depends_on("py-requests@2.10.0:", when="@:3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py b/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py index db0eafbd8c..d90fdcaf92 100644 --- a/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py +++ b/var/spack/repos/builtin/packages/py-azure-datalake-store/package.py @@ -19,6 +19,3 @@ class PyAzureDatalakeStore(PythonPackage): depends_on("py-cffi", type=("build", "run")) depends_on("py-adal@0.4.2:", type=("build", "run")) depends_on("py-requests@2.20.0:", type=("build", "run")) - depends_on("py-pathlib2", when="^python@:3.3", type=("build", "run")) - depends_on("py-futures", when="^python@:2", type=("build", "run")) - depends_on("py-azure-nspkg", when="^python@:2", 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 9788a9a640..c5abb0d8b9 100644 --- a/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py +++ b/var/spack/repos/builtin/packages/py-azure-graphrbac/package.py @@ -20,4 +20,3 @@ class PyAzureGraphrbac(PythonPackage): depends_on("py-msrest@0.5.0:", 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 672b9bfc4e..2bf754edbe 100644 --- a/var/spack/repos/builtin/packages/py-azure-identity/package.py +++ b/var/spack/repos/builtin/packages/py-azure-identity/package.py @@ -28,6 +28,3 @@ class PyAzureIdentity(PythonPackage): 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")) - depends_on("py-typing", when="^python@:3.4", 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 cc207ae5a6..3586d107a7 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 @@ -18,6 +18,3 @@ class PyAzureKeyvaultCertificates(PythonPackage): depends_on("py-setuptools", type="build") 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")) - depends_on("py-typing", when="^python@:3.4", 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 467343327f..52b4f959f0 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 @@ -19,6 +19,3 @@ class PyAzureKeyvaultKeys(PythonPackage): 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")) - depends_on("py-enum34@1.0.4:", when="^python@:3.3", type=("build", "run")) - depends_on("py-typing", when="^python@:3.4", 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 80991da344..d56c3ddd17 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 @@ -18,6 +18,3 @@ class PyAzureKeyvaultSecrets(PythonPackage): depends_on("py-setuptools", type="build") 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")) - depends_on("py-typing", when="^python@:3.4", 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 258d7331a9..384cb969bb 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 @@ -20,4 +20,3 @@ class PyAzureMgmtAdvisor(PythonPackage): depends_on("py-msrest@0.5.0:", 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 9b6cd3f9e2..1a020db329 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 @@ -20,4 +20,3 @@ class PyAzureMgmtApimanagement(PythonPackage): depends_on("py-msrest@0.5.0:", 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 4a5965c5c7..975eae562f 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 @@ -20,4 +20,3 @@ class PyAzureMgmtAppconfiguration(PythonPackage): depends_on("py-msrest@0.5.0:", 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 ae0dc7b56e..3073b74b58 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 @@ -22,4 +22,3 @@ class PyAzureMgmtApplicationinsights(PythonPackage): 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 213a91af79..e3eeba6774 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 @@ -20,4 +20,3 @@ class PyAzureMgmtAuthorization(PythonPackage): depends_on("py-msrest@0.5.0:", 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 96d736a5a6..df0693244e 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 @@ -19,4 +19,3 @@ class PyAzureMgmtBatch(PythonPackage): depends_on("py-msrest@0.5.0:", 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-botservice/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-botservice/package.py index c7ab311506..ed05b2263c 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 @@ -19,4 +19,3 @@ class PyAzureMgmtBotservice(PythonPackage): depends_on("py-msrest@0.5.0:", 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 b843f1e476..eaa9f74c6a 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 @@ -25,4 +25,3 @@ class PyAzureMgmtCdn(PythonPackage): depends_on("py-msrest@0.5.0:", 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 4d930be2ae..feee0b8897 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 @@ -20,4 +20,3 @@ class PyAzureMgmtCognitiveservices(PythonPackage): depends_on("py-msrest@0.5.0:", 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 8a9d0377d1..858977e10d 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 @@ -19,4 +19,3 @@ class PyAzureMgmtCompute(PythonPackage): depends_on("py-msrest@0.5.0:", 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 b3d947769b..ae051e7da8 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 @@ -21,4 +21,3 @@ class PyAzureMgmtConsumption(PythonPackage): 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 a5244283a1..500b61f7b1 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 @@ -20,4 +20,3 @@ class PyAzureMgmtContainerinstance(PythonPackage): depends_on("py-msrest@0.5.0:", 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 1cb993db2d..1113624290 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 @@ -25,4 +25,3 @@ class PyAzureMgmtContainerregistry(PythonPackage): depends_on("py-msrest@0.5.0:", 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 5ae7a253bb..d1faf899ae 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 @@ -20,4 +20,3 @@ class PyAzureMgmtContainerservice(PythonPackage): depends_on("py-msrest@0.5.0:", 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 179b4c9f0f..12a8c72759 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 @@ -19,5 +19,3 @@ class PyAzureMgmtCore(PythonPackage): depends_on("py-setuptools", type="build") 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 1eff575860..6aa405d856 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 @@ -19,4 +19,3 @@ class PyAzureMgmtCosmosdb(PythonPackage): depends_on("py-msrest@0.5.0:", 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-datamigration/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-datamigration/package.py index c07fd64f0f..f8384d8cc8 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 @@ -21,4 +21,3 @@ class PyAzureMgmtDatamigration(PythonPackage): 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 7db95380ec..45780ad108 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 @@ -19,4 +19,3 @@ class PyAzureMgmtDeploymentmanager(PythonPackage): depends_on("py-msrest@0.5.0:", 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 c40e4b9e8b..8081e0e55b 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 @@ -19,4 +19,3 @@ class PyAzureMgmtDevtestlabs(PythonPackage): depends_on("py-msrest@0.5.0:", 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 296bccfc78..5bb8a1be24 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 @@ -20,4 +20,3 @@ class PyAzureMgmtDns(PythonPackage): depends_on("py-msrest@0.5.0:", 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 fca080d8a0..847399b248 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 @@ -25,4 +25,3 @@ class PyAzureMgmtEventgrid(PythonPackage): depends_on("py-msrest@0.5.0:", 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 4cf291d908..88a63c9a4c 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 @@ -19,4 +19,3 @@ class PyAzureMgmtEventhub(PythonPackage): depends_on("py-msrest@0.5.0:", 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 cb04699a62..810a049372 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 @@ -19,4 +19,3 @@ class PyAzureMgmtHdinsight(PythonPackage): depends_on("py-msrest@0.5.0:", 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 0649c97302..e04b6abc6e 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 @@ -19,4 +19,3 @@ class PyAzureMgmtImagebuilder(PythonPackage): depends_on("py-msrest@0.5.0:", 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 c530a6e795..7a0ee1685c 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 @@ -20,4 +20,3 @@ class PyAzureMgmtIotcentral(PythonPackage): depends_on("py-msrest@0.5.0:", 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 e7be4eb632..6efea0484c 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 @@ -19,4 +19,3 @@ class PyAzureMgmtIothub(PythonPackage): depends_on("py-msrest@0.5.0:", 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-keyvault/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-keyvault/package.py index b61a7f1127..78d74dd302 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 @@ -19,4 +19,3 @@ class PyAzureMgmtKeyvault(PythonPackage): depends_on("py-msrest@0.5.0:", 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 d9b405f937..54a9a86b68 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 @@ -20,4 +20,3 @@ class PyAzureMgmtKusto(PythonPackage): depends_on("py-msrest@0.5.0:", 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 f4a030df77..186db16604 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 @@ -19,4 +19,3 @@ class PyAzureMgmtLoganalytics(PythonPackage): depends_on("py-msrest@0.5.0:", 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 63822e682c..adc74c2a39 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 @@ -19,4 +19,3 @@ class PyAzureMgmtManagedservices(PythonPackage): depends_on("py-msrest@0.5.0:", 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 c6f8fa2e7b..10a2498d19 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 @@ -19,4 +19,3 @@ class PyAzureMgmtManagementgroups(PythonPackage): depends_on("py-msrest@0.5.0:", 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-marketplaceordering/package.py b/var/spack/repos/builtin/packages/py-azure-mgmt-marketplaceordering/package.py index 7ed14ad591..33dc2cc4d0 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 @@ -19,4 +19,3 @@ class PyAzureMgmtMarketplaceordering(PythonPackage): depends_on("py-msrest@0.5.0:", 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 dced7f96f3..121a9a1beb 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 @@ -19,4 +19,3 @@ class PyAzureMgmtMedia(PythonPackage): depends_on("py-msrest@0.5.0:", 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 c952ab59b4..8d6910259a 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 @@ -20,4 +20,3 @@ class PyAzureMgmtMonitor(PythonPackage): depends_on("py-msrest@0.5.0:", 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 2ab777bda4..c3c2482c5a 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 @@ -21,4 +21,3 @@ class PyAzureMgmtMsi(PythonPackage): 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 e164bc48b9..61976d3e87 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 @@ -20,4 +20,3 @@ class PyAzureMgmtNetapp(PythonPackage): depends_on("py-msrest@0.5.0:", 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 b59ce924a4..bfa394bb24 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 @@ -20,4 +20,3 @@ class PyAzureMgmtNetwork(PythonPackage): depends_on("py-msrest@0.5.0:", 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 c940398ece..0eb1d3d6ba 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 @@ -19,4 +19,3 @@ class PyAzureMgmtPolicyinsights(PythonPackage): depends_on("py-msrest@0.5.0:", 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 90ebf5a0e5..6dbc427885 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 @@ -19,4 +19,3 @@ class PyAzureMgmtPrivatedns(PythonPackage): depends_on("py-msrest@0.5.0:", 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 ebf4c718c7..b80c930ea7 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 @@ -19,4 +19,3 @@ class PyAzureMgmtRdbms(PythonPackage): depends_on("py-msrest@0.5.0:", 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 01003a30b4..0e6279d19e 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 @@ -20,4 +20,3 @@ class PyAzureMgmtRecoveryservices(PythonPackage): depends_on("py-msrest@0.5.0:", 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 4d6c047323..23ca3c8192 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 @@ -21,4 +21,3 @@ class PyAzureMgmtRecoveryservicesbackup(PythonPackage): depends_on("py-msrest@0.5.0:", 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 2652e2e969..907ca12e0a 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 @@ -19,4 +19,3 @@ class PyAzureMgmtRedhatopenshift(PythonPackage): depends_on("py-msrest@0.5.0:", 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 a918c444c2..37af6ec961 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 @@ -25,4 +25,3 @@ class PyAzureMgmtRedis(PythonPackage): depends_on("py-msrest@0.5.0:", 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 d0cc64aa72..2134a6942a 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 @@ -21,4 +21,3 @@ class PyAzureMgmtRelay(PythonPackage): 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 e1ec121b9a..99664c996c 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 @@ -20,4 +20,3 @@ class PyAzureMgmtReservations(PythonPackage): depends_on("py-msrest@0.5.0:", 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 dbf7655653..c916716a26 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 @@ -19,4 +19,3 @@ class PyAzureMgmtResource(PythonPackage): depends_on("py-msrest@0.5.0:", 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 0b3e764575..e14b5f47ba 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 @@ -19,4 +19,3 @@ class PyAzureMgmtSearch(PythonPackage): depends_on("py-msrest@0.5.0:", 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 8ee085084b..6e4e5da8cc 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 @@ -19,4 +19,3 @@ class PyAzureMgmtSecurity(PythonPackage): depends_on("py-msrest@0.5.0:", 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 7d3b9f6ae1..25462cb960 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 @@ -19,4 +19,3 @@ class PyAzureMgmtServicebus(PythonPackage): depends_on("py-msrest@0.5.0:", 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 f2b1c576bc..3a69b03c54 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 @@ -19,4 +19,3 @@ class PyAzureMgmtServicefabric(PythonPackage): depends_on("py-msrest@0.5.0:", 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 07f7212a6d..2d78293883 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 @@ -19,4 +19,3 @@ class PyAzureMgmtSignalr(PythonPackage): depends_on("py-msrest@0.5.0:", 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 882d6312dc..a1f92fcb48 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 @@ -19,4 +19,3 @@ class PyAzureMgmtSql(PythonPackage): depends_on("py-msrest@0.5.0:", 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 20c44f065f..0bcbc4fdd4 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 @@ -20,4 +20,3 @@ class PyAzureMgmtSqlvirtualmachine(PythonPackage): depends_on("py-msrest@0.5.0:", 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 048b590c55..545c5c0769 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 @@ -20,4 +20,3 @@ class PyAzureMgmtStorage(PythonPackage): depends_on("py-msrest@0.5.0:", 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 72ff39a93e..319c85968c 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 @@ -19,4 +19,3 @@ class PyAzureMgmtTrafficmanager(PythonPackage): depends_on("py-msrest@0.5.0:", 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 61a56ded5f..1328b14cf4 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 @@ -19,4 +19,3 @@ class PyAzureMgmtWeb(PythonPackage): depends_on("py-msrest@0.5.0:", 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-multiapi-storage/package.py b/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py index abe31a5c3a..3f076e14af 100644 --- a/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py +++ b/var/spack/repos/builtin/packages/py-azure-multiapi-storage/package.py @@ -22,5 +22,3 @@ class PyAzureMultiapiStorage(PythonPackage): depends_on("py-python-dateutil", type=("build", "run")) depends_on("py-requests", type=("build", "run")) depends_on("py-azure-core", type=("build", "run")) - depends_on("py-futures", when="^python@:2", type=("build", "run")) - depends_on("py-azure-nspkg", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py index c5183a2a77..ae07f7810e 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-blob/package.py @@ -19,9 +19,3 @@ class PyAzureStorageBlob(PythonPackage): depends_on("py-azure-core@1.10:1", type=("build", "run")) depends_on("py-msrest@0.6.21:", type=("build", "run")) depends_on("py-cryptography@2.1.4:", type=("build", "run")) - - depends_on("py-futures", type=("build", "run"), when="^python@:2") - depends_on("py-azure-storage-nspkg@3", type=("build", "run"), when="^python@:2") - - depends_on("py-enum34@1.0.4:", type=("build", "run"), when=("^python@:3.3")) - depends_on("py-typing", type=("build", "run"), when=("^python@:3.4")) diff --git a/var/spack/repos/builtin/packages/py-azure-storage-common/package.py b/var/spack/repos/builtin/packages/py-azure-storage-common/package.py index 5b901a5f31..dd4465826d 100644 --- a/var/spack/repos/builtin/packages/py-azure-storage-common/package.py +++ b/var/spack/repos/builtin/packages/py-azure-storage-common/package.py @@ -21,4 +21,3 @@ class PyAzureStorageCommon(PythonPackage): depends_on("py-cryptography", type=("build", "run")) depends_on("py-python-dateutil", type=("build", "run")) depends_on("py-requests", type=("build", "run")) - depends_on("py-azure-storage-nspkg", when="^python@:2", type=("build", "run")) 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 96a2922a60..61d74ef1b8 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 @@ -33,18 +33,6 @@ class PyAzuremlDataprepNative(PythonPackage): expand=False, url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp37-cp37m-macosx_10_9_x86_64.whl", ) - version( - "30.0.0-py3.6", - sha256="bd81f0ac0df442b4e09bd2ee76ccff1279437b73e08324d9038c13a5e4708598", - expand=False, - url="https://pypi.io/packages/cp36/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp36-cp36m-macosx_10_9_x86_64.whl", - ) - version( - "30.0.0-py3.5", - sha256="2d1702a2dd9b851ccba9d4624a240f5657f3f34a89977f01ee99f9ccaab905a9", - expand=False, - url="https://pypi.io/packages/cp35/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp35-cp35m-macosx_10_9_x86_64.whl", - ) version( "14.2.1-py3.7", @@ -72,18 +60,6 @@ class PyAzuremlDataprepNative(PythonPackage): expand=False, url="https://pypi.io/packages/cp37/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp37-cp37m-manylinux1_x86_64.whl", ) - version( - "30.0.0-py3.6", - sha256="d2560d3f20cd3b8ad2d2159b1048b83dd330cf8c44aa8becedd6dcaf72876062", - expand=False, - url="https://pypi.io/packages/cp36/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp36-cp36m-manylinux1_x86_64.whl", - ) - version( - "30.0.0-py3.5", - sha256="15b55d903d5688b5a9a290e388db62c8f3d042bc1796db44723f4455b7b18d07", - expand=False, - url="https://pypi.io/packages/cp35/a/azureml_dataprep_native/azureml_dataprep_native-30.0.0-cp35-cp35m-manylinux1_x86_64.whl", - ) version( "14.2.1-py3.7", @@ -95,6 +71,4 @@ class PyAzuremlDataprepNative(PythonPackage): 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", when="@14.2.1-py3.7", type=("build", "run")) 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 a4328c69d8..9a4d248afa 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 @@ -36,18 +36,6 @@ class PyAzuremlDataprepRslex(PythonPackage): expand=False, url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp37-cp37m-macosx_10_9_x86_64.whl", ) - version( - "1.9.0-py3.6", - sha256="80d518774591deb2c8f1457708c10c9ba348407d7aa49e0710358f46846fcbef", - expand=False, - url="https://pypi.io/packages/cp36/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp36-cp36m-macosx_10_9_x86_64.whl", - ) - version( - "1.9.0-py3.5", - sha256="91a5c09796e60570620efb7d66f05647557ec6d39aab8b22c0e13926c402ca5b", - expand=False, - url="https://pypi.io/packages/cp35/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp35-cp35m-macosx_10_9_x86_64.whl", - ) version( "1.8.0-py3.9", @@ -67,18 +55,6 @@ class PyAzuremlDataprepRslex(PythonPackage): expand=False, url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp37-cp37m-macosx_10_9_x86_64.whl", ) - version( - "1.8.0-py3.6", - sha256="f5f7c9af1f1ecfbfee0e5822db180de05c6f5aeed34f6d0b3fd26e210f476d3e", - expand=False, - url="https://pypi.io/packages/cp36/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp36-cp36m-macosx_10_9_x86_64.whl", - ) - version( - "1.8.0-py3.5", - sha256="1c610a25a3e09d4ebb95c42baaa57b5c0c66e31522a6bff52dda0df2d6ac7f4d", - expand=False, - url="https://pypi.io/packages/cp35/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp35-cp35m-macosx_10_9_x86_64.whl", - ) elif sys.platform.startswith("linux"): version( "1.9.0-py3.9", @@ -99,18 +75,6 @@ class PyAzuremlDataprepRslex(PythonPackage): expand=False, url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp37-cp37m-manylinux1_x86_64.whl", ) - version( - "1.9.0-py3.6", - sha256="2723bf56f2d11e5ee00c6619f2365bd594e85ba116ffc912a2433c52913d0890", - expand=False, - url="https://pypi.io/packages/cp36/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp36-cp36m-manylinux1_x86_64.whl", - ) - version( - "1.9.0-py3.5", - sha256="d5c6d363da2b3ace1baa9ad3e645ad8a19fdacf0b95dd1f8b6ab19c4371cc10f", - expand=False, - url="https://pypi.io/packages/cp35/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.9.0-cp35-cp35m-manylinux1_x86_64.whl", - ) version( "1.8.0-py3.9", @@ -130,24 +94,10 @@ class PyAzuremlDataprepRslex(PythonPackage): expand=False, url="https://pypi.io/packages/cp37/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp37-cp37m-manylinux1_x86_64.whl", ) - version( - "1.8.0-py3.6", - sha256="195507ba55aa5ac7c5d37d05b8ac25813add0da5cc9bd4a04f2cb5da984cb287", - expand=False, - url="https://pypi.io/packages/cp36/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp36-cp36m-manylinux1_x86_64.whl", - ) - version( - "1.8.0-py3.5", - sha256="9dfbd1065030dee3aa45b6796c087acffb06cfcbe97cc877e255e21e320362be", - expand=False, - url="https://pypi.io/packages/cp35/a/azureml_dataprep_rslex/azureml_dataprep_rslex-1.8.0-cp35-cp35m-manylinux1_x86_64.whl", - ) 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-backports-cached-property/package.py b/var/spack/repos/builtin/packages/py-backports-cached-property/package.py index e716cd5a2e..1b905fa039 100644 --- a/var/spack/repos/builtin/packages/py-backports-cached-property/package.py +++ b/var/spack/repos/builtin/packages/py-backports-cached-property/package.py @@ -18,4 +18,3 @@ class PyBackportsCachedProperty(PythonPackage): depends_on("py-setuptools@42:", type="build") depends_on("py-setuptools-scm@3.4:+toml", type="build") - depends_on("py-typing@3.6:", when="^python@:3.6", type=("build", "run")) 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 deleted file mode 100644 index d19731999d..0000000000 --- a/var/spack/repos/builtin/packages/py-backports-functools-lru-cache/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyBackportsFunctoolsLruCache(PythonPackage): - """Backport of functools.lru_cache from Python 3.3""" - - homepage = "https://github.com/jaraco/backports.functools_lru_cache" - pypi = "backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz" - - py_namespace = "backports" - - version("1.5", sha256="9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a") - version("1.4", sha256="31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f") - version( - "1.0.1", - sha256="593275768571eb2bcfe0795a30108f8a0e85e14e98c3a5e498e789f891d82f3d", - url="https://pypi.io/packages/source/b/backports.functools_lru_cache/backports.functools_lru_cache-1.0.1.zip", - ) - - depends_on("py-setuptools", type="build") - depends_on("py-setuptools-scm@1.15.0:", type="build") - depends_on("python@2.6.0:3.3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-backports-os/package.py b/var/spack/repos/builtin/packages/py-backports-os/package.py index 0ddc5f0b60..e1a3683304 100644 --- a/var/spack/repos/builtin/packages/py-backports-os/package.py +++ b/var/spack/repos/builtin/packages/py-backports-os/package.py @@ -16,4 +16,3 @@ class PyBackportsOs(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-setuptools-scm", type="build") - depends_on("py-future", type=("build", "run"), when="^python@:2") 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 deleted file mode 100644 index ed51fb79c7..0000000000 --- a/var/spack/repos/builtin/packages/py-backports-shutil-get-terminal-size/package.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyBackportsShutilGetTerminalSize(PythonPackage): - """A backport of the get_terminal_size function - from Python 3.3's shutil.""" - - pypi = "backports.shutil_get_terminal_size/backports.shutil_get_terminal_size-1.0.0.tar.gz" - - py_namespace = "backports" - - version("1.0.0", sha256="713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80") - - # newer setuptools version mess with "namespace" packages in an - # incompatible way cf. https://github.com/pypa/setuptools/issues/900 - depends_on("py-setuptools@:30,41:", type="build") - depends_on("python@:3.2") diff --git a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py index 3bf6c91515..d799ad89ab 100644 --- a/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py +++ b/var/spack/repos/builtin/packages/py-beautifulsoup4/package.py @@ -28,8 +28,7 @@ class PyBeautifulsoup4(PythonPackage): depends_on("python@3.6:", when="@4.11.0:", type=("build", "run")) depends_on("python@3:", when="@4.10.0:", type=("build", "run")) 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", when="@4.9.0: ^python@:2.8", type=("build", "run")) + depends_on("py-soupsieve@1.3:", when="@4.9.0:", 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-bigdft/package.py b/var/spack/repos/builtin/packages/py-bigdft/package.py index 6c2a5c1276..4996dcca13 100644 --- a/var/spack/repos/builtin/packages/py-bigdft/package.py +++ b/var/spack/repos/builtin/packages/py-bigdft/package.py @@ -19,9 +19,7 @@ class PyBigdft(PythonPackage): version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41") version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8") - depends_on("python@:2.8", type=("build", "run"), when="@:1.8.3") - depends_on("python@3.0:", type=("build", "run"), when="@1.9.0:") - depends_on("python@3.0:", type=("build", "run"), when="@develop") + depends_on("python@3.0:", type=("build", "run")) depends_on("py-numpy") depends_on("py-setuptools") diff --git a/var/spack/repos/builtin/packages/py-biom-format/package.py b/var/spack/repos/builtin/packages/py-biom-format/package.py index 010fc685f1..2e7f5ec77e 100644 --- a/var/spack/repos/builtin/packages/py-biom-format/package.py +++ b/var/spack/repos/builtin/packages/py-biom-format/package.py @@ -29,4 +29,3 @@ class PyBiomFormat(PythonPackage): depends_on("py-scipy@1.3.1:", type=("build", "run")) depends_on("py-pandas@0.20.0:", type=("build", "run")) depends_on("py-six@1.10.0:", type=("build", "run")) - depends_on("py-pyqi", type=("build", "run"), when="^python@:2") diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py index 4f83dd95d2..d2d3cd286f 100644 --- a/var/spack/repos/builtin/packages/py-black/package.py +++ b/var/spack/repos/builtin/packages/py-black/package.py @@ -46,7 +46,6 @@ class PyBlack(PythonPackage): depends_on("py-tomli@1.1:", when="@21.7:22.6", type=("build", "run")) depends_on("py-typed-ast@1.4.2:", when="^python@:3.7", type=("build", "run")) depends_on("py-typing-extensions@3.10:", when="^python@:3.9", type=("build", "run")) - depends_on("py-dataclasses@0.6:", when="^python@:3.6", type=("build", "run")) depends_on("py-colorama@0.4.3:", when="+colorama", type=("build", "run")) depends_on("py-uvloop@0.15.2:", when="+uvloop", type=("build", "run")) depends_on("py-aiohttp@3.7.4:", when="+d", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-bokeh/package.py b/var/spack/repos/builtin/packages/py-bokeh/package.py index aa2a793558..31df518b80 100644 --- a/var/spack/repos/builtin/packages/py-bokeh/package.py +++ b/var/spack/repos/builtin/packages/py-bokeh/package.py @@ -29,7 +29,6 @@ class PyBokeh(PythonPackage): depends_on("py-requests@1.2.3:", type=("build", "run"), when="@0.12.2") depends_on("py-six@1.5.2:", type=("build", "run"), when="@:1.3.4") depends_on("py-python-dateutil@2.1:", type=("build", "run"), when="@:2.3.3") - depends_on("py-futures@3.0.3:", type=("build", "run"), when="@:1.3.4 ^python@2.7:2.8") depends_on("py-jinja2@2.7:", type=("build", "run")) depends_on("py-jinja2@2.9:", type=("build", "run"), when="@2.3.3:") diff --git a/var/spack/repos/builtin/packages/py-boost-histogram/package.py b/var/spack/repos/builtin/packages/py-boost-histogram/package.py index c767e3bbd4..09d9f6f1de 100644 --- a/var/spack/repos/builtin/packages/py-boost-histogram/package.py +++ b/var/spack/repos/builtin/packages/py-boost-histogram/package.py @@ -19,5 +19,4 @@ class PyBoostHistogram(PythonPackage): depends_on("py-setuptools@45:", type="build") depends_on("py-setuptools-scm@4.1.2:+toml", type="build") depends_on("py-numpy@1.13.3:", type=("build", "run")) - depends_on("py-dataclasses", when="^python@:3.6", type=("build", "run")) depends_on("py-typing-extensions", when="^python@:3.7", 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 b754420f7b..5076f0019c 100644 --- a/var/spack/repos/builtin/packages/py-botocore/package.py +++ b/var/spack/repos/builtin/packages/py-botocore/package.py @@ -27,19 +27,8 @@ class PyBotocore(PythonPackage): depends_on("py-setuptools", type="build") 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 ^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 85389af447..5840e15805 100644 --- a/var/spack/repos/builtin/packages/py-brotlipy/package.py +++ b/var/spack/repos/builtin/packages/py-brotlipy/package.py @@ -16,7 +16,6 @@ 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", 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-bx-python/package.py b/var/spack/repos/builtin/packages/py-bx-python/package.py index 1a453aacdf..f468035394 100644 --- a/var/spack/repos/builtin/packages/py-bx-python/package.py +++ b/var/spack/repos/builtin/packages/py-bx-python/package.py @@ -14,16 +14,9 @@ class PyBxPython(PythonPackage): pypi = "bx-python/bx-python-0.8.8.tar.gz" version("0.8.8", sha256="ad0808ab19c007e8beebadc31827e0d7560ac0e935f1100fb8cc93607400bb47") - version( - "0.7.4", - sha256="1066d1e56d062d0661f23c19942eb757bd7ab7cb8bc7d89a72fdc3931c995cb4", - url="https://github.com/bxlab/bx-python/archive/v0.7.4.tar.gz", - ) - depends_on("python@2.4:2.7", type=("build", "run"), when="@:0.7") - depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@0.8:") + depends_on("python@2.7:2.8,3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-python-lzo", type=("build", "run"), when="@:0.7") - depends_on("py-cython", type="build", when="@0.8:") + depends_on("py-cython", type="build") depends_on("py-numpy", type=("build", "run")) - depends_on("py-six", type=("build", "run"), when="@0.8:") + depends_on("py-six", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-bz2file/package.py b/var/spack/repos/builtin/packages/py-bz2file/package.py deleted file mode 100644 index 1e48d2777c..0000000000 --- a/var/spack/repos/builtin/packages/py-bz2file/package.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyBz2file(PythonPackage): - """Python library for reading and writing bzip2-compressed files.""" - - homepage = "https://github.com/nvawda/bz2file" - pypi = "bz2file/bz2file-0.98.tar.gz" - - version("0.98", sha256="64c1f811e31556ba9931953c8ec7b397488726c63e09a4c67004f43bdd28da88") - - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index 2e9321647a..e96291c4a4 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -70,7 +70,6 @@ class PyCartopy(PythonPackage): depends_on("py-pyshp@1.1.4:", type=("build", "run")) depends_on("py-pyproj@3:", when="@0.20:", type=("build", "run")) depends_on("py-six@1.3:", when="@:0.18", type=("build", "run")) - depends_on("py-futures", when="@0.18 ^python@2.7", type=("build", "run")) # requirements/epsg.txt with when("+epsg"): diff --git a/var/spack/repos/builtin/packages/py-catkin-pkg/package.py b/var/spack/repos/builtin/packages/py-catkin-pkg/package.py index cbca44f829..69a13516f4 100644 --- a/var/spack/repos/builtin/packages/py-catkin-pkg/package.py +++ b/var/spack/repos/builtin/packages/py-catkin-pkg/package.py @@ -19,4 +19,3 @@ class PyCatkinPkg(PythonPackage): depends_on("py-docutils", type=("build", "run")) depends_on("py-python-dateutil", type=("build", "run")) depends_on("py-pyparsing", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cdat-lite/package.py b/var/spack/repos/builtin/packages/py-cdat-lite/package.py deleted file mode 100644 index 00c9527247..0000000000 --- a/var/spack/repos/builtin/packages/py-cdat-lite/package.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyCdatLite(PythonPackage): - """Cdat-lite is a Python package for managing and analysing climate - science data. It is a subset of the Climate Data Analysis Tools (CDAT) - developed by PCMDI at Lawrence Livermore National Laboratory.""" - - homepage = "http://proj.badc.rl.ac.uk/cedaservices/wiki/CdatLite" - pypi = "cdat-lite/cdat-lite-6.0.1.tar.gz" - - version("6.0.1", sha256="092ae4ff1fb03dee00096e8dd595b769b422759ce972d96525950adf8e1c9374") - - depends_on("netcdf-c") - depends_on("python@2.5:2.8", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-chainer/package.py b/var/spack/repos/builtin/packages/py-chainer/package.py index 5985043f87..e1a887377e 100644 --- a/var/spack/repos/builtin/packages/py-chainer/package.py +++ b/var/spack/repos/builtin/packages/py-chainer/package.py @@ -37,7 +37,6 @@ class PyChainer(PythonPackage): depends_on("py-typing-extensions@:3.6.6", when="@:6", type=("build", "run")) depends_on("py-filelock", type=("build", "run")) depends_on("py-protobuf@3:", type=("build", "run")) - depends_on("py-typing@:3.6.6", when="@:6", type=("build", "run")) # Dependencies only required for test of ChainerMN depends_on("py-matplotlib", type=("build", "run"), when="+mn") diff --git a/var/spack/repos/builtin/packages/py-chalice/package.py b/var/spack/repos/builtin/packages/py-chalice/package.py index ee33f10198..c83c7ef333 100644 --- a/var/spack/repos/builtin/packages/py-chalice/package.py +++ b/var/spack/repos/builtin/packages/py-chalice/package.py @@ -27,12 +27,10 @@ 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") 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")) depends_on("py-attrs@19.3.0:20.0.0", type=("build", "run")) - depends_on("py-enum34", type=("build", "run"), when="@1.5:^python@:3.3") depends_on("py-jmespath@0.9.3:1.0.0", type=("build", "run")) depends_on("py-pyyaml@5.3.1:6.0.0", type=("build", "run")) depends_on("py-wheel", 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 7d6d73d34e..c771989ff9 100644 --- a/var/spack/repos/builtin/packages/py-checkm-genome/package.py +++ b/var/spack/repos/builtin/packages/py-checkm-genome/package.py @@ -14,25 +14,15 @@ class PyCheckmGenome(PythonPackage): pypi = "checkm-genome/checkm-genome-1.0.11.tar.gz" version("1.2.1", sha256="33907aa7bbf029f8345e33df80d5c89b7a719041f55ece4f7470cd061c8eff76") - version("1.0.13", sha256="ffb7e4966c0fac07c7e6e7db6f6eb5b48587fa83987f8a68efbaff2afb7da82e") - version("1.0.11", sha256="e475d9817d12fa771dbccc80f47758b742fc67c25261dc8ca0c0dc898c2a5190") # pip silently replaces distutils with setuptools - - depends_on("python@2.7.0:2.7", type=("build", "run"), when="@:1.0.18") - depends_on("python@3:", type=("build", "run"), when="@1.1.0:") + depends_on("python@3:", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) 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("py-backports-functools-lru-cache", type=("build", "run"), when="^python@:3.2") - depends_on("py-numpy@1.8.0:", type=("build", "run"), when="@0.9.5:1.0.18") - depends_on("py-numpy@1.21.3:", type=("build", "run"), when="@1.2.0:") - depends_on("py-scipy@0.9.0:", type=("build", "run"), when="@0.9.5:1.0.18") - depends_on("py-scipy@1.7.3:", type=("build", "run"), when="@1.2.0") - depends_on("py-matplotlib@1.3.1:", type=("build", "run"), when="@0.9.5:1.0.18") - depends_on("py-matplotlib@3.5.1:", type=("build", "run"), when="@1.2.0:") - depends_on("py-pysam@0.8.3:", type=("build", "run"), when="@1.0.5:1.0.18") - depends_on("py-pysam@0.19.0:", type=("build", "run"), when="@1.2.0:") - depends_on("py-dendropy@4.0.0:", type=("build", "run"), when="@1.0.0:1.0.18") - depends_on("py-dendropy@4.5.2:", type=("build", "run"), when="@1.2.0:") + depends_on("py-numpy@1.21.3:", type=("build", "run")) + depends_on("py-scipy@1.7.3:", type=("build", "run")) + depends_on("py-matplotlib@3.5.1:", type=("build", "run")) + depends_on("py-pysam@0.19.0:", type=("build", "run")) + depends_on("py-dendropy@4.5.2:", 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 deleted file mode 100644 index 6e2f71b457..0000000000 --- a/var/spack/repos/builtin/packages/py-cheetah/package.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyCheetah(PythonPackage): - """Cheetah is a template engine and code generation tool.""" - - pypi = "Cheetah/Cheetah-2.3.0.tar.gz" - - version("2.4.4", sha256="be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550") - version("2.3.0", sha256="2a32d7f7f70be98c2d57aa581f979bc799d4bf17d09fc0e7d77280501edf3e53") - - 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-cheroot/package.py b/var/spack/repos/builtin/packages/py-cheroot/package.py index 68a41ad6bc..e28e9304a0 100644 --- a/var/spack/repos/builtin/packages/py-cheroot/package.py +++ b/var/spack/repos/builtin/packages/py-cheroot/package.py @@ -21,6 +21,5 @@ class PyCheroot(PythonPackage): depends_on("py-setuptools-scm-git-archive@1.0:", type="build") depends_on("py-more-itertools@2.6:", type=("build", "run")) depends_on("py-six@1.11.0:", type=("build", "run")) - depends_on("py-backports-functools-lru-cache", type=("build", "run"), when="^python@:3.3") depends_on("py-jaraco-functools", when="@8.3.0:", type=("build", "run")) depends_on("python@2.7:2.8,3.4:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-clikit/package.py b/var/spack/repos/builtin/packages/py-clikit/package.py index 6ffcf49254..8d9a91be4d 100644 --- a/var/spack/repos/builtin/packages/py-clikit/package.py +++ b/var/spack/repos/builtin/packages/py-clikit/package.py @@ -20,6 +20,3 @@ class PyClikit(PythonPackage): depends_on("py-pastel@0.2.0:0.2", type=("build", "run")) depends_on("py-pylev@1.3:1", type=("build", "run")) depends_on("py-crashtest@0.3.0:0.3", when="^python@3.6:3", type=("build", "run")) - depends_on("py-typing@3.6:3", when="^python@2.7,3.4", type=("build", "run")) - depends_on("py-typing-extensions@3.6:3", when="^python@3.5.0:3.5.3", type=("build", "run")) - depends_on("py-enum34@1.1:1", when="^python@2.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cnvkit/package.py b/var/spack/repos/builtin/packages/py-cnvkit/package.py index cbec8a2a00..4c40739ab9 100644 --- a/var/spack/repos/builtin/packages/py-cnvkit/package.py +++ b/var/spack/repos/builtin/packages/py-cnvkit/package.py @@ -15,7 +15,6 @@ class PyCnvkit(PythonPackage): version("0.9.6", sha256="be889c98a5cf0a994330b8c31c0a65151fb0095fe4e75a1e04118da2516248c2") depends_on("py-setuptools", type="build") - depends_on("py-futures@3.0:", type=("build", "run"), when="^python@:2.7") depends_on("py-biopython@1.62:", type=("build", "run")) depends_on("py-future@0.15.2:", type=("build", "run")) depends_on("py-pomegranate@0.9.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-codecov/package.py b/var/spack/repos/builtin/packages/py-codecov/package.py index 6843b8afe2..7b9f7d5b16 100644 --- a/var/spack/repos/builtin/packages/py-codecov/package.py +++ b/var/spack/repos/builtin/packages/py-codecov/package.py @@ -17,4 +17,3 @@ class PyCodecov(PythonPackage): depends_on("py-setuptools", type=("build", "run")) depends_on("py-requests@2.7.9:", type=("build", "run")) depends_on("py-coverage", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", 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 deleted file mode 100644 index cbab8cd399..0000000000 --- a/var/spack/repos/builtin/packages/py-cogent/package.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyCogent(PythonPackage): - """A toolkit for statistical analysis of biological sequences.""" - - homepage = "https://github.com/Magdoll/Cogent/wiki/Installing-Cogent" - pypi = "cogent/cogent-1.9.tar.gz" - - version("1.9", sha256="57d8c58e0273ffe4f2b907874f9b49dadfd0600f5507b7666369f4e44d56ce14") - version( - "1.5.3", - url="https://pypi.io/packages/source/c/cogent/cogent-1.5.3.tgz", - sha256="1215ac219070b7b2207b0b47b4388510f3e30ccd88160aa9f02f25d24bcbcd95", - ) - - variant("matplotlib", default=False, description="graphs related to codon usage") - variant("mpi", default=False, description="MPI required for parallel computation.") - 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", type=("build", "run")) - depends_on("py-numpy@1.3:", type=("build", "run")) - depends_on("zlib") - depends_on("py-matplotlib", when="+matplotlib", type=("build", "run")) - depends_on("py-mpi4py", when="+mpi", type=("build", "run")) - depends_on("py-sqlalchemy", when="+mysql", type=("build", "run")) - depends_on("py-pymysql", when="+mysql", type=("build", "run")) - depends_on("py-cython@0.17.1:", type="build") - - def setup_build_environment(self, env): - env.set("DONT_USE_PYREX", "1") diff --git a/var/spack/repos/builtin/packages/py-commonmark/package.py b/var/spack/repos/builtin/packages/py-commonmark/package.py index 7b86fe6cf9..e3d70e1133 100644 --- a/var/spack/repos/builtin/packages/py-commonmark/package.py +++ b/var/spack/repos/builtin/packages/py-commonmark/package.py @@ -19,4 +19,3 @@ class PyCommonmark(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-future", type=("build", "run"), when="@0.9.0") - depends_on("py-future@0.14.0:", type=("build", "run"), when="@0.9.1: ^python@:2.8") diff --git a/var/spack/repos/builtin/packages/py-conan/package.py b/var/spack/repos/builtin/packages/py-conan/package.py index 64b1516692..2ebb64d37a 100644 --- a/var/spack/repos/builtin/packages/py-conan/package.py +++ b/var/spack/repos/builtin/packages/py-conan/package.py @@ -27,8 +27,5 @@ class PyConan(PythonPackage): depends_on("py-distro@1.0.2:1.6.0", type=("build", "run"), when="platform=linux") depends_on("py-pygments@2.0:2", type=("build", "run")) depends_on("py-tqdm@4.28.1:4", type=("build", "run")) - depends_on("py-jinja2@2.9:2", type=("build", "run"), when="^python@:2.7") - depends_on("py-markupsafe@:2.0.1", type=("build", "run"), when="^python@:2.7") - depends_on("py-jinja2@3.0:3", type=("build", "run"), when="^python@3:") + depends_on("py-jinja2@3.0:3", type=("build", "run")) depends_on("py-python-dateutil@2.7.0:2", type=("build", "run")) - depends_on("py-configparser@3.5:", type=("build", "run"), when="^python@:2.7") diff --git a/var/spack/repos/builtin/packages/py-configparser/package.py b/var/spack/repos/builtin/packages/py-configparser/package.py index b229b1f16f..f945739cfb 100644 --- a/var/spack/repos/builtin/packages/py-configparser/package.py +++ b/var/spack/repos/builtin/packages/py-configparser/package.py @@ -22,4 +22,3 @@ class PyConfigparser(PythonPackage): depends_on("py-setuptools@34.4:", type="build", when="@3.5.1:") depends_on("py-setuptools@56:", type="build", when="@5.2.0:") depends_on("py-setuptools-scm@3.4.1:+toml", type="build", when="@5.2.0:") - depends_on("py-ordereddict", type=("build", "run"), when="python@:2.6") diff --git a/var/spack/repos/builtin/packages/py-contextvars/package.py b/var/spack/repos/builtin/packages/py-contextvars/package.py deleted file mode 100644 index b624933ad0..0000000000 --- a/var/spack/repos/builtin/packages/py-contextvars/package.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class PyContextvars(PythonPackage): - """This package implements a backport of Python 3.7 contextvars module - (see PEP 567) for Python 3.6.""" - - homepage = "https://github.com/MagicStack/contextvars" - pypi = "contextvars/contextvars-2.4.tar.gz" - - version("2.4", sha256="f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e") - - depends_on("py-setuptools", type="build") - depends_on("py-immutables@0.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cookies/package.py b/var/spack/repos/builtin/packages/py-cookies/package.py deleted file mode 100644 index e21a624586..0000000000 --- a/var/spack/repos/builtin/packages/py-cookies/package.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyCookies(PythonPackage): - """Friendlier RFC 6265-compliant cookie parser/renderer""" - - homepage = "https://github.com/sashahart/cookies" - pypi = "cookies/cookies-2.2.1.tar.gz" - - maintainers = ["dorton21"] - - version("2.2.1", sha256="d6b698788cae4cfa4e62ef8643a9ca332b79bd96cb314294b864ae8d7eb3ee8e") - - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-copulas/package.py b/var/spack/repos/builtin/packages/py-copulas/package.py index b21be243f6..8ebd0c513f 100644 --- a/var/spack/repos/builtin/packages/py-copulas/package.py +++ b/var/spack/repos/builtin/packages/py-copulas/package.py @@ -22,7 +22,6 @@ class PyCopulas(PythonPackage): depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-matplotlib@3.2:3", type=("build", "run")) - depends_on("py-numpy@1.18:1.19", type=("build", "run"), when="^python@3.6") - depends_on("py-numpy@1.20:1", type=("build", "run"), when="^python@3.7:") + depends_on("py-numpy@1.20:1", type=("build", "run")) depends_on("py-pandas@1.1.3:1", type=("build", "run")) depends_on("py-scipy@1.5.4:1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-correctionlib/package.py b/var/spack/repos/builtin/packages/py-correctionlib/package.py index 3e1600bb78..aff3600b09 100644 --- a/var/spack/repos/builtin/packages/py-correctionlib/package.py +++ b/var/spack/repos/builtin/packages/py-correctionlib/package.py @@ -29,9 +29,7 @@ class PyCorrectionlib(PythonPackage): depends_on("py-make", type="build") depends_on("py-pybind11@2.6.1:", type="build") depends_on("py-numpy@1.13.3:", type=("build", "run")) - depends_on("py-typing", type=("build", "run"), when="^python@:3.4") depends_on("py-typing-extensions", type=("build", "run"), when="^python@:3.7") - depends_on("py-dataclasses", type=("build", "run"), when="^python@:3.6") depends_on("py-pydantic@1.7.3:", type=("build", "run")) depends_on("py-rich", type=("build", "run")) depends_on("py-pandas", type=("build", "run"), when="+convert") diff --git a/var/spack/repos/builtin/packages/py-crispresso/package.py b/var/spack/repos/builtin/packages/py-crispresso/package.py deleted file mode 100644 index c89a9a3f97..0000000000 --- a/var/spack/repos/builtin/packages/py-crispresso/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyCrispresso(PythonPackage): - """Software pipeline for the analysis of CRISPR-Cas9 genome editing - outcomes from deep sequencing data.""" - - homepage = "https://github.com/lucapinello/CRISPResso" - pypi = "CRISPResso/CRISPResso-1.0.8.tar.gz" - - version("1.0.8", sha256="b04ac8781ff8ed56d018c357e741f146b72ad7e0d23c9e5bc1e1bcd1a873ebc3") - - depends_on("py-setuptools", type="build") - 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")) - depends_on("py-pandas@0.15:", type=("build", "run")) - depends_on("py-seaborn@0.7.1:", type=("build", "run")) - depends_on("emboss@6:", type=("build", "run")) - depends_on("flash", type=("build", "run")) - depends_on("java", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-crossmap/package.py b/var/spack/repos/builtin/packages/py-crossmap/package.py index 1570c53dc9..a7018d42fc 100644 --- a/var/spack/repos/builtin/packages/py-crossmap/package.py +++ b/var/spack/repos/builtin/packages/py-crossmap/package.py @@ -15,14 +15,10 @@ class PyCrossmap(PythonPackage, SourceforgePackage): version("0.3.9", sha256="e20a4653e9fc313ac0f5a6cfc37b42e83c3cf2b42f9483706cfb9ec9ff72c74c") version("0.3.3", sha256="56d99fd606e13e399b83438953d0d89fc281df1c1e8e47eed7d773e7ec9c88f8") - version("0.2.9", sha256="57243ee5051352c93088874c797ceac0426f249704ba897360fb628b3365d0af") - - depends_on("python@3:", type=("build", "run"), when="@0.3.0:") - depends_on("python@2.7:2.8", type=("build", "run"), when="@:0.2.9") + depends_on("python@3:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-cython@0.17:", type=("build", "run")) depends_on("py-pysam", type=("build", "run")) depends_on("py-bx-python", type=("build", "run")) - - depends_on("py-pybigwig", type=("build", "run"), when="@0.3.0:") + depends_on("py-pybigwig", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cryptography/package.py b/var/spack/repos/builtin/packages/py-cryptography/package.py index 9e61041c44..72ac23ccb0 100644 --- a/var/spack/repos/builtin/packages/py-cryptography/package.py +++ b/var/spack/repos/builtin/packages/py-cryptography/package.py @@ -48,8 +48,6 @@ class PyCryptography(PythonPackage): depends_on("py-six@1.4.1:", type=("build", "run"), when="@:3.3") depends_on("py-idna@2.1:", type=("build", "run"), when="@:2.4") # deprecated depends_on("py-idna@2.1:", type=("build", "run"), when="@2.5: +idna") # deprecated - depends_on("py-enum34", type=("build", "run"), when="^python@:3.4") - depends_on("py-ipaddress", type=("build", "run"), when="^python@:3.3") depends_on("openssl@:1.0", when="@:1.8.1") depends_on("openssl") diff --git a/var/spack/repos/builtin/packages/py-csvkit/package.py b/var/spack/repos/builtin/packages/py-csvkit/package.py index 99335a67d5..a2d3d432c6 100644 --- a/var/spack/repos/builtin/packages/py-csvkit/package.py +++ b/var/spack/repos/builtin/packages/py-csvkit/package.py @@ -18,9 +18,6 @@ class PyCsvkit(PythonPackage): depends_on("py-setuptools", type=("build", "run")) depends_on("py-six@1.6.1:", type=("build", "run")) - depends_on("py-argparse@1.2.1:", type=("build", "run"), when="^python@:2.6,3.0:3.1") - depends_on("py-ordereddict@1.1:", type=("build", "run"), when="^python@:2.6") - depends_on("py-simplejson@3.6.3:", type=("build", "run"), when="^python@:2.6") depends_on("py-python-dateutil@2.2", type=("build", "run"), when="@0.9.1") depends_on("py-dbf@0.94.003", type=("build", "run"), when="@0.9.1") depends_on("py-xlrd@0.7.1:", type=("build", "run"), when="@0.9.1") diff --git a/var/spack/repos/builtin/packages/py-ctgan/package.py b/var/spack/repos/builtin/packages/py-ctgan/package.py index 2d5b36fada..6b1ffdc35f 100644 --- a/var/spack/repos/builtin/packages/py-ctgan/package.py +++ b/var/spack/repos/builtin/packages/py-ctgan/package.py @@ -20,8 +20,7 @@ class PyCtgan(PythonPackage): depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-packaging@20:21", type=("build", "run")) - depends_on("py-numpy@1.18:1.19", type=("build", "run"), when="^python@3.6") - depends_on("py-numpy@1.20:1", type=("build", "run"), when="^python@3.7:") + depends_on("py-numpy@1.20:1", type=("build", "run")) depends_on("py-pandas@1.1.3:1", type=("build", "run")) depends_on("py-scikit-learn@0.24:1", type=("build", "run")) depends_on("py-torch@1.8.0:1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cython/package.py b/var/spack/repos/builtin/packages/py-cython/package.py index 0d170a2fec..fc6f5ccde4 100644 --- a/var/spack/repos/builtin/packages/py-cython/package.py +++ b/var/spack/repos/builtin/packages/py-cython/package.py @@ -38,11 +38,9 @@ class PyCython(PythonPackage): version("0.25.2", sha256="f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306") version("0.23.5", sha256="0ae5a5451a190e03ee36922c4189ca2c88d1df40a89b4f224bc842d388a0d1b6") version("0.23.4", sha256="fec42fecee35d6cc02887f1eef4e4952c97402ed2800bfe41bbd9ed1a0730d8e") - version("0.21.2", sha256="b01af23102143515e6138a4d5e185c2cfa588e0df61c0827de4257bac3393679") depends_on("python@2.7:2,3.4:", when="@3:", type=("build", "link", "run")) - depends_on("python@2.6:2,3.3:", when="@0.23:", type=("build", "link", "run")) - depends_on("python@:2", when="@:0.22", type=("build", "link", "run")) + depends_on("python@2.6:2,3.3:", type=("build", "link", "run")) depends_on("py-setuptools", type=("build", "run")) depends_on("gdb@7.2:", type="test") diff --git a/var/spack/repos/builtin/packages/py-darshan/package.py b/var/spack/repos/builtin/packages/py-darshan/package.py index 217145a7b6..5628269661 100644 --- a/var/spack/repos/builtin/packages/py-darshan/package.py +++ b/var/spack/repos/builtin/packages/py-darshan/package.py @@ -18,7 +18,7 @@ class PyDarshan(PythonPackage): depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-importlib-resources", when="^python@3.6", type=("build", "run")) + depends_on("py-importlib-resources", when="^python@:3.8", type=("build", "run")) depends_on("py-cffi", type=("build", "run")) # NOTE: SciPy is an indirect dependency needed for interpolate usage in pandas # It will be fixed in the next release diff --git a/var/spack/repos/builtin/packages/py-dataclasses/package.py b/var/spack/repos/builtin/packages/py-dataclasses/package.py deleted file mode 100644 index a3de7b2313..0000000000 --- a/var/spack/repos/builtin/packages/py-dataclasses/package.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyDataclasses(PythonPackage): - """A backport of the dataclasses module for Python 3.6""" - - homepage = "https://github.com/ericvsmith/dataclasses" - pypi = "dataclasses/dataclasses-0.7.tar.gz" - - version("0.8", sha256="8479067f342acf957dc82ec415d355ab5edb7e7646b90dc6e2fd1d96ad084c97") - version("0.7", sha256="494a6dcae3b8bcf80848eea2ef64c0cc5cd307ffc263e17cdf42f3e5420808e6") - - 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 58f027a841..3cc420fc6e 100644 --- a/var/spack/repos/builtin/packages/py-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-datasets/package.py @@ -24,7 +24,6 @@ class PyDatasets(PythonPackage): depends_on("py-pandas", type=("build", "run")) depends_on("py-requests@2.19:", 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", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-deepecho/package.py b/var/spack/repos/builtin/packages/py-deepecho/package.py index 25a3273361..19868ce78b 100644 --- a/var/spack/repos/builtin/packages/py-deepecho/package.py +++ b/var/spack/repos/builtin/packages/py-deepecho/package.py @@ -20,8 +20,7 @@ class PyDeepecho(PythonPackage): depends_on("python@3.6:3.9", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-pytest-runner@2.11.1:", type="build") - depends_on("py-numpy@1.18.0:1.19", type=("build", "run"), when="^python@:3.6") - depends_on("py-numpy@1.20.0:1", type=("build", "run"), when="^python@3.7:") + depends_on("py-numpy@1.20.0:1", type=("build", "run")) depends_on("py-pandas@1.1.3:1", type=("build", "run")) depends_on("py-torch@1.8.0:1", type=("build", "run")) depends_on("py-tqdm@4.15:4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-devlib/package.py b/var/spack/repos/builtin/packages/py-devlib/package.py index 607add8985..0357a55023 100644 --- a/var/spack/repos/builtin/packages/py-devlib/package.py +++ b/var/spack/repos/builtin/packages/py-devlib/package.py @@ -28,7 +28,3 @@ class PyDevlib(PythonPackage): depends_on("py-wrapt", type=("build", "run")) 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") - 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 f1e2b436f1..cfe4d3f1c4 100644 --- a/var/spack/repos/builtin/packages/py-distributed/package.py +++ b/var/spack/repos/builtin/packages/py-distributed/package.py @@ -60,7 +60,6 @@ class PyDistributed(PythonPackage): depends_on("py-cloudpickle@1.5.0:", type=("build", "run"), when="@2.21.0:") depends_on("py-jinja2", type=("build", "run"), when="@2022.2.1:") depends_on("py-locket@1:", type=("build", "run"), when="@2022.2.1:") - depends_on("py-contextvars", type=("build", "run"), when="@2020: ^python@:3.6") depends_on("py-msgpack", type=("build", "run"), when="@:2.10.0") depends_on("py-msgpack@0.6.0:", type=("build", "run"), when="@2.11.0:") depends_on("py-packaging@20.0:", type=("build", "run"), when="@2022.2.1:") @@ -79,8 +78,6 @@ class PyDistributed(PythonPackage): depends_on("py-tornado@6.0.3:6.1", type=("build", "run"), when="@2022.10.2:") depends_on("py-zict@0.1.3:", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) - depends_on("py-futures", when="@:1 ^python@2.7:2.8", type=("build", "run")) - depends_on("py-singledispatch", when="@:1 ^python@2.7:2.8", type=("build", "run")) depends_on("py-urllib3", type=("build", "run"), when="@2022.10.2:") def patch(self): diff --git a/var/spack/repos/builtin/packages/py-docker/package.py b/var/spack/repos/builtin/packages/py-docker/package.py index 518b0262c7..29acc0288e 100644 --- a/var/spack/repos/builtin/packages/py-docker/package.py +++ b/var/spack/repos/builtin/packages/py-docker/package.py @@ -20,5 +20,3 @@ class PyDocker(PythonPackage): 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,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-doxypy/package.py b/var/spack/repos/builtin/packages/py-doxypy/package.py deleted file mode 100644 index 849246bd2a..0000000000 --- a/var/spack/repos/builtin/packages/py-doxypy/package.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyDoxypy(PythonPackage): - """doxypy is an input filter for Doxygen.""" - - pypi = "doxypy/doxypy-0.3.tar.gz" - - version("0.3", sha256="55d621b0edebd9e2a58a266c0a1d086fc9892de8e07e04dfbb93880a7ae91f00") - - depends_on("python@:2.8", type=("build", "run")) - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-dp-gp-cluster/package.py b/var/spack/repos/builtin/packages/py-dp-gp-cluster/package.py deleted file mode 100644 index e8a8fefce3..0000000000 --- a/var/spack/repos/builtin/packages/py-dp-gp-cluster/package.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from glob import glob -from os import unlink - -from spack.package import * - - -class PyDpGpCluster(PythonPackage): - """DP_GP_cluster clusters genes by expression over a time course using a - Dirichlet process Gaussian process model.""" - - homepage = "https://github.com/PrincetonUniversity/DP_GP_cluster" - git = "https://github.com/PrincetonUniversity/DP_GP_cluster.git" - - version("2019-09-22", commit="eec12e74219f916aa86e253783905f7b5e30f6f4") - - depends_on("python@2.7:2.8", type=("build", "run")) - - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") - depends_on("py-cython", type="build") - depends_on("py-gpy@0.8.8:0.9.9", type=("build", "run")) - depends_on("py-pandas", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) - depends_on("py-scipy@0.14:", type=("build", "run")) - depends_on("py-matplotlib", type=("build", "run")) - depends_on("py-scikit-learn", type=("build", "run")) - - @run_before("install") - def remove_cython_output(self): - for f in glob("DP_GP/*.c"): - unlink(f) diff --git a/var/spack/repos/builtin/packages/py-dvc/package.py b/var/spack/repos/builtin/packages/py-dvc/package.py index 37a9263cdc..938ab7e87b 100644 --- a/var/spack/repos/builtin/packages/py-dvc/package.py +++ b/var/spack/repos/builtin/packages/py-dvc/package.py @@ -49,7 +49,6 @@ class PyDvc(PythonPackage): 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", 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")) diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py index 8ad9bd6623..73054f9314 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyblocks/package.py @@ -16,12 +16,10 @@ class PyEasybuildEasyblocks(PythonPackage): maintainers = ["boegel"] version("4.0.0", sha256="a0fdef6c33c786e323bde1b28bab942fd8e535c26842877d705e692e85b31b07") - version("3.1.2", sha256="5dcea0d612c5da92815f2c99a591dd2843fe9d76f4c0f4ff4a245d43c39001d8") - depends_on("python@2.6:2.8", when="@:3", type=("build", "run")) depends_on("python@2.6:2.8,3.5:", when="@4:", type=("build", "run")) # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") - for v in ["@3.1.2", "@4.0.0"]: + for v in ["@4.0.0"]: depends_on("py-easybuild-framework" + v, when=v, type="run") diff --git a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py index 772ca5d1b9..9016f15ca7 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-easyconfigs/package.py @@ -16,13 +16,11 @@ class PyEasybuildEasyconfigs(PythonPackage): maintainers = ["boegel"] version("4.0.0", sha256="90d4e8f8abb11e7ae2265745bbd1241cd69d02570e9b4530175c4b2e2aba754e") - version("3.1.2", sha256="621d514bacd9a0a9a3d35b40dcc448533ffc545b2c79f50d303822778bcc4aa5") - depends_on("python@2.6:2.8", when="@:3", type=("build", "run")) depends_on("python@2.6:2.8,3.5:", when="@4:", type=("build", "run")) # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") - for v in ["@3.1.2", "@4.0.0"]: + for v in ["@4.0.0"]: depends_on("py-easybuild-framework{0}:".format(v), when=v + ":", type="run") depends_on("py-easybuild-easyblocks{0}:".format(v), when=v, type="run") diff --git a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py index 1a46adb03c..b5861e07d9 100644 --- a/var/spack/repos/builtin/packages/py-easybuild-framework/package.py +++ b/var/spack/repos/builtin/packages/py-easybuild-framework/package.py @@ -16,9 +16,6 @@ class PyEasybuildFramework(PythonPackage): maintainers = ["boegel"] version("4.0.0", sha256="f5c40345cc8b9b5750f53263ade6c9c3a8cd3dfab488d58f76ac61a8ca7c5a77") - version("3.1.2", sha256="a03598478574e2982587796afdb792d78b598f4c09ebf4bec1a690c06470c00d") - depends_on("python@2.6:2.8", when="@:3", type=("build", "run")) - depends_on("python@2.6:2.8,3.5:", when="@4:", type=("build", "run")) + depends_on("python@2.6:2.8,3.5:", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) - depends_on("py-vsc-base@2.5.4:", when="@2.9:3", type="run") diff --git a/var/spack/repos/builtin/packages/py-entrypoints/package.py b/var/spack/repos/builtin/packages/py-entrypoints/package.py index ab17569a81..8e5ff3c63d 100644 --- a/var/spack/repos/builtin/packages/py-entrypoints/package.py +++ b/var/spack/repos/builtin/packages/py-entrypoints/package.py @@ -20,4 +20,3 @@ class PyEntrypoints(PythonPackage): depends_on("python@2.7:", type=("build", "run")) depends_on("py-flit-core@2:3", when="@0.4:", type="build") depends_on("py-flit", when="@:0.3", type="build") - depends_on("py-configparser@3.5:", when="^python@2.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-enum34/package.py b/var/spack/repos/builtin/packages/py-enum34/package.py deleted file mode 100644 index 602fbec60a..0000000000 --- a/var/spack/repos/builtin/packages/py-enum34/package.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyEnum34(PythonPackage): - """Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4.""" - - homepage = "https://bitbucket.org/stoneleaf/enum34/src" - pypi = "enum34/enum34-1.1.6.tar.gz" - - version("1.1.10", sha256="cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248") - version("1.1.6", sha256="8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1") - - # enum34 is a backport of the enum library from Python 3.4. It is not - # intended to be used with Python 3.4+. In fact, it won't build at all - # for Python 3.6+, as new constructs were added to the builtin enum - # library that aren't present in enum34. See: - # https://bitbucket.org/stoneleaf/enum34/issues/19 - depends_on("python@:3.5", type=("build", "run")) - depends_on("py-ordereddict", when="^python@:2.6", type=("build", "run")) - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-espressopp/package.py b/var/spack/repos/builtin/packages/py-espressopp/package.py index c5f1d7eafb..ae5ad128f4 100644 --- a/var/spack/repos/builtin/packages/py-espressopp/package.py +++ b/var/spack/repos/builtin/packages/py-espressopp/package.py @@ -20,16 +20,6 @@ class PyEspressopp(CMakePackage): version("master", branch="master") version("3.0.0", sha256="63518e768a98179ad5ef3be96eabaa4d38063b34962e2278db7d59ed2bb8a32e") - version( - "2.0.2", - sha256="8cf4525bca06426379f5b9fbb8cc2603f559d28a2e74d1d7694df963b8f3dc6c", - deprecated=True, - ) - version( - "1.9.5", - sha256="8093f1a226f9fee8fb37c401767439a29ff3656dede3a44b4160169fc90d4d91", - deprecated=True, - ) variant("ug", default=False, description="Build user guide") variant("pdf", default=False, description="Build user guide in pdf format") @@ -40,13 +30,11 @@ class PyEspressopp(CMakePackage): depends_on("boost+serialization+filesystem+system+python+mpi cxxstd=11") depends_on("boost+numpy cxxstd=11", when="@master") extends("python") - 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", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) depends_on("py-pyh5md", when="@master", type=("build", "run")) depends_on("py-matplotlib", when="+ug", 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 1bdb3a686e..1df03b31d4 100644 --- a/var/spack/repos/builtin/packages/py-eventlet/package.py +++ b/var/spack/repos/builtin/packages/py-eventlet/package.py @@ -16,4 +16,3 @@ 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") diff --git a/var/spack/repos/builtin/packages/py-fasteners/package.py b/var/spack/repos/builtin/packages/py-fasteners/package.py index 3184dc9306..8ff4409402 100644 --- a/var/spack/repos/builtin/packages/py-fasteners/package.py +++ b/var/spack/repos/builtin/packages/py-fasteners/package.py @@ -20,6 +20,5 @@ class PyFasteners(PythonPackage): depends_on("python@3.6:", when="@0.17:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-monotonic@0.1:", when="@0.16 ^python@:3.3", type=("build", "run")) depends_on("py-monotonic@0.1:", when="@:0.15", type=("build", "run")) depends_on("py-six", when="@:0.16", type=("build", "run")) 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 ac4c00b05c..ce2a529fb8 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,6 @@ 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", 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-fiona/package.py b/var/spack/repos/builtin/packages/py-fiona/package.py index a43daa0bb6..60170d7afb 100644 --- a/var/spack/repos/builtin/packages/py-fiona/package.py +++ b/var/spack/repos/builtin/packages/py-fiona/package.py @@ -38,6 +38,3 @@ class PyFiona(PythonPackage): depends_on("py-six@1.7:", type=("build", "run")) depends_on("py-munch", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) - depends_on("py-argparse", type=("build", "run"), when="^python@:2.6,3.0:3.1") - depends_on("py-ordereddict", type=("build", "run"), when="^python@:2.6") - depends_on("py-enum34", type=("build", "run"), when="^python@:3.3") diff --git a/var/spack/repos/builtin/packages/py-fire/package.py b/var/spack/repos/builtin/packages/py-fire/package.py index f7b5a6215a..4812f95a0a 100644 --- a/var/spack/repos/builtin/packages/py-fire/package.py +++ b/var/spack/repos/builtin/packages/py-fire/package.py @@ -22,4 +22,3 @@ class PyFire(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-six", type=("build", "run")) depends_on("py-termcolor", type=("build", "run")) - depends_on("py-enum34", type=("build", "run"), when="@0.3.0: ^python@:3.3") diff --git a/var/spack/repos/builtin/packages/py-flake8-import-order/package.py b/var/spack/repos/builtin/packages/py-flake8-import-order/package.py index fb183f2de2..492ab12643 100644 --- a/var/spack/repos/builtin/packages/py-flake8-import-order/package.py +++ b/var/spack/repos/builtin/packages/py-flake8-import-order/package.py @@ -14,6 +14,5 @@ class PyFlake8ImportOrder(PythonPackage): version("0.18.1", sha256="a28dc39545ea4606c1ac3c24e9d05c849c6e5444a50fb7e9cdd430fc94de6e92") - depends_on("py-enum34", when="^python@:2", type=("build", "run")) depends_on("py-pycodestyle", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-flake8/package.py b/var/spack/repos/builtin/packages/py-flake8/package.py index a4a3d08366..4d8f98d893 100644 --- a/var/spack/repos/builtin/packages/py-flake8/package.py +++ b/var/spack/repos/builtin/packages/py-flake8/package.py @@ -87,10 +87,6 @@ class PyFlake8(PythonPackage): depends_on("py-importlib-metadata", when="@3.8:3.9.2 ^python@:3.7", type=("build", "run")) depends_on("py-importlib-metadata@:4.2", when="@4: ^python@:3.7", type=("build", "run")) depends_on("py-importlib-metadata@1.1:4.2", when="@5.0.4: ^python@:3.7", type=("build", "run")) - depends_on("py-enum34", when="@3: ^python@:3.3", type=("build", "run")) - depends_on("py-typing", when="@3.7: ^python@:3.4", type=("build", "run")) - depends_on("py-configparser", when="@3: ^python@:3.1", type=("build", "run")) - depends_on("py-functools32", when="@3.7.4: ^python@:3.1", type=("build", "run")) @when("@:3.5") def patch(self): diff --git a/var/spack/repos/builtin/packages/py-flye/package.py b/var/spack/repos/builtin/packages/py-flye/package.py index 03aa8ef0a5..3db39a9bbe 100644 --- a/var/spack/repos/builtin/packages/py-flye/package.py +++ b/var/spack/repos/builtin/packages/py-flye/package.py @@ -20,11 +20,9 @@ class PyFlye(PythonPackage): version("2.7", sha256="4d595f53bd68c820b43509ce6ee7284847237e70a3b4bc16c57170bb538d3947") version("2.7.1", sha256="0e826261c81537a7fa8fd37dc583edd75535eee0f30429d6bdb55f37b5722dbb") version("2.6", sha256="5bdc44b84712794fa4264eed690d8c65c0d72f495c7bbf2cd15b634254809131") - version("2.4.2", sha256="5b74d4463b860c9e1614ef655ab6f6f3a5e84a7a4d33faf3b29c7696b542c51a") # https://github.com/fenderglass/Flye/blob/flye/docs/INSTALL.md - depends_on("python@2.7:2.8,3.5:", when="@2.6:", type=("build", "run")) - depends_on("python@2.7:2.8", when="@:2.5", type=("build", "run")) + depends_on("python@2.7:2.8,3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("gmake", type="build") depends_on("zlib") diff --git a/var/spack/repos/builtin/packages/py-fortran-language-server/package.py b/var/spack/repos/builtin/packages/py-fortran-language-server/package.py index 54e5b63c14..d52b4f7251 100644 --- a/var/spack/repos/builtin/packages/py-fortran-language-server/package.py +++ b/var/spack/repos/builtin/packages/py-fortran-language-server/package.py @@ -19,6 +19,4 @@ class PyFortranLanguageServer(PythonPackage): version("1.11.1", sha256="8f03782dd992d6652a3f2d349115fdad3aa3464fee3fafbbc4f8ecf780166e3c") depends_on("python@2.7:", type=("build", "run")) - depends_on("py-future", type=("build", "run"), when="^python@:2") - depends_on("py-argparse", type=("build", "run"), when="^python@:2.6,3.0:3.1") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-freezegun/package.py b/var/spack/repos/builtin/packages/py-freezegun/package.py index efd1da67dd..ba053492e0 100644 --- a/var/spack/repos/builtin/packages/py-freezegun/package.py +++ b/var/spack/repos/builtin/packages/py-freezegun/package.py @@ -17,5 +17,4 @@ class PyFreezegun(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-six", type=("build", "run")) - 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:") + depends_on("py-python-dateutil@2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fs/package.py b/var/spack/repos/builtin/packages/py-fs/package.py index d77a93e7af..d4046e20b9 100644 --- a/var/spack/repos/builtin/packages/py-fs/package.py +++ b/var/spack/repos/builtin/packages/py-fs/package.py @@ -20,6 +20,3 @@ class PyFs(PythonPackage): depends_on("py-appdirs@1.4.3:1.4", type=("build", "run")) depends_on("py-pytz", type=("build", "run")) depends_on("py-six@1.10:1", type=("build", "run")) - depends_on("py-enum34@1.1.6:1.1", type=("build", "run"), when="^python@:3.3") - depends_on("py-typing@3.6:3", type=("build", "run"), when="^python@:3.5") - depends_on("py-backports-os@0.1:0", type=("build", "run"), when="^python@:2") diff --git a/var/spack/repos/builtin/packages/py-funcsigs/package.py b/var/spack/repos/builtin/packages/py-funcsigs/package.py deleted file mode 100644 index 3e798349da..0000000000 --- a/var/spack/repos/builtin/packages/py-funcsigs/package.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyFuncsigs(PythonPackage): - """Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2.""" - - pypi = "funcsigs/funcsigs-1.0.2.tar.gz" - - version("1.0.2", sha256="a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50") - version("0.4", sha256="d83ce6df0b0ea6618700fe1db353526391a8a3ada1b7aba52fed7a61da772033") - - depends_on("py-setuptools@17.1:", type="build") diff --git a/var/spack/repos/builtin/packages/py-functools32/package.py b/var/spack/repos/builtin/packages/py-functools32/package.py deleted file mode 100644 index dd8bdb9d51..0000000000 --- a/var/spack/repos/builtin/packages/py-functools32/package.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyFunctools32(PythonPackage): - """Backport of the functools module from Python 3.2.3 for use on 2.7 and - PyPy.""" - - homepage = "https://github.com/MiCHiLU/python-functools32" - pypi = "functools32/functools32-3.2.3-2.tar.gz" - - version("3.2.3-2", sha256="f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d") - - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-future/package.py b/var/spack/repos/builtin/packages/py-future/package.py index 8e21bdd447..10ed3f4b15 100644 --- a/var/spack/repos/builtin/packages/py-future/package.py +++ b/var/spack/repos/builtin/packages/py-future/package.py @@ -19,8 +19,6 @@ class PyFuture(PythonPackage): version("0.15.2", sha256="3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97") depends_on("py-setuptools", type="build") - depends_on("py-importlib", type=("build", "run"), when="^python@:2.6") - depends_on("py-argparse", type=("build", "run"), when="^python@:2.6,3.0:3.1") @property def import_modules(self): diff --git a/var/spack/repos/builtin/packages/py-futures/package.py b/var/spack/repos/builtin/packages/py-futures/package.py deleted file mode 100644 index 81dad1bb8e..0000000000 --- a/var/spack/repos/builtin/packages/py-futures/package.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyFutures(PythonPackage): - """Backport of the concurrent.futures package from Python 3.2""" - - pypi = "futures/futures-3.0.5.tar.gz" - - version("3.3.0", sha256="7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794") - version("3.2.0", sha256="9ec02aa7d674acb8618afb127e27fde7fc68994c0437ad759fa094a574adb265") - version("3.0.5", sha256="0542525145d5afc984c88f914a0c85c77527f65946617edb5274f72406f981df") - - depends_on("py-setuptools", type=("build", "run")) - depends_on("python@2.6:2.8", type=("build", "run")) 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 3ce81530f8..28ef3d041c 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,6 @@ 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", 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 80e17a45a1..1b5484d002 100644 --- a/var/spack/repos/builtin/packages/py-gdbgui/package.py +++ b/var/spack/repos/builtin/packages/py-gdbgui/package.py @@ -13,14 +13,12 @@ class PyGdbgui(PythonPackage): pypi = "gdbgui/gdbgui-0.11.2.1.tar.gz" version("0.13.2.0", sha256="80e347a08b8cc630ab9f68482a1ed92c844fbfde46dc21fd39f3e6ef14b72e54") - version("0.11.2.1", sha256="280945a37414c31a798f68f70c1bffbedd12dfb0ce77418357e7d42b667491c7") depends_on("py-setuptools", 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-pygdbmi@0.9.0.0:0", type=("build", "run")) 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-geeup/package.py b/var/spack/repos/builtin/packages/py-geeup/package.py index 42b0f9f345..661c6a6d91 100644 --- a/var/spack/repos/builtin/packages/py-geeup/package.py +++ b/var/spack/repos/builtin/packages/py-geeup/package.py @@ -27,8 +27,6 @@ class PyGeeup(PythonPackage): depends_on("py-google-cloud-storage@1.1.1:", type=("build", "run")) depends_on("py-selenium@3.13.0:", type=("build", "run")) depends_on("py-pysmartdl", type=("build", "run")) - depends_on("py-pysmartdl@1.2.5", type=("build", "run"), when="^python@:3.3") - depends_on("py-pysmartdl@1.3.1:", type=("build", "run"), when="^python@3.4:") - depends_on("py-pathlib@1.0.1:", when="^python@:3.3", type=("build", "run")) + depends_on("py-pysmartdl@1.3.1:", type=("build", "run")) depends_on("py-lxml@4.1.1:", type=("build", "run")) depends_on("py-oauth2client@4.1.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-gemini/package.py b/var/spack/repos/builtin/packages/py-gemini/package.py deleted file mode 100644 index 2c87ac36ff..0000000000 --- a/var/spack/repos/builtin/packages/py-gemini/package.py +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyGemini(PythonPackage): - """GEMINI (GEnome MINIng) is a flexible framework for exploring genetic - variation in the context of the wealth of genome annotations available - for the human genome. - """ - - homepage = "https://gemini.readthedocs.org" - url = "https://github.com/arq5x/gemini/archive/v0.30.2.tar.gz" - - maintainers = ["robqiao"] - - version("0.30.2", sha256="c7af06a4cc475a846aeeb3cd7fcfb39d6cdd0b76e3b07abab2e5e6e68a3fe431") - version("0.30.1", sha256="af835ca33bc6d7865def2467c34cb1d539ec542f9514044435bd2252b25a046d") - version("0.30.0", sha256="a55d0c77342bf650f7e1300cb6ba485407ea3b42f4137a5197248d397a026030") - version("0.20.1", sha256="cd84aa45ace7a9ffb13ba4176122eab5b9fcc0445b1c0944ecec017f88f2b7f1") - version("0.20.0", sha256="640b40186fa00f54c1a0cdfab3fc3076b1d3bdf5c6327fcb2a0c51aa1b05878b") - version("0.19.1", sha256="1154bcb48b1bc78819c5a5e710f5cb0747b01fa0f3113e6081a5a2747c8703e5") - version("0.19.0", sha256="5146d1b5ed52139c50473aa3625d8df29f2db6d198cfd2c966469e7d585cccf2") - version("0.18.3", sha256="7c2f99069385547c656021fbb43e0bae4f9fb8a56ad3f6a61235b44fbc1ba6eb") - version("0.18.2", sha256="cf8a83d48d966a800aa2569076d52c307f4d8264a6ae804c176d61e705c0017e") - version("0.18.1", sha256="1d3d3b9d47555e1f62c1a870d8fd2ecbfc0bed25910cab31af5b585db3144a68") - - depends_on("python@2.5:2.8", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("tabix", type=("build", "run")) - depends_on("grabix", type=("build", "run")) - depends_on("bedtools2", type=("build", "run")) - - depends_on("py-numpy@1.7.1:", type=("build", "run")) - depends_on("py-inheritance@0.1.3:", type=("build", "run")) - depends_on("py-geneimpacts@0.1.3:", type=("build", "run")) - depends_on("py-cython@0.22.1:", type=("build", "run")) - depends_on("py-sqlalchemy@1:", type=("build", "run")) - depends_on("py-pysam@0.6:", type=("build", "run")) - depends_on("py-cyvcf2@0.7.2:", type=("build", "run")) - depends_on("py-pyyaml@3.10:", type=("build", "run")) - depends_on("py-pybedtools@0.6.2:", type=("build", "run")) - depends_on("py-jinja2@2.7.1:", type=("build", "run")) - depends_on("py-networkx@1.10:", type=("build", "run")) - depends_on("py-bottle@0.11.6:", type=("build", "run")) - depends_on("py-ipyparallel@4.0:", type=("build", "run")) - 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", 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")) - depends_on("py-bcolz@0.11.3:", type=("build", "run")) - depends_on("py-numexpr@2.4.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-genshi/package.py b/var/spack/repos/builtin/packages/py-genshi/package.py index 31f0b57136..50c2d584b4 100644 --- a/var/spack/repos/builtin/packages/py-genshi/package.py +++ b/var/spack/repos/builtin/packages/py-genshi/package.py @@ -12,25 +12,10 @@ class PyGenshi(PythonPackage): pypi = "Genshi/Genshi-0.7.7.tar.gz" version("0.7.7", sha256="c100520862cd69085d10ee1a87e91289e7f59f6b3d9bd622bf58b2804e6b9aab") - version("0.7", sha256="1d154402e68bc444a55bcac101f96cb4e59373100cc7a2da07fbf3e5cc5d7352") - version("0.6.1", sha256="fed947f11dbcb6792bb7161701ec3b9804055ad68c8af0ab4f0f9b25e9a18dbd") - version("0.6", sha256="32aaf76a03f88efa04143bf80700399e6d84eead818fdd19d763fd76af972a4b") - # Unfortunately, upstream's versioning scheme neglected the trailing zero - # x.x.0 which means that the spec @:0.7 also includes @0.7.7 which in a few - # cases below is not what we want. Therefore explicitly use @0.7.0 to deal - # with this ambiguity. - # - # Older version of python before support for Py_UNICODE->str in genshi/_speedup.c - depends_on("python@:3.2", when="@:0.7.0", type=("build", "run")) depends_on("py-setuptools", type="build") - # setup.py of 0.7 uses setup(features = ...) which was removed in - # setuptools 46.0.0. - depends_on("py-setuptools@:45", type="build", when="@:0.7.0") depends_on("py-six", type=("build", "run", "test")) - # Suite of unittests added in 0.6.1. - @when("@0.6.1:") def test(self): # All the unittests pass for py-genshi@0.7.7 but 14 tests fail for # @0.6.1:0.7, many of them related to templates, likely because the diff --git a/var/spack/repos/builtin/packages/py-gensim/package.py b/var/spack/repos/builtin/packages/py-gensim/package.py index b93e9c3fa0..eb8101f8b6 100644 --- a/var/spack/repos/builtin/packages/py-gensim/package.py +++ b/var/spack/repos/builtin/packages/py-gensim/package.py @@ -23,15 +23,11 @@ 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", type=("build", "run")) - depends_on("py-numpy@1.11.3:", when="^python@3:", type=("build", "run")) + depends_on("py-numpy@1.11.3:", 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-scipy@0.18.1:", type=("build", "run")) depends_on("py-six@1.5.0:", 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", 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")) + depends_on("py-smart-open@1.7.0:", when="@3.8.0", type=("build", "run")) + depends_on("py-smart-open@1.8.1:", when="@3.8.1:", type=("build", "run")) 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 7f03b9da84..835c6bf6f6 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 @@ -26,4 +26,3 @@ class PyGoogleApiCore(PythonPackage): 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")) - depends_on("py-futures@3.2.0:", type=("build", "run"), when="^python@:3.1") diff --git a/var/spack/repos/builtin/packages/py-google-auth/package.py b/var/spack/repos/builtin/packages/py-google-auth/package.py index b8a1eada8e..bd423883db 100644 --- a/var/spack/repos/builtin/packages/py-google-auth/package.py +++ b/var/spack/repos/builtin/packages/py-google-auth/package.py @@ -23,10 +23,8 @@ class PyGoogleAuth(PythonPackage): depends_on("py-setuptools@40.3.0:", when="@2.3.2:", type="build") depends_on("py-pyasn1-modules@0.2.1:", type=("build", "run")) depends_on("py-rsa@3.1.4:", type=("build", "run")) - depends_on("py-rsa@3.1.4:4", when="@2.3.2: ^python@3.6:", type=("build", "run")) - depends_on("py-rsa@:4.5", when="@2.3.2: ^python@:3.5", type=("build", "run")) + depends_on("py-rsa@3.1.4:4", when="@2.3.2:", type=("build", "run")) depends_on("py-six@1.9.0:", type=("build", "run")) depends_on("py-cachetools@2.0.0:", type=("build", "run")) depends_on("py-cachetools@2.0.0:4", when="@2.3.2:2.3", type=("build", "run")) depends_on("py-cachetools@2.0.0:5", when="@2.11.0:", type=("build", "run")) - depends_on("py-enum34@1.1.10:", when="@2.3.2: ^python@:3.3", 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 b8842ac8c2..294be4b805 100644 --- a/var/spack/repos/builtin/packages/py-gosam/package.py +++ b/var/spack/repos/builtin/packages/py-gosam/package.py @@ -23,18 +23,11 @@ class PyGosam(Package): url="https://github.com/gudrunhe/gosam/releases/download/2.1.1/gosam-2.1.1-4b98559.tar.gz", sha256="4a2b9160d51e3532025b9579a4d17d0e0f8a755b8481aeb8271c1f58eb97ab01", ) - version( - "2.0.4", - sha256="faf621c70f66d9dffc16ac5cce66258067f39f686d722a4867eeb759fcde4f44", - url="https://gosam.hepforge.org/downloads/?f=gosam-2.0.4-6d9f1cba.tar.gz", - ) - version("2.0.3", tag="v2.0.3", commit="4146ab23a06b7c57c10fb36df60758d34aa58387") depends_on("form", type="run") depends_on("qgraf", type="run") depends_on("gosam-contrib", type="link") - 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:") + depends_on("python@3:", type=("build", "run")) def setup_run_environment(self, env): gosam_contrib_lib_dir = self.spec["gosam-contrib"].prefix.lib diff --git a/var/spack/repos/builtin/packages/py-gpustat/package.py b/var/spack/repos/builtin/packages/py-gpustat/package.py index e4b065e62f..aa264dbc4b 100644 --- a/var/spack/repos/builtin/packages/py-gpustat/package.py +++ b/var/spack/repos/builtin/packages/py-gpustat/package.py @@ -23,11 +23,9 @@ class PyGpustat(PythonPackage): depends_on("python@3.4:", when="@1.0.0:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-pytest-runner", when="@0.6.0", type="build") - depends_on("py-pytest-runner@5:", when="@1: ^python@3.5:", type="build") - depends_on("py-pytest-runner@:4", when="@1: ^python@:3.4", type="build") + depends_on("py-pytest-runner@5:", when="@1:", type="build") depends_on("py-six@1.7:", type=("build", "run")) - depends_on("py-nvidia-ml-py@7.352.0:", when="^python@:2", type=("build", "run")) - depends_on("py-nvidia-ml-py3@7.352.0:", when="^python@3:", type=("build", "run")) + depends_on("py-nvidia-ml-py3@7.352.0:", type=("build", "run")) depends_on("py-psutil", type=("build", "run")) depends_on("py-blessings@1.6:", when="@0.6.0", type=("build", "run")) depends_on("py-blessed@1.17.1:", when="@1.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-grpcio/package.py b/var/spack/repos/builtin/packages/py-grpcio/package.py index 4c7984f1bb..368c67fc9f 100644 --- a/var/spack/repos/builtin/packages/py-grpcio/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio/package.py @@ -39,8 +39,6 @@ class PyGrpcio(PythonPackage): depends_on("python@2.7:2.8,3.5:", type=("build", "link", "run")) depends_on("py-setuptools", type="build") depends_on("py-six@1.5.2:", type=("build", "run")) - depends_on("py-futures@2.2.0:", when="^python@:3.1", type=("build", "run")) - depends_on("py-enum34@1.0.4:", when="^python@:3.3", type=("build", "run")) depends_on("py-cython@0.23:", type="build") depends_on("openssl") depends_on("zlib") diff --git a/var/spack/repos/builtin/packages/py-gsi/package.py b/var/spack/repos/builtin/packages/py-gsi/package.py deleted file mode 100644 index 19e86779d3..0000000000 --- a/var/spack/repos/builtin/packages/py-gsi/package.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyGsi(PythonPackage): - """Python interface for GSI authentication""" - - homepage = "https://github.com/DIRACGrid/pyGSI" - pypi = "gsi/GSI-0.6.5.tar.gz" - - version("0.6.5", sha256="8291dd2fab2be12626272629f7f9661487c4e29f1f9ab8c61614c54b06cb0643") - - 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-h11/package.py b/var/spack/repos/builtin/packages/py-h11/package.py index 4f08be37df..14981bdd38 100644 --- a/var/spack/repos/builtin/packages/py-h11/package.py +++ b/var/spack/repos/builtin/packages/py-h11/package.py @@ -21,5 +21,4 @@ class PyH11(PythonPackage): depends_on("py-setuptools", type="build") depends_on("python@3.6:", type=("build", "run"), when="@0.12.0:") - depends_on("py-dataclasses", type=("build", "run"), when="@0.13: ^python@:3.6") depends_on("py-typing-extensions", type=("build", "run"), when="@0.13: ^python@:3.7") diff --git a/var/spack/repos/builtin/packages/py-h2/package.py b/var/spack/repos/builtin/packages/py-h2/package.py index 24e2fa2d78..cccaa40185 100644 --- a/var/spack/repos/builtin/packages/py-h2/package.py +++ b/var/spack/repos/builtin/packages/py-h2/package.py @@ -22,4 +22,3 @@ class PyH2(PythonPackage): depends_on("py-hyperframe@6.0:6", type=("build", "run"), when="@4.0.0:") depends_on("py-hpack@3.0:3", type=("build", "run"), when="@3.2.0") depends_on("py-hpack@4.0:4", type=("build", "run"), when="@4.0.0:") - depends_on("py-enum34@1.1.6:1", type=("build", "run"), when="@3.2.0^python@2.7.0:2.7") diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index c7418b9085..77e69efc58 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -52,7 +52,6 @@ class PyH5py(PythonPackage): # Build and runtime dependencies 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: ^python@3.6.0:3.6") depends_on("py-numpy@1.14.5:", type=("build", "run"), when="@3: ^python@3.7.0:3.7") depends_on("py-numpy@1.17.5:", type=("build", "run"), when="@3: ^python@3.8.0:3.8") depends_on("py-numpy@1.19.3:", type=("build", "run"), when="@3: ^python@3.9.0:") diff --git a/var/spack/repos/builtin/packages/py-hatch-vcs/package.py b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py index 2252c3d5d0..105635097c 100644 --- a/var/spack/repos/builtin/packages/py-hatch-vcs/package.py +++ b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py @@ -15,5 +15,4 @@ class PyHatchVcs(PythonPackage): version("0.2.0", sha256="9913d733b34eec9bb0345d0626ca32165a4ad2de15d1ce643c36d09ca908abff") depends_on("py-hatchling@0.21.0:", type=("build", "run")) - depends_on("py-setuptools-scm@6.4.0:", when="^python@3:", type=("build", "run")) - depends_on("py-setuptools-scm@:5", when="^python@:2", type=("build", "run")) + depends_on("py-setuptools-scm@6.4.0:", 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 ef3c1415b2..63a6c9ffe8 100644 --- a/var/spack/repos/builtin/packages/py-horovod/package.py +++ b/var/spack/repos/builtin/packages/py-horovod/package.py @@ -87,7 +87,6 @@ class PyHorovod(PythonPackage, CudaPackage): depends_on("py-psutil", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) depends_on("py-six", type=("build", "run"), when="@:0.19") - depends_on("py-dataclasses", type=("build", "run"), when="@0.20: ^python@:3.6") depends_on("py-packaging", type=("build", "run"), when="@0.26:") # Framework dependencies diff --git a/var/spack/repos/builtin/packages/py-hpcbench/package.py b/var/spack/repos/builtin/packages/py-hpcbench/package.py deleted file mode 100644 index 748b663f63..0000000000 --- a/var/spack/repos/builtin/packages/py-hpcbench/package.py +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyHpcbench(PythonPackage): - """Define and run your benchmarks""" - - homepage = "https://github.com/BlueBrain/hpcbench" - - pypi = "hpcbench/hpcbench-0.8.tar.gz" - git = "https://github.com/BlueBrain/hpcbench.git" - - version("master", branch="master") - version("0.8", sha256="120f5b1e6ff05a944b34a910f3099b4b0f50e96c60cf550b8fc6c42f64194697") - - depends_on("py-setuptools", type="build") - depends_on("py-setuptools-scm@1.15.6", type="build") - depends_on("py-cached-property@1.3.1:", type=("build", "run")) - 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.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")) - depends_on("py-pyyaml@3.12:", type=("build", "run")) - depends_on("py-python-magic@0.4.15", type=("build", "run")) - depends_on("py-six@1.11", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hpccm/package.py b/var/spack/repos/builtin/packages/py-hpccm/package.py index e2678cb15f..0b149d2665 100644 --- a/var/spack/repos/builtin/packages/py-hpccm/package.py +++ b/var/spack/repos/builtin/packages/py-hpccm/package.py @@ -16,5 +16,4 @@ class PyHpccm(PythonPackage): version("19.2.0", sha256="c60eec914a802b0a76596cfd5fdf7122d3f8665fcef06ef928323f5dfb5219a6") depends_on("py-setuptools", type=("build", "run")) - depends_on("py-enum34", type=("build", "run")) depends_on("py-six", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-httpx/package.py b/var/spack/repos/builtin/packages/py-httpx/package.py index 5dc0f85788..91f5f42a65 100644 --- a/var/spack/repos/builtin/packages/py-httpx/package.py +++ b/var/spack/repos/builtin/packages/py-httpx/package.py @@ -23,7 +23,6 @@ class PyHttpx(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-certifi", type=("build", "run")) depends_on("py-charset-normalizer", type=("build", "run"), when="@0.22.0:") - depends_on("py-async-generator", type=("build", "run"), when="@0.22.0:^python@:3.6") depends_on("py-httpcore@0.11.0:0.11", type=("build", "run"), when="@0.15.2") depends_on("py-httpcore@0.14.5:0.14", type=("build", "run"), when="@0.22.0:") diff --git a/var/spack/repos/builtin/packages/py-humanfriendly/package.py b/var/spack/repos/builtin/packages/py-humanfriendly/package.py index adb4aef2d3..b6f1a55425 100644 --- a/var/spack/repos/builtin/packages/py-humanfriendly/package.py +++ b/var/spack/repos/builtin/packages/py-humanfriendly/package.py @@ -17,4 +17,3 @@ class PyHumanfriendly(PythonPackage): depends_on("python@2.7:2.8,3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-monotonic", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hyperlink/package.py b/var/spack/repos/builtin/packages/py-hyperlink/package.py index 1792ecad18..6ff275967e 100644 --- a/var/spack/repos/builtin/packages/py-hyperlink/package.py +++ b/var/spack/repos/builtin/packages/py-hyperlink/package.py @@ -17,4 +17,3 @@ class PyHyperlink(PythonPackage): depends_on("python@2.6:2,3.4:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-idna@2.5:", type=("build", "run")) - depends_on("py-typing", when="^python@:3.4", 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 4e791e4fe6..a3ba7cad35 100644 --- a/var/spack/repos/builtin/packages/py-hypothesis/package.py +++ b/var/spack/repos/builtin/packages/py-hypothesis/package.py @@ -26,7 +26,6 @@ class PyHypothesis(PythonPackage): depends_on("py-attrs@19.2.0:", when="@4.38.2:", type=("build", "run")) 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", type=("build", "run"), when="@4.57.1:") depends_on("py-django@2.2:", type="run", when="+django") diff --git a/var/spack/repos/builtin/packages/py-imgaug/package.py b/var/spack/repos/builtin/packages/py-imgaug/package.py index f93d83a9aa..e538056303 100644 --- a/var/spack/repos/builtin/packages/py-imgaug/package.py +++ b/var/spack/repos/builtin/packages/py-imgaug/package.py @@ -27,5 +27,4 @@ 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", type=("build", "run")) - depends_on("opencv+python3", when="^python@3:", type=("build", "run")) + depends_on("opencv+python3", 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 c267ec391b..4dbadf29f4 100644 --- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py @@ -37,7 +37,3 @@ class PyImportlibMetadata(PythonPackage): depends_on("py-zipp@0.5:", type=("build", "run")) depends_on("py-typing-extensions@3.6.4:", when="@3: ^python@:3.7", type=("build", "run")) - - 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")) diff --git a/var/spack/repos/builtin/packages/py-importlib-resources/package.py b/var/spack/repos/builtin/packages/py-importlib-resources/package.py index a0093e4973..dbd1bc4c19 100644 --- a/var/spack/repos/builtin/packages/py-importlib-resources/package.py +++ b/var/spack/repos/builtin/packages/py-importlib-resources/package.py @@ -28,5 +28,3 @@ class PyImportlibResources(PythonPackage): depends_on("py-setuptools-scm@3.4.1:+toml", when="@5:", type="build") depends_on("py-zipp@0.4:", when="@5.0:5.1", type=("build", "run")) depends_on("py-zipp@3.1.0:", when="@5.2.2: ^python@:3.9", type=("build", "run")) - depends_on("py-pathlib2", 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-importlib/package.py b/var/spack/repos/builtin/packages/py-importlib/package.py deleted file mode 100644 index 3c976c6347..0000000000 --- a/var/spack/repos/builtin/packages/py-importlib/package.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyImportlib(PythonPackage): - """Packaging for importlib from Python 2.7""" - - homepage = "https://github.com/brettcannon/importlib" - pypi = "importlib/importlib-1.0.4.zip" - - version("1.0.4", sha256="b6ee7066fea66e35f8d0acee24d98006de1a0a8a94a8ce6efe73a9a23c8d9826") - - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-iniparse/package.py b/var/spack/repos/builtin/packages/py-iniparse/package.py index 77cff87810..63698cc911 100644 --- a/var/spack/repos/builtin/packages/py-iniparse/package.py +++ b/var/spack/repos/builtin/packages/py-iniparse/package.py @@ -14,9 +14,7 @@ class PyIniparse(PythonPackage): git = "https://github.com/candlepin/python-iniparse.git" version("master", branch="master") - version("0.4", sha256="abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054") - depends_on("python@2.4:2.8", when="@:0.4", type=("build", "run")) depends_on("python@2.6:2.8,3.3:", when="@master:", type=("build", "run")) # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-installer/package.py b/var/spack/repos/builtin/packages/py-installer/package.py index 456497225f..a00c89ef18 100644 --- a/var/spack/repos/builtin/packages/py-installer/package.py +++ b/var/spack/repos/builtin/packages/py-installer/package.py @@ -16,5 +16,3 @@ class PyInstaller(PythonPackage): depends_on("python@2.7,3.5:", type=("build", "run")) depends_on("py-flit-core@2", type="build") - depends_on("py-configparser@3.5:", when="^python@:2", type=("build", "run")) - depends_on("py-importlib-resources", when="^python@:3.6", 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 6a1ba49b7d..41617c0729 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -81,14 +81,5 @@ class PyIpython(PythonPackage): depends_on("py-traitlets@4.2:", when="@5:", type=("build", "run")) depends_on("py-traitlets", when="@4:", type=("build", "run")) - depends_on( - "py-backports-shutil-get-terminal-size", when="@4.2: ^python@:3.2", type=("build", "run") - ) depends_on("py-black", when="@8.0", type=("build", "run")) - depends_on("py-pathlib2", when="@5: ^python@:3.3", type=("build", "run")) depends_on("py-simplegeneric@0.8:", when="@4:7.0.0", type=("build", "run")) - depends_on( - "py-win-unicode-console@0.5:", - when="@5:7.9 ^python@:3.5 platform=windows", - 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 5925eef0c4..556d5ecff4 100644 --- a/var/spack/repos/builtin/packages/py-ipywidgets/package.py +++ b/var/spack/repos/builtin/packages/py-ipywidgets/package.py @@ -26,7 +26,6 @@ class PyIpywidgets(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-setuptools@40.8.0:", when="@8.0.2:", type="build") depends_on("py-ipython@4:", type=("build", "run")) - depends_on("py-ipython@4:5", when="^python@:3.2", type=("build", "run")) depends_on("py-ipython@6.1.0:", when="@8.0.2:", type=("build", "run")) depends_on("py-ipykernel@4.2.2:", type=("build", "run")) depends_on("py-ipykernel@4.5.1:", when="@6:", type=("build", "run")) @@ -37,7 +36,7 @@ class PyIpywidgets(PythonPackage): depends_on("py-widgetsnbextension@3.5.0:3.5", when="@7.5.1:7.6.5", type=("build", "run")) depends_on("py-widgetsnbextension@3.6", when="@7.7:7", type=("build", "run")) depends_on("py-widgetsnbextension@4.0:4", when="@8.0.2:", type=("build", "run")) - depends_on("py-jupyterlab-widgets@1.0.0:", when="@:7 ^python@3.6:", type=("build", "run")) + depends_on("py-jupyterlab-widgets@1.0.0:", when="@:7", type=("build", "run")) depends_on("py-jupyterlab-widgets@3.0:3", when="@8.0.2:", type=("build", "run")) depends_on("py-ipython-genutils@0.2.0:0.2", when="@7.6.4:7", type=("build", "run")) depends_on("py-nbformat@4.2.0:", when="@6:7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-irpf90/package.py b/var/spack/repos/builtin/packages/py-irpf90/package.py index 2108f0bd56..458fd2dcae 100644 --- a/var/spack/repos/builtin/packages/py-irpf90/package.py +++ b/var/spack/repos/builtin/packages/py-irpf90/package.py @@ -13,11 +13,11 @@ class PyIrpf90(PythonPackage): performance computing.""" homepage = "http://irpf90.ups-tlse.fr" - pypi = "irpf90/irpf90-1.7.7.tar.gz" + pypi = "irpf90/irpf90-2.0.5.tar.gz" maintainers = ["scemama"] - version("1.7.7", sha256="c6b2eecb9180f1feaab9644bbed806637a4a30a0fad2c4775a985fcc01a99530") + version("2.0.5", sha256="ac3b6a6dd50a93537c6068ed459d5ad75919cbd64cdbce870921da713b86ee37") - depends_on("python@2.7.0:2.8", type=("build", "run")) + depends_on("python@3:", 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 b9db988166..c434f8157d 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -24,8 +24,4 @@ class PyIsort(PythonPackage): 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-poetry-core@1:", type="build") - 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 4588cdee5f..53841b799d 100644 --- a/var/spack/repos/builtin/packages/py-itk/package.py +++ b/var/spack/repos/builtin/packages/py-itk/package.py @@ -18,18 +18,6 @@ class PyItk(PythonPackage): if sys.platform == "darwin": # version 5.1.1 version( - "5.1.1-cp35", - url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp35-cp35m-macosx_10_9_x86_64.whl", - sha256="e94d08a142b72b7219c828e7ca34788b59612fc10dbb2c65afd4457e9810eed1", - expand=False, - ) - version( - "5.1.1-cp36", - url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", - sha256="94b3c8d2ceba1685ae7e7f2b3bb88bdcd15dee93d369177eb03f676062f7e06f", - expand=False, - ) - version( "5.1.1-cp37", url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", sha256="f112515483a073fae96d5cfce4eb9f95cbf57a145bbd196b2369a3194e27febf", @@ -43,12 +31,6 @@ class PyItk(PythonPackage): ) # version 5.1.2 version( - "5.1.2-cp36", - url="https://pypi.io/packages/cp36/i/itk/itk-5.1.2-cp36-cp36m-macosx_10_9_x86_64.whl", - sha256="d66f5369768e9449c1bd07210a42e11c565602da1dde3128f554b653a2faaf7b", - expand=False, - ) - version( "5.1.2-cp37", url="https://pypi.io/packages/cp37/i/itk/itk-5.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", sha256="0b494485d05306240eaa5ab1a5e00895fcce8fe684c632c02a2373f36d123902", @@ -69,18 +51,6 @@ class PyItk(PythonPackage): elif sys.platform.startswith("linux"): # version 5.1.1 version( - "5.1.1-cp35", - url="https://pypi.io/packages/cp35/i/itk/itk-5.1.1-cp35-cp35m-manylinux1_x86_64.whl", - sha256="02ba37cda1f4190ca34133e056f9acd5c0104da64455dc9e0cc6bb3eec47f7a6", - expand=False, - ) - version( - "5.1.1-cp36", - url="https://pypi.io/packages/cp36/i/itk/itk-5.1.1-cp36-cp36m-manylinux1_x86_64.whl", - sha256="a7602fe2ee031bf70acf54e1aef6e0e01e9fa821ca1926fc70fe3db9167a50f2", - expand=False, - ) - version( "5.1.1-cp37", url="https://pypi.io/packages/cp37/i/itk/itk-5.1.1-cp37-cp37m-manylinux1_x86_64.whl", sha256="7c313d2e3a3e37b8e78d0b2d70be2d478c87fde6f27912c714c855a05584b8ee", @@ -94,12 +64,6 @@ class PyItk(PythonPackage): ) # version 5.1.2 version( - "5.1.2-cp36", - url="https://pypi.io/packages/cp36/i/itk/itk-5.1.2-cp36-cp36m-manylinux1_x86_64.whl", - sha256="266e031a0656688b815dc60e9abd58e40ec37c9dcd25aa91634ed2b157ca974c", - expand=False, - ) - version( "5.1.2-cp37", url="https://pypi.io/packages/cp37/i/itk/itk-5.1.2-cp37-cp37m-manylinux1_x86_64.whl", sha256="064d9cfdd9547ae3ed850c35b989e0141c4bd434672bc2dd124248aab7bdf09a", @@ -118,8 +82,6 @@ class PyItk(PythonPackage): expand=False, ) - 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")) diff --git a/var/spack/repos/builtin/packages/py-jaraco-functools/package.py b/var/spack/repos/builtin/packages/py-jaraco-functools/package.py index fa259ec0b2..12857597a3 100644 --- a/var/spack/repos/builtin/packages/py-jaraco-functools/package.py +++ b/var/spack/repos/builtin/packages/py-jaraco-functools/package.py @@ -16,6 +16,5 @@ class PyJaracoFunctools(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-setuptools-scm@1.15.0:", type="build") - depends_on("py-backports-functools-lru-cache@1.0.3:", when="^python@:2", type=("build", "run")) depends_on("py-more-itertools", type=("build", "run")) depends_on("python@2.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-jmp/package.py b/var/spack/repos/builtin/packages/py-jmp/package.py index ff9d953526..54d52b5c36 100644 --- a/var/spack/repos/builtin/packages/py-jmp/package.py +++ b/var/spack/repos/builtin/packages/py-jmp/package.py @@ -19,5 +19,4 @@ class PyJmp(PythonPackage): depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-numpy@1.19.5:", type=("build", "run")) - depends_on("py-dataclasses@0.7:", type=("build", "run"), when="^python@:3.6") depends_on("py-jax@0.1.71:", 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 a238401ea8..42c7b2bbd4 100644 --- a/var/spack/repos/builtin/packages/py-jsonschema/package.py +++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py @@ -46,4 +46,3 @@ class PyJsonschema(PythonPackage): depends_on("py-pkgutil-resolve-name@1.3.10:", when="@4.10.0: ^python@:3.8") depends_on("py-six@1.11:", when="@3", type=("build", "run")) - depends_on("py-functools32", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-keyring/package.py b/var/spack/repos/builtin/packages/py-keyring/package.py index 8c29d85bc0..a1b144827f 100644 --- a/var/spack/repos/builtin/packages/py-keyring/package.py +++ b/var/spack/repos/builtin/packages/py-keyring/package.py @@ -35,9 +35,6 @@ class PyKeyring(PythonPackage): depends_on("py-setuptools-scm@1.15:", type="build") depends_on("py-entrypoints", when="@18", type=("build", "run")) depends_on("py-secretstorage@3.2:", when="@21: platform=linux", type=("build", "run")) - depends_on( - "py-secretstorage@:2", when="@18 ^python@:3.4 platform=linux", type=("build", "run") - ) depends_on("py-secretstorage", when="platform=linux", type=("build", "run")) depends_on("py-jeepney@0.4.2:", when="@21: platform=linux", type=("build", "run")) depends_on("py-importlib-metadata@3.6:", when="@23: ^python@:3.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-kubernetes/package.py b/var/spack/repos/builtin/packages/py-kubernetes/package.py index d3fbc2fa50..c0cae0593e 100644 --- a/var/spack/repos/builtin/packages/py-kubernetes/package.py +++ b/var/spack/repos/builtin/packages/py-kubernetes/package.py @@ -37,7 +37,6 @@ class PyKubernetes(PythonPackage): depends_on("py-pyyaml@3.12:", when="@:18.19", type=("build", "run")) depends_on("py-pyyaml@5.4.1:", when="@18.20.0:", type=("build", "run")) depends_on("py-google-auth@1.0.1:", type=("build", "run")) - depends_on("py-ipaddress@1.0.17:", when="^python@:2.8", type=("build", "run")) depends_on("py-websocket-client@0.32:0.39,0.43:", type=("build", "run")) depends_on("py-requests", type=("build", "run")) depends_on("py-requests-oauthlib", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-law/package.py b/var/spack/repos/builtin/packages/py-law/package.py index 3d08793198..0c11cef103 100644 --- a/var/spack/repos/builtin/packages/py-law/package.py +++ b/var/spack/repos/builtin/packages/py-law/package.py @@ -19,5 +19,4 @@ class PyLaw(PythonPackage): depends_on("python@2.7:2,3.3:3", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-six@1.13:", type=("build", "run")) - depends_on("py-luigi@2.8.2:2", type=("build", "run"), when="^python@:2.7") - depends_on("py-luigi@2.8.2:", type=("build", "run"), when="^python@3:") + depends_on("py-luigi@2.8.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-lazyarray/package.py b/var/spack/repos/builtin/packages/py-lazyarray/package.py index 246038cc23..4aac5c2e67 100644 --- a/var/spack/repos/builtin/packages/py-lazyarray/package.py +++ b/var/spack/repos/builtin/packages/py-lazyarray/package.py @@ -28,10 +28,8 @@ class PyLazyarray(PythonPackage): depends_on("python@2.7:3.9", type=("build", "run"), when="@0.3:0.3.4") depends_on("python@3.4:3.9", type=("build", "run"), when="@0.4:0.5.1") depends_on("python@3.6:", type=("build", "run"), when="@0.5.2:") - depends_on("py-numpy@1.3:", type=("build", "run"), when="@:0.2.10^python@:2") - depends_on("py-numpy@1.5:", type=("build", "run"), when="@:0.2.10^python@3:") - depends_on("py-numpy@1.8:", type=("build", "run"), when="@0.3:0.3.4^python@:2") - depends_on("py-numpy@1.12:", type=("build", "run"), when="@0.3:0.5.1^python@3:") + depends_on("py-numpy@1.5:", type=("build", "run"), when="@:0.2.10") + depends_on("py-numpy@1.12:", type=("build", "run"), when="@0.3:0.5.1") depends_on("py-numpy@1.13:", type=("build", "run"), when="@0.5.2:") depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-llnl-sina/package.py b/var/spack/repos/builtin/packages/py-llnl-sina/package.py index d969158b0e..f832d7d61c 100644 --- a/var/spack/repos/builtin/packages/py-llnl-sina/package.py +++ b/var/spack/repos/builtin/packages/py-llnl-sina/package.py @@ -36,7 +36,6 @@ class PyLlnlSina(PythonPackage): # let's remove dependency on orjson patch("no_orjson.patch") depends_on("py-setuptools", type="build") - depends_on("py-enum34", when="^python@:3.3", type=("build", "run")) depends_on("py-ujson", type=("build", "run")) depends_on("py-sqlalchemy", type=("build", "run")) depends_on("py-six", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-llvmlite/package.py b/var/spack/repos/builtin/packages/py-llvmlite/package.py index 55774c6e1a..c087e5e9cf 100644 --- a/var/spack/repos/builtin/packages/py-llvmlite/package.py +++ b/var/spack/repos/builtin/packages/py-llvmlite/package.py @@ -24,14 +24,12 @@ class PyLlvmlite(PythonPackage): version("0.26.0", sha256="13e84fe6ebb0667233074b429fd44955f309dead3161ec89d9169145dbad2ebf") version("0.25.0", sha256="fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025") version("0.23.0", sha256="bc8b1b46274d05b578fe9e980a6d98fa71c8727f6f9ed31d4d8468dce7aa5762") - version("0.20.0", sha256="b2f174848df16bb9195a07fec102110a06d018da736bd9b3570a54d44c797c29") depends_on("py-setuptools", type="build") depends_on("python@3.7:3.10", type=("build", "run"), when="@0.38.0:") depends_on("python@3.7:3.9", type=("build", "run"), when="@0.37") 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") # llvmlite compatibility information taken from https://github.com/numba/llvmlite#compatibility depends_on("llvm@11.0:11~flang", when="@0.37.0:") @@ -52,7 +50,6 @@ class PyLlvmlite(PythonPackage): 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-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py index a6dbe25773..7541ed3fb6 100644 --- a/var/spack/repos/builtin/packages/py-logilab-common/package.py +++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py @@ -18,4 +18,3 @@ class PyLogilabCommon(PythonPackage): extends("python", ignore=r"bin/pytest") depends_on("py-setuptools", type=("build", "run")) depends_on("py-six@1.4.0:", type=("build", "run")) - depends_on("py-unittest2@0.5.1:", type=("build", "run"), when="^python@:2.7") diff --git a/var/spack/repos/builtin/packages/py-luigi/package.py b/var/spack/repos/builtin/packages/py-luigi/package.py index 84c492053b..7b20b51e52 100644 --- a/var/spack/repos/builtin/packages/py-luigi/package.py +++ b/var/spack/repos/builtin/packages/py-luigi/package.py @@ -25,8 +25,6 @@ class PyLuigi(PythonPackage): depends_on("py-setuptools", type="build") - depends_on("py-enum34@1.1.1:", when="^python@:3.3", type=("build", "run")) - 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:") diff --git a/var/spack/repos/builtin/packages/py-lz4/package.py b/var/spack/repos/builtin/packages/py-lz4/package.py index 12acb0ea91..c519405411 100644 --- a/var/spack/repos/builtin/packages/py-lz4/package.py +++ b/var/spack/repos/builtin/packages/py-lz4/package.py @@ -24,4 +24,3 @@ class PyLz4(PythonPackage): depends_on("py-setuptools-scm", type="build") depends_on("py-pkgconfig", type="build") depends_on("lz4@1.7.5:") - depends_on("py-future", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-macs2/package.py b/var/spack/repos/builtin/packages/py-macs2/package.py index a615de4e8f..479dbca4d1 100644 --- a/var/spack/repos/builtin/packages/py-macs2/package.py +++ b/var/spack/repos/builtin/packages/py-macs2/package.py @@ -14,18 +14,12 @@ class PyMacs2(PythonPackage): pypi = "MACS2/MACS2-2.2.4.tar.gz" version("2.2.4", sha256="b131aadc8f5fd94bec35308b821e1f7585def788d2e7c756fc8cac402ffee25b") - version("2.1.4", sha256="e4966d001914320829ab859c7bc8e92c6410aa7bdbddfd00b7625e9a0fb15c97") - version("2.1.3.3", sha256="00959e523f45ed92b8429f55944eca6984623ac008d7cdb488c3ffe59c21984a") - version( - "2.1.1.20160309", sha256="2008ba838f83f34f8e0fddefe2a3a0159f4a740707c68058f815b31ddad53d26" - ) - - depends_on("python@3.5:", when="@2.2:", type=("build", "run")) - depends_on("python@2.7:2.8", when="@:2.1", type=("build", "run")) + + depends_on("python@3.5:", type=("build", "run")) depends_on("py-cython", type="build") # Most Python packages only require py-setuptools as a build dependency. # However, py-macs2 requires py-setuptools during runtime as well. depends_on("py-setuptools", type=("build", "run")) - depends_on("py-numpy@1.17:", when="@2.2:", type=("build", "run")) + depends_on("py-numpy@1.17:", type=("build", "run")) depends_on("py-numpy@1.16:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-maestrowf/package.py b/var/spack/repos/builtin/packages/py-maestrowf/package.py index 5fe5b4f395..5bde6a016c 100644 --- a/var/spack/repos/builtin/packages/py-maestrowf/package.py +++ b/var/spack/repos/builtin/packages/py-maestrowf/package.py @@ -49,11 +49,8 @@ class PyMaestrowf(PythonPackage): depends_on("py-cryptography@:2", type=("build")) depends_on("py-pyyaml@4.2:", type=("build", "run")) depends_on("py-six", type=("build", "run")) - depends_on("py-enum34", type=("build", "run"), when="^python@:3.3") - depends_on("py-enum34", type=("build", "run"), when="@:1.1.3") depends_on("py-tabulate", type=("build", "run"), when="@1.1.0:") depends_on("py-filelock", type=("build", "run"), when="@1.1.0:") depends_on("py-coloredlogs", type=("build", "run"), when="@1.1.7:") - depends_on("py-chainmap", type=("build", "run"), when="@1.1.7: ^python@:2") depends_on("py-dill", type=("build", "run"), when="@1.1.7:") depends_on("py-jsonschema@3.2.0:", type=("build", "run"), when="@1.1.7:") diff --git a/var/spack/repos/builtin/packages/py-markdown/package.py b/var/spack/repos/builtin/packages/py-markdown/package.py index d3246d01e3..b7b1d9b347 100644 --- a/var/spack/repos/builtin/packages/py-markdown/package.py +++ b/var/spack/repos/builtin/packages/py-markdown/package.py @@ -20,26 +20,12 @@ class PyMarkdown(PythonPackage): version("3.4.1", sha256="3b809086bb6efad416156e00a0da66fe47618a5d6918dd688f53f40c8e4cfeff") version("3.3.4", sha256="31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49") version("3.1.1", sha256="2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") - version("2.6.11", sha256="a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81") - version("2.6.7", sha256="daebf24846efa7ff269cfde8c41a48bb2303920c7b2c7c5e04fa82e6282d05c0") - version("2.6.6", sha256="9a292bb40d6d29abac8024887bcfc1159d7a32dc1d6f1f6e8d6d8e293666c504") - version("2.6.5", sha256="8d94cf6273606f76753fcb1324623792b3738c7612c2b180c85cc5e88642e560") - version("2.6.4", sha256="e436eee7aaf2a230ca3315034dd39e8a0fc27036708acaa3dd70625ec62a94ce") - version("2.6.3", sha256="ad75fc03c45492eba3bc63645e1e6465f65523a05fff0abf36910f810465a9af") - version("2.6.2", sha256="ee17d0d7dc091e645dd48302a2e21301cc68f188505c2069d8635f94554170bf") - version("2.6.1", sha256="b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1") - version("2.6", sha256="e1c8a489bb7c7154bc5a8c14f0fd1fc356ee36c8b9988f9fd8febff22dd435da") - version("2.5.2", sha256="284e97e56db9ada03ede9c0ed2870ca6590ce7869f3119104d53510debf1533d") - version("2.5.1", sha256="8f81ed12c18608a502828acb7d318f362c42f4eca97d01e93cadfc52c1e40b73") - version("2.5", sha256="6ba74a1e7141c9603750d80711b639a7577bffb785708e6260090239ee5bc76d") - - depends_on("python@2.7:2.8,3.2:3.4", when="@:2.6.7", type=("build", "run")) - depends_on("python@2.7:2.8,3.2:3.6", when="@2.6.8:2.6.11", type=("build", "run")) - depends_on("python@2.7:2.8,3.3.5:", when="@3.1.1:", type=("build", "run")) + + depends_on("python@2.7:2.8,3.3.5:", type=("build", "run")) depends_on("python@3.6:", when="@3.3.4:", type=("build", "run")) depends_on("python@3.7:", when="@3.4.1:", type=("build", "run")) - depends_on("py-setuptools", when="@2.6.11:", type="build") - depends_on("py-setuptools@36.6:", when="@3.1:", type="build") + depends_on("py-setuptools", type="build") + depends_on("py-setuptools@36.6:", type="build") depends_on("py-importlib-metadata", when="@3.3.4: ^python@:3.7", type=("build", "run")) depends_on("py-importlib-metadata@4.4:", when="@3.4.1: ^python@:3.9", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 04548fd89c..0c0e12d64b 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -162,14 +162,9 @@ class PyMatplotlib(PythonPackage): depends_on("py-setuptools", type=("build", "run")) # Historical dependencies - depends_on( - "py-backports-functools-lru-cache", type=("build", "run"), when="@2.1.0:2 ^python@:2" - ) - depends_on("py-functools32", type=("build", "run"), when="@:2.0 ^python@:2.7") depends_on("py-pytz", type=("build", "run"), when="@:2") depends_on("py-six@1.10.0:", type=("build", "run"), when="@2") depends_on("py-six@1.9.0:", type=("build", "run"), when="@:1") - depends_on("py-subprocess32", type=("build", "run"), when="^python@:2.7") # Optional dependencies # Backends diff --git a/var/spack/repos/builtin/packages/py-memprof/package.py b/var/spack/repos/builtin/packages/py-memprof/package.py index 2dbc723365..d018c9dd09 100644 --- a/var/spack/repos/builtin/packages/py-memprof/package.py +++ b/var/spack/repos/builtin/packages/py-memprof/package.py @@ -17,5 +17,4 @@ class PyMemprof(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-cython", type="build") - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) depends_on("py-matplotlib", 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 c77ea6dfcf..8d3ced5870 100644 --- a/var/spack/repos/builtin/packages/py-merlin/package.py +++ b/var/spack/repos/builtin/packages/py-merlin/package.py @@ -27,7 +27,6 @@ class PyMerlin(PythonPackage): 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", 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", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-methylcode/package.py b/var/spack/repos/builtin/packages/py-methylcode/package.py deleted file mode 100644 index 891bd19bbf..0000000000 --- a/var/spack/repos/builtin/packages/py-methylcode/package.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyMethylcode(PythonPackage): - """MethylCoder is a single program that takes of bisulfite-treated - reads and outputs per-base methylation data.""" - - homepage = "https://github.com/brentp/methylcode" - git = "https://github.com/brentp/methylcode.git" - - version("master", branch="master") - - depends_on("python@2.6:2.8", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-numpy") - depends_on("py-pyfasta") - depends_on("py-bsddb3") - depends_on("bowtie") diff --git a/var/spack/repos/builtin/packages/py-mikado/package.py b/var/spack/repos/builtin/packages/py-mikado/package.py index bd0bd80cd4..082cd535c6 100644 --- a/var/spack/repos/builtin/packages/py-mikado/package.py +++ b/var/spack/repos/builtin/packages/py-mikado/package.py @@ -39,4 +39,3 @@ class PyMikado(PythonPackage): depends_on("py-ujson", type=("build", "run")) depends_on("py-simplejson", type=("build", "run")) depends_on("python@3.4:", type=("build", "run")) - depends_on("py-typing", when="^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mixedhtseq/package.py b/var/spack/repos/builtin/packages/py-mixedhtseq/package.py deleted file mode 100644 index 88f042ffce..0000000000 --- a/var/spack/repos/builtin/packages/py-mixedhtseq/package.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -import glob - -from spack.package import * - - -class PyMixedhtseq(PythonPackage): - """HTSeq for mixed single and paired end reads""" - - homepage = "https://github.com/schae234/MixedHTSeq" - url = "https://github.com/schae234/MixedHTSeq/archive/v0.1.0.tar.gz" - - version("0.1.0", sha256="234689c8743ae2ba7ad13bc1809a5248184a4b8d16112d5413e09164ab67e157") - - depends_on("python@2.5:2.8", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) - depends_on("py-htseq", type=("build", "run")) - depends_on("py-ipython", type=("build", "run")) - depends_on("py-pandas", type=("build", "run")) - - depends_on("py-setuptools", type="build") - - @run_after("install") - def install_scripts(self): - shebang = "#!{0}\n".format(self.spec["python"].command) - - for fname in glob.glob("scripts/*.py"): - filter_file("^#!.*", "", fname) - with open(fname, "r") as orig: - fdata = orig.read() - with open(fname, "w") as new: - new.write(shebang + fdata) - set_executable(fname) - - mkdirp(self.prefix.bin) - install_tree("scripts", self.prefix.bin) diff --git a/var/spack/repos/builtin/packages/py-ml-collections/package.py b/var/spack/repos/builtin/packages/py-ml-collections/package.py index 6ffdf59e6a..3997cc0fed 100644 --- a/var/spack/repos/builtin/packages/py-ml-collections/package.py +++ b/var/spack/repos/builtin/packages/py-ml-collections/package.py @@ -22,5 +22,3 @@ class PyMlCollections(PythonPackage): depends_on("py-absl-py", type=("build", "run")) depends_on("py-six", type=("build", "run")) depends_on("py-contextlib2", type=("build", "run")) - depends_on("py-dataclasses", type=("build", "run"), when="^python@:3.6") - depends_on("py-typing", type=("build", "run"), when="^python@:3.4") diff --git a/var/spack/repos/builtin/packages/py-mock/package.py b/var/spack/repos/builtin/packages/py-mock/package.py index 71f96cd586..f214ba26af 100644 --- a/var/spack/repos/builtin/packages/py-mock/package.py +++ b/var/spack/repos/builtin/packages/py-mock/package.py @@ -25,4 +25,3 @@ class PyMock(PythonPackage): depends_on("py-setuptools@17.1:", type="build") depends_on("py-pbr@1.3:", type=("build"), when="@:2") depends_on("py-six@1.9:", type=("build", "run"), when="@:2") - depends_on("py-funcsigs@1:", type=("build", "run"), when="^python@:3.2") diff --git a/var/spack/repos/builtin/packages/py-motmetrics/package.py b/var/spack/repos/builtin/packages/py-motmetrics/package.py index 6b69579969..d78a50fbb8 100644 --- a/var/spack/repos/builtin/packages/py-motmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-motmetrics/package.py @@ -21,7 +21,6 @@ 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", 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-mouseinfo/package.py b/var/spack/repos/builtin/packages/py-mouseinfo/package.py index cc3aa61b30..0f7151ca5d 100644 --- a/var/spack/repos/builtin/packages/py-mouseinfo/package.py +++ b/var/spack/repos/builtin/packages/py-mouseinfo/package.py @@ -22,17 +22,9 @@ class PyMouseinfo(PythonPackage): # rubicon-objc;platform_system=="Darwin"', # 'python3-Xlib;platform_system=="Linux" and python_version>="3.0"', - # 'Xlib;platform_system=="Linux" and python_version<"3.0"', # Conflicting until rubicon-objc exists conflicts("platform=darwin") - depends_on("py-python3-xlib", when="^python@3 platform=linux", type=("build", "run")) - depends_on("py-python-xlib", when="^python@2 platform=linux", type=("build", "run")) + depends_on("py-python3-xlib", when="platform=linux", type=("build", "run")) depends_on("py-pyperclip", type=("build", "run")) - depends_on("pil@5.2.0:", when="^python@3.7:", type=("build", "run")) - depends_on("pil@4.0.0:", when="^python@3.6", type=("build", "run")) - depends_on("pil@3.2.0:", when="^python@3.5", type=("build", "run")) - depends_on("pil@2.5.0:5.4.1", when="^python@3.4", type=("build", "run")) - depends_on("pil@2.0.0:4.3.0", when="^python@3.3", type=("build", "run")) - depends_on("pil@2.0.0:3.4.2", when="^python@3.2", type=("build", "run")) - depends_on("pil@2.0.0:", when="^python@2.7", type=("build", "run")) + depends_on("pil@5.2.0:", 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 94bed0f6c0..ec5ca289a0 100644 --- a/var/spack/repos/builtin/packages/py-moviepy/package.py +++ b/var/spack/repos/builtin/packages/py-moviepy/package.py @@ -22,9 +22,8 @@ class PyMoviepy(PythonPackage): depends_on("py-setuptools", type="build") 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-imageio@2.5:2", type=("build", "run")) + depends_on("py-imageio-ffmpeg@0.2.0:", 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", 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 4caa801b6d..bc54176698 100644 --- a/var/spack/repos/builtin/packages/py-mpi4py/package.py +++ b/var/spack/repos/builtin/packages/py-mpi4py/package.py @@ -33,7 +33,6 @@ class PyMpi4py(PythonPackage): depends_on("py-setuptools@40.9:", type="build") depends_on("mpi") depends_on("py-cython@0.27.0:", when="@master", type="build") - depends_on("py-3to2", when="@3.1: ^python@:2", type="build") @when("@3.1:") def install_options(self, spec, prefix): 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 d0d88160b1..55361541a6 100644 --- a/var/spack/repos/builtin/packages/py-msal-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-msal-extensions/package.py @@ -22,4 +22,3 @@ class PyMsalExtensions(PythonPackage): depends_on("py-setuptools", type="build") 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-msrest/package.py b/var/spack/repos/builtin/packages/py-msrest/package.py index 69b16ed5cd..8e5fe99bed 100644 --- a/var/spack/repos/builtin/packages/py-msrest/package.py +++ b/var/spack/repos/builtin/packages/py-msrest/package.py @@ -21,5 +21,3 @@ class PyMsrest(PythonPackage): 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")) - depends_on("py-enum34@1.0.4:", when="^python@:3.3", type=("build", "run")) - depends_on("py-typing", when="^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index db431b7f34..4914e3dfa1 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -44,5 +44,3 @@ class PyMultiqc(PythonPackage): depends_on("py-simplejson", type=("build", "run")) depends_on("py-spectra@0.0.10:", type=("build", "run"), when="@1.5:") depends_on("py-spectra", type=("build", "run")) - depends_on("py-enum34", type=("build", "run"), when="@1.4:1.5 ^python@:3.3") - depends_on("py-enum34", type=("build", "run"), when="@1.3") diff --git a/var/spack/repos/builtin/packages/py-mypy-extensions/package.py b/var/spack/repos/builtin/packages/py-mypy-extensions/package.py index 8a26824d89..c60ca97164 100644 --- a/var/spack/repos/builtin/packages/py-mypy-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-mypy-extensions/package.py @@ -16,4 +16,3 @@ class PyMypyExtensions(PythonPackage): version("0.4.3", sha256="2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8") depends_on("py-setuptools", type="build") - depends_on("py-typing@3.5.3:", when="^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mypy/package.py b/var/spack/repos/builtin/packages/py-mypy/package.py index 154eddeb7b..c69ff31fde 100644 --- a/var/spack/repos/builtin/packages/py-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-mypy/package.py @@ -63,7 +63,6 @@ class PyMypy(PythonPackage): depends_on("python@3.4:", type=("build", "run")) # Historical dependencies - depends_on("py-typing@3.5.3:", when="@:0.699 ^python@:3.4", type=("build", "run")) depends_on("py-toml", when="@0.900:0.910", type=("build", "run")) # https://github.com/python/mypy/issues/13627 diff --git a/var/spack/repos/builtin/packages/py-nara-wpe/package.py b/var/spack/repos/builtin/packages/py-nara-wpe/package.py index 6b7c676103..62b53cfaa7 100644 --- a/var/spack/repos/builtin/packages/py-nara-wpe/package.py +++ b/var/spack/repos/builtin/packages/py-nara-wpe/package.py @@ -20,7 +20,6 @@ class PyNaraWpe(PythonPackage): version("0.0.7", sha256="7aa2edd5261e5d953e584e69a9233d60fc588fc8a4b7886c3ce43cc8ac8cd99b") depends_on("py-setuptools", type="build") - depends_on("py-pathlib2", type=("build", "run"), when="^python@2") depends_on("py-numpy", type=("build", "run")) depends_on("py-tqdm", type=("build", "run")) depends_on("py-soundfile", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nbclient/package.py b/var/spack/repos/builtin/packages/py-nbclient/package.py index 02b5c9c361..b2e44825e5 100644 --- a/var/spack/repos/builtin/packages/py-nbclient/package.py +++ b/var/spack/repos/builtin/packages/py-nbclient/package.py @@ -28,7 +28,6 @@ class PyNbclient(PythonPackage): depends_on("py-jupyter-client@6.1.5:", type=("build", "run")) depends_on("py-nbformat@5.0:", type=("build", "run")) depends_on("py-async-generator", type=("build", "run"), when="@0.5.0") - depends_on("py-async-generator", type=("build", "run"), when="@0.5.5: ^python@:3.6") depends_on("py-nest-asyncio", type=("build", "run")) depends_on("py-traitlets@5.2.2:", when="@0.6:", type=("build", "run")) depends_on("py-traitlets@5:", when="@0.5.13:", 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 50dac8c12e..639e667140 100644 --- a/var/spack/repos/builtin/packages/py-nbconvert/package.py +++ b/var/spack/repos/builtin/packages/py-nbconvert/package.py @@ -64,7 +64,6 @@ class PyNbconvert(PythonPackage): depends_on("py-traitlets@5:", when="@6.2.0:", type=("build", "run")) depends_on("py-entrypoints", when="@:6", type=("build", "run")) depends_on("py-entrypoints@0.2.2:", when="@5:6", type=("build", "run")) - depends_on("py-pycurl", when="^python@:2.7.8", type="build") depends_on("py-testpath", when="@5:6.4", type=("build", "run")) # https://bugs.gentoo.org/720870 diff --git a/var/spack/repos/builtin/packages/py-nbmake/package.py b/var/spack/repos/builtin/packages/py-nbmake/package.py index a07a45a5df..11755e570d 100644 --- a/var/spack/repos/builtin/packages/py-nbmake/package.py +++ b/var/spack/repos/builtin/packages/py-nbmake/package.py @@ -29,7 +29,6 @@ class PyNbmake(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-poetry-core@1:", type="build") - depends_on("py-pathlib@1.0.1:1", when="@:0.8 ^python@:3.3", type=("build", "run")) depends_on("py-pydantic@1.7.2:1", type=("build", "run")) depends_on("py-pytest@6.1.0:", when="@1.2.1:", type=("build", "run")) depends_on("py-pytest@6.1.0:6", when="@0.10:1.2.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-netaddr/package.py b/var/spack/repos/builtin/packages/py-netaddr/package.py index ebb128d8f8..2dd9c38d8b 100644 --- a/var/spack/repos/builtin/packages/py-netaddr/package.py +++ b/var/spack/repos/builtin/packages/py-netaddr/package.py @@ -18,5 +18,3 @@ class PyNetaddr(PythonPackage): depends_on("python@2.7:2.8,3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") - - depends_on("py-importlib-resources", when="^python@:3.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-netcdf4/check_hdf5version.patch b/var/spack/repos/builtin/packages/py-netcdf4/check_hdf5version.patch deleted file mode 100644 index c2c3bd025c..0000000000 --- a/var/spack/repos/builtin/packages/py-netcdf4/check_hdf5version.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -275,7 +275,7 @@ HDF5_DIR environment variable not set, checking some standard locations ..\n""") - for direc in dirstosearch: - sys.stdout.write('checking %s ...\n' % direc) - hdf5_version = check_hdf5version(os.path.join(direc, 'include')) -- if hdf5_version is None or hdf5_version[1:6] < '1.8.0': -+ if hdf5_version is None or [int(c) for c in hdf5_version[1:-1].split('.')] < [1, 8, 0]: - continue - else: - HDF5_dir = direc -@@ -290,7 +290,7 @@ HDF5_DIR environment variable not set, checking some standard locations ..\n""") - hdf5_version = check_hdf5version(HDF5_incdir) - if hdf5_version is None: - raise ValueError('did not find HDF5 headers in %s' % HDF5_incdir) -- elif hdf5_version[1:6] < '1.8.0': -+ elif [int(c) for c in hdf5_version[1:-1].split('.')] < [1, 8, 0]: - raise ValueError('HDF5 version >= 1.8.0 is required') - - if netCDF4_incdir is None and netCDF4_dir is None: diff --git a/var/spack/repos/builtin/packages/py-netcdf4/package.py b/var/spack/repos/builtin/packages/py-netcdf4/package.py index 84b197ad25..635c12db30 100644 --- a/var/spack/repos/builtin/packages/py-netcdf4/package.py +++ b/var/spack/repos/builtin/packages/py-netcdf4/package.py @@ -17,24 +17,19 @@ class PyNetcdf4(PythonPackage): version("1.5.8", sha256="ca3d468f4812c0999df86e3f428851fb0c17ac34ce0827115c246b0b690e4e84") version("1.5.3", sha256="2a3ca855848f4bbf07fac366da77a681fcead18c0a8813d91d46302f562dc3be") version("1.4.2", sha256="b934af350459cf9041bcdf5472e2aa56ed7321c018d918e9f325ec9a1f9d1a30") - version("1.2.7", sha256="0c449b60183ee06238a8f9a75de7b0eed3acaa7a374952ff9f1ff06beb8f94ba") - version("1.2.3.1", sha256="55edd74ef9aabb1f7d1ea3ffbab9c555da2a95632a97f91c0242281dc5eb919f") variant("mpi", default=True, description="Parallel IO support") - depends_on("python@:3.6", when="@:1.2.4", type=("build", "link", "run")) - depends_on("python@2.6:2.7,3.3:3.6", when="@1.2.5:1.2.7", type=("build", "link", "run")) depends_on("python@2.6:2.7,3.3:", when="@1.2.8:1.5.1", type=("build", "link", "run")) depends_on("python@2.7,3.5:", when="@1.5.2:1.5.3", type=("build", "link", "run")) depends_on("python@3.6:", when="@1.5.4:", type=("build", "link", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-setuptools@18:", when="@1.2.9:", type="build") - depends_on("py-cython@0.19:", when="@1.2.8:", type="build") + depends_on("py-setuptools@18:", type="build") + depends_on("py-cython@0.19:", type="build") depends_on("py-numpy@1.7:", type=("build", "link", "run")) depends_on("py-numpy@1.9:", when="@1.5.4:", type=("build", "link", "run")) - depends_on("py-cftime", when="@1.4:", type=("build", "run")) + depends_on("py-cftime", type=("build", "run")) depends_on("py-mpi4py", when="+mpi", type=("build", "run")) depends_on("netcdf-c", when="-mpi") @@ -50,10 +45,6 @@ class PyNetcdf4(PythonPackage): # following patch disables the usage of pkg-config at all. patch("disable_pkgconf.patch") - # Older versions of the package get a false negative result when checking - # the version of HDF5. - patch("check_hdf5version.patch", when="@:1.2.9 ^hdf5@1.10:") - def setup_build_environment(self, env): """Ensure installed netcdf and hdf5 libraries are used""" # Explicitly set these variables so setup.py won't erroneously pick up diff --git a/var/spack/repos/builtin/packages/py-nibabel/package.py b/var/spack/repos/builtin/packages/py-nibabel/package.py index e473880118..c2079bd2be 100644 --- a/var/spack/repos/builtin/packages/py-nibabel/package.py +++ b/var/spack/repos/builtin/packages/py-nibabel/package.py @@ -27,4 +27,3 @@ class PyNibabel(PythonPackage): depends_on("py-packaging@17:", when="@4:", type=("build", "run")) depends_on("py-packaging@14.3:", when="@3.1:", type=("build", "run")) depends_on("py-six@1.3:", when="@:2.5", type=("build", "run")) - depends_on("py-bz2file", when="@:2.5 ^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-nipype/package.py b/var/spack/repos/builtin/packages/py-nipype/package.py index b283b2cfc5..ef83105203 100644 --- a/var/spack/repos/builtin/packages/py-nipype/package.py +++ b/var/spack/repos/builtin/packages/py-nipype/package.py @@ -26,8 +26,6 @@ class PyNipype(PythonPackage): depends_on("py-networkx@1.9:", type=("build", "run")) depends_on("py-nibabel@2.1:", type=("build", "run")) depends_on("py-numpy@1.15.3:", when="^python@3.7:", type=("build", "run")) - depends_on("py-numpy@1.13:", when="@1.5: ^python@:3.6", type=("build", "run")) - depends_on("py-numpy@1.12:", when="^python@:3.6", type=("build", "run")) depends_on("py-packaging", type=("build", "run")) depends_on("py-prov@1.5.2:", type=("build", "run")) depends_on("py-pydot@1.2.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-niworkflows/package.py b/var/spack/repos/builtin/packages/py-niworkflows/package.py index d5a92b259d..db4dda8ed3 100644 --- a/var/spack/repos/builtin/packages/py-niworkflows/package.py +++ b/var/spack/repos/builtin/packages/py-niworkflows/package.py @@ -26,8 +26,7 @@ class PyNiworkflows(PythonPackage): depends_on("py-setuptools@30.4.0:", type="build") depends_on("py-attrs", when="@1.1.4:", type=("build", "run")) depends_on("py-jinja2", type=("build", "run")) - depends_on("py-matplotlib@2.2.0:", when="^python@3.6:", type=("build", "run")) - depends_on("py-matplotlib@2.2.0:3.1", when="^python@:3.5", type=("build", "run")) + depends_on("py-matplotlib@2.2.0:", type=("build", "run")) depends_on("py-nibabel@3.0.1:", when="@1.1.6:", type=("build", "run")) depends_on("py-nibabel@2.4.1:", type=("build", "run")) depends_on("py-nilearn@0.2.6:0.4,0.5.2:", 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 d45ea8e3b2..6f2ad5e245 100644 --- a/var/spack/repos/builtin/packages/py-nose2/package.py +++ b/var/spack/repos/builtin/packages/py-nose2/package.py @@ -19,4 +19,3 @@ 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") 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 52c729ce58..760f59b811 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,3 @@ 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") diff --git a/var/spack/repos/builtin/packages/py-numba/package.py b/var/spack/repos/builtin/packages/py-numba/package.py index 00d525be70..7bf4764f0c 100644 --- a/var/spack/repos/builtin/packages/py-numba/package.py +++ b/var/spack/repos/builtin/packages/py-numba/package.py @@ -20,7 +20,6 @@ class PyNumba(PythonPackage): version("0.50.1", sha256="89e81b51b880f9b18c82b7095beaccc6856fcf84ba29c4f0ced42e4e5748a3a7") version("0.48.0", sha256="9d21bc77e67006b5723052840c88cc59248e079a907cc68f1a1a264e1eaba017") version("0.40.1", sha256="52d046c13bcf0de79dbfb936874b7228f141b9b8e3447cc35855e9ad3e12aa33") - version("0.35.0", sha256="11564937757605bee590c5758c73cfe9fd6d569726b56d970316a6228971ecc3") depends_on("python@3.7:3.10", type=("build", "run"), when="@0.55.0:") depends_on("python@3.7:3.9", type=("build", "run"), when="@0.54") @@ -29,7 +28,6 @@ class PyNumba(PythonPackage): # set upper bound for python the same as newer release depends_on("python@3.6:3.8", type=("build", "run"), when="@0.48:0.51") 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.18:1.22", type=("build", "run"), when="@0.55.2:") depends_on("py-numpy@1.18:1.21", type=("build", "run"), when="@0.55.0:0.55.1") depends_on("py-numpy@1.17:1.20", type=("build", "run"), when="@0.54") @@ -47,11 +45,6 @@ class PyNumba(PythonPackage): depends_on("py-llvmlite@0.25", type=("build", "run"), when="@0.40") 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,3.0:3.1") - 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 conflicts("^llvm@6.0.0") diff --git a/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py b/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py index 672b15a8f9..1266be24d9 100644 --- a/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py +++ b/var/spack/repos/builtin/packages/py-numpy-quaternion/package.py @@ -31,5 +31,3 @@ class PyNumpyQuaternion(PythonPackage): depends_on("py-numpy@1.13:", type=("build", "run")) depends_on("py-scipy", type=("build", "run"), when="+scipy") depends_on("py-numba", type=("build", "run"), when="+numba") - depends_on("py-numba@:0.48", type=("build", "run"), when="+numba^python@:3.5") - depends_on("py-llvmlite@:0.31", type=("build", "run"), when="+numba^python@:3.5") diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch deleted file mode 100644 index 83f2be5d82..0000000000 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py ---- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900 -+++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 18:42:47.672297372 +0900 -@@ -0,0 +1,40 @@ -+from numpy.distutils.fcompiler import FCompiler -+ -+compilers = ['FujitsuFCompiler'] -+ -+class FujitsuFCompiler(FCompiler): -+ compiler_type = 'fujitsu' -+ description = 'Fujitsu Fortran Compiler' -+ -+ possible_executables = ['frt'] -+ version_pattern = r'frt \(FRT\) (?P<version>[a-z\d.]+)' -+ # $ frt --version -+ # frt (FRT) x.x.x yyyymmdd -+ -+ executables = { -+ 'version_cmd' : ["<F77>", "--version"], -+ 'compiler_f77' : ["frt", "-Fixed"], -+ 'compiler_fix' : ["frt", "-Fixed"], -+ 'compiler_f90' : ["frt"], -+ 'linker_so' : ["frt", "-shared"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : ["ranlib"] -+ } -+ pic_flags = ['-KPIC'] -+ module_dir_switch = '-M' -+ module_include_switch = '-I' -+ -+ def get_flags_opt(self): -+ return ['-O3'] -+ def get_flags_debug(self): -+ return ['-g'] -+ def runtime_library_dir_option(self, dir): -+ return '-Wl,-rpath=%s' %dir -+ def get_libraries(self): -+ return ['fj90f', 'fj90i', 'fjsrcinfo'] -+ -+if __name__ == '__main__': -+ from distutils import log -+ from numpy.distutils import customized_fcompiler -+ log.set_verbosity(2) -+ print(customized_fcompiler('fujitsu').get_version()) -diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py ---- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:43:18.112443626 +0900 -+++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:44:54.062904636 +0900 -@@ -709,7 +709,7 @@ - 'intelvem', 'intelem')), - ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')), - ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', -- 'intele', 'intelem', 'gnu', 'g95', 'pathf95')), -+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'fujitsu')), - ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), - ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), - ('irix.*', ('mips', 'gnu', 'gnu95',)), diff --git a/var/spack/repos/builtin/packages/py-numpy/check_executables5.patch b/var/spack/repos/builtin/packages/py-numpy/check_executables5.patch deleted file mode 100644 index 4ae9fe4009..0000000000 --- a/var/spack/repos/builtin/packages/py-numpy/check_executables5.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- spack-src/numpy/distutils/fcompiler/__init__.py.orig 2017-09-29 13:31:46.000000000 +0900 -+++ spack-src/numpy/distutils/fcompiler/__init__.py 2021-02-12 18:06:12.001479417 +0900 -@@ -322,7 +322,12 @@ - if not exe_from_environ: - possibles = [f90, f77] + self.possible_executables - else: -- possibles = [exe_from_environ] + self.possible_executables -+ matching_executables = [] -+ for e in exe_from_environ: -+ for p in self.possible_executables: -+ if p in e: -+ matching_executables.append(e) -+ possibles = [matching_executables] + self.possible_executables - - seen = set() - unique_possibles = [] diff --git a/var/spack/repos/builtin/packages/py-numpy/package.py b/var/spack/repos/builtin/packages/py-numpy/package.py index 6787c4c55c..cc36bc84a8 100644 --- a/var/spack/repos/builtin/packages/py-numpy/package.py +++ b/var/spack/repos/builtin/packages/py-numpy/package.py @@ -83,24 +83,10 @@ class PyNumpy(PythonPackage): version("1.14.2", sha256="facc6f925c3099ac01a1f03758100772560a0b020fb9d70f210404be08006bcb") version("1.14.1", sha256="fa0944650d5d3fb95869eaacd8eedbd2d83610c85e271bd9d3495ffa9bc4dc9c") version("1.14.0", sha256="3de643935b212307b420248018323a44ec51987a336d1d747c1322afc3c099fb") - version("1.13.3", sha256="36ee86d5adbabc4fa2643a073f93d5504bdfed37a149a3a49f4dde259f35a750") - version("1.13.1", sha256="c9b0283776085cb2804efff73e9955ca279ba4edafd58d3ead70b61d209c4fbb") - version("1.13.0", sha256="dcff367b725586830ff0e20b805c7654c876c2d4585c0834a6049502b9d6cf7e") - version("1.12.1", sha256="a65266a4ad6ec8936a1bc85ce51f8600634a31a258b722c9274a80ff189d9542") - version("1.12.0", sha256="ff320ecfe41c6581c8981dce892fe6d7e69806459a899e294e4bf8229737b154") - version("1.11.3", sha256="2e0fc5248246a64628656fe14fcab0a959741a2820e003bd15538226501b82f7") - version("1.11.2", sha256="c1ed4d1d2a795409c7df1eb4bfee65c0e3326cfc7c57875fa39e5c7414116d9a") - version("1.11.1", sha256="4e9c289b9d764d10353a224a5286dda3e0425b13b112719bdc3e9864ae648d79") - version("1.11.0", sha256="9109f260850627e4b83a3c4bcef4f2f99357eb4a5eaae75dec51c32f3c197aa3") - version("1.10.4", sha256="8ce443dc79656a9fc97a7837f1444d324aef2c9b53f31f83441f57ad1f1f3659") - version("1.9.3", sha256="baa074bb1c7f9c822122fb81459b7caa5fc49267ca94cca69465c8dcfd63ac79") - version("1.9.2", sha256="e37805754f4ebb575c434d134f6bebb8b857d9843c393f6943c7be71ef57311c") - version("1.9.1", sha256="2a545c0d096d86035b12160fcba5e4c0a08dcabbf902b4f867eb64deb31a2b7a") variant("blas", default=True, description="Build with BLAS support") variant("lapack", default=True, description="Build with LAPACK support") - depends_on("python@2.7:2.8,3.4:3.6", type=("build", "link", "run"), when="@:1.13") depends_on("python@2.7:2.8,3.4:3.8", type=("build", "link", "run"), when="@1.14:1.15") depends_on("python@2.7:2.8,3.5:3.9", type=("build", "link", "run"), when="@1.16") depends_on("python@3.5:3.9", type=("build", "link", "run"), when="@1.17:1.18") @@ -130,13 +116,11 @@ class PyNumpy(PythonPackage): patch("add_fj_compiler.patch", when="@1.19.3:1.19.5%fj") patch("add_fj_compiler2.patch", when="@1.19.0:1.19.2%fj") patch("add_fj_compiler3.patch", when="@1.14.0:1.18.5%fj") - patch("add_fj_compiler4.patch", when="@:1.13.3%fj") patch("check_executables.patch", when="@1.20.0:") patch("check_executables2.patch", when="@1.19.0:1.19.5") patch("check_executables3.patch", when="@1.16.0:1.18.5") patch("check_executables4.patch", when="@1.14.0:1.15.4") - patch("check_executables5.patch", when="@:1.13.3") # Backport bug fix for f2py's define for threading when building with Mingw patch( diff --git a/var/spack/repos/builtin/packages/py-omegaconf/package.py b/var/spack/repos/builtin/packages/py-omegaconf/package.py index b55cf8975d..17354d808d 100644 --- a/var/spack/repos/builtin/packages/py-omegaconf/package.py +++ b/var/spack/repos/builtin/packages/py-omegaconf/package.py @@ -24,5 +24,4 @@ class PyOmegaconf(PythonPackage): depends_on("py-pytest-runner", type="build") depends_on("py-antlr4-python3-runtime@4.8", type=("build", "run")) depends_on("py-pyyaml@5.1.0:", type=("build", "run")) - depends_on("py-dataclasses", when="^python@:3.6", type=("build", "run")) depends_on("java", type="build") diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py index 700237c70e..2e5accef04 100644 --- a/var/spack/repos/builtin/packages/py-onnx/package.py +++ b/var/spack/repos/builtin/packages/py-onnx/package.py @@ -45,7 +45,6 @@ class PyOnnx(PythonPackage): depends_on("py-numpy", type=("build", "run")) depends_on("py-numpy@1.16.6:", type=("build", "run"), when="@1.8.1:") depends_on("py-six", type=("build", "run"), when="@:1.8.1") - depends_on("py-typing@3.6.4:", when="@:1.8.1 ^python@:3.4", type=("build", "run")) depends_on("py-typing-extensions@3.6.2.1:", type=("build", "run")) depends_on("cmake@3.1:", type="build") depends_on("py-pytest-runner", 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 52d0d30c66..20c250b125 100644 --- a/var/spack/repos/builtin/packages/py-opencensus-context/package.py +++ b/var/spack/repos/builtin/packages/py-opencensus-context/package.py @@ -18,5 +18,3 @@ class PyOpencensusContext(PythonPackage): sha256="1a3fdf6bec537031efcc93d51b04f1edee5201f8c9a0c85681d63308b76f5702", expand=False, ) - - depends_on("py-contextvars", when="^python@3.6.0:3.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-opentuner/package.py b/var/spack/repos/builtin/packages/py-opentuner/package.py index 83e50bee63..1740e85991 100644 --- a/var/spack/repos/builtin/packages/py-opentuner/package.py +++ b/var/spack/repos/builtin/packages/py-opentuner/package.py @@ -16,12 +16,9 @@ class PyOpentuner(PythonPackage): version("0.8.7", commit="070c5ce") version("0.8.2", commit="8e720a2") - version("0.8.0", commit="4cb9135") depends_on("python@3:", type=("build", "run"), when="@0.8.1:") - depends_on("python@2.7:2.8", type=("build", "run"), when="@:0.8.0") - depends_on("py-argparse@1.2.1:", when="^python@:2.6,3.0:3.1", type=("build", "run")) depends_on("py-fn-py@0.2.12:", type=("build", "run")) depends_on("py-future", type=("build", "run")) depends_on("py-numpy@1.8.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-opt-einsum/package.py b/var/spack/repos/builtin/packages/py-opt-einsum/package.py index e1f0c246c4..fc4926512e 100644 --- a/var/spack/repos/builtin/packages/py-opt-einsum/package.py +++ b/var/spack/repos/builtin/packages/py-opt-einsum/package.py @@ -16,9 +16,7 @@ class PyOptEinsum(PythonPackage): version("3.2.1", sha256="83b76a98d18ae6a5cc7a0d88955a7f74881f0e567a0f4c949d24c942753eb998") version("3.2.0", sha256="738b0a1db1d3084d360081bb64d826f9db06d2df7cc0bf8e2c9356028da1fa31") version("3.1.0", sha256="edfada4b1d0b3b782ace8bc14e80618ff629abf53143e1e6bbf9bd00b11ece77") - version("2.3.2", sha256="d3d464b4da7ef09e444c30e4003a27def37f85ff10ff2671e5f7d7813adac35b") - depends_on("python@:2", type=("build", "run"), when="@2") - depends_on("python@3.5:", type=("build", "run"), when="@3:") + depends_on("python@3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-numpy@1.7:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-ordereddict/package.py b/var/spack/repos/builtin/packages/py-ordereddict/package.py deleted file mode 100644 index b505e42638..0000000000 --- a/var/spack/repos/builtin/packages/py-ordereddict/package.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyOrdereddict(PythonPackage): - """A drop-in substitute for Py2.7's new collections. - OrderedDict that works in Python 2.4-2.6.""" - - pypi = "ordereddict/ordereddict-1.1.tar.gz" - - version("1.1", sha256="1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f") - - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py index a128e9e846..7d19c84ef7 100644 --- a/var/spack/repos/builtin/packages/py-owslib/package.py +++ b/var/spack/repos/builtin/packages/py-owslib/package.py @@ -27,4 +27,3 @@ class PyOwslib(PythonPackage): depends_on("py-pyproj", type=("build", "run")) depends_on("py-pyproj@2:", when="@0.19.2:", type=("build", "run")) depends_on("py-pyyaml", when="@0.19.2:", type=("build", "run")) - depends_on("py-dataclasses", when="@0.25: ^python@:3.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-particle/package.py b/var/spack/repos/builtin/packages/py-particle/package.py index 0f5008a0aa..ec417e511c 100644 --- a/var/spack/repos/builtin/packages/py-particle/package.py +++ b/var/spack/repos/builtin/packages/py-particle/package.py @@ -30,7 +30,3 @@ class PyParticle(PythonPackage): depends_on("py-attrs@19.2.0:", type=("build", "run")) depends_on("py-hepunits@1.2.0:", when="@:0.12", type=("build", "run")) depends_on("py-hepunits@2.0.0:", when="@0.13:", type=("build", "run")) - depends_on("py-importlib-resources@1.0:", when="^python@:3.6", type=("build", "run")) - - depends_on("py-enum34@1.1:", when="^python@:3.3", type=("build", "run")) - depends_on("py-typing@3.7:", when="^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pathlib/package.py b/var/spack/repos/builtin/packages/py-pathlib/package.py deleted file mode 100644 index 4e5dbea44d..0000000000 --- a/var/spack/repos/builtin/packages/py-pathlib/package.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyPathlib(PythonPackage): - """Object-oriented filesystem paths. - - Attention: this backport module isn't maintained anymore. If you want to - report issues or contribute patches, please consider the pathlib2 project - instead.""" - - homepage = "https://pathlib.readthedocs.org/" - pypi = "pathlib/pathlib-1.0.1.tar.gz" - - version("1.0.1", sha256="6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f") - - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") - - # This is a backport of the pathlib module from Python 3.4. Since pathlib is now - # part of the standard library, this module isn't needed in Python 3.4+. Although it - # can be installed, differences between this implementation and the standard library - # implementation can cause other packages to fail. If it is installed, it ends up - # masking the standard library and doesn't have the same features that the standard - # library has in newer versions of Python. - conflicts("^python@3.4:") diff --git a/var/spack/repos/builtin/packages/py-pathlib2/package.py b/var/spack/repos/builtin/packages/py-pathlib2/package.py index 114c72a18c..3296ec0f40 100644 --- a/var/spack/repos/builtin/packages/py-pathlib2/package.py +++ b/var/spack/repos/builtin/packages/py-pathlib2/package.py @@ -21,5 +21,3 @@ class PyPathlib2(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-six", type=("build", "run")) - depends_on("py-scandir", when="^python@:3.4", type=("build", "run")) - depends_on("py-typing", when="@2.3.7: ^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-peachpy/package.py b/var/spack/repos/builtin/packages/py-peachpy/package.py index 6cb6e174cc..c231ccaca0 100644 --- a/var/spack/repos/builtin/packages/py-peachpy/package.py +++ b/var/spack/repos/builtin/packages/py-peachpy/package.py @@ -17,4 +17,3 @@ 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", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pep517/package.py b/var/spack/repos/builtin/packages/py-pep517/package.py index 95e3a76d6d..b330e6ac4a 100644 --- a/var/spack/repos/builtin/packages/py-pep517/package.py +++ b/var/spack/repos/builtin/packages/py-pep517/package.py @@ -15,7 +15,6 @@ class PyPep517(PythonPackage): version("0.12.0", sha256="931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0") depends_on("py-flit-core@2:3", type="build") - depends_on("py-toml", when="^python@:3.5", type=("build", "run")) depends_on("py-tomli@1.1:", when="^python@3.6:", type=("build", "run")) depends_on("py-importlib-metadata", when="^python@:3.7", type=("build", "run")) depends_on("py-zipp", when="^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-petastorm/package.py b/var/spack/repos/builtin/packages/py-petastorm/package.py index fbb7b191a3..c3026d19df 100644 --- a/var/spack/repos/builtin/packages/py-petastorm/package.py +++ b/var/spack/repos/builtin/packages/py-petastorm/package.py @@ -26,7 +26,6 @@ class PyPetastorm(PythonPackage): depends_on("py-dill@0.2.1:", type=("build", "run")) depends_on("py-diskcache@3.0.0:", type=("build", "run")) depends_on("py-future@0.10.2:", type=("build", "run")) - depends_on("py-futures@2.0:", type=("build", "run"), when="^python@:2") depends_on("py-numpy@1.13.3:", type=("build", "run")) depends_on("py-packaging@15.0:", type=("build", "run")) depends_on("py-pandas@0.19.0:", 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 a276c09bae..ee1ad4074e 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -42,13 +42,6 @@ class PyPetsc4py(PythonPackage): version("3.13.0", sha256="0e11679353c0c2938336a3c8d1a439b853e20d3bccd7d614ad1dbea3ec5cb31f") version("3.12.0", sha256="4c94a1dbbf244b249436b266ac5fa4e67080d205420805deab5ec162b979df8d") version("3.11.0", sha256="ec114b303aadaee032c248a02021e940e43c6437647af0322d95354e6f2c06ad") - version("3.10.1", sha256="11b59693af0e2067f029924dd6b5220f7a7ec00089f6e2c2361332d6123ea6f7") - version("3.10.0", sha256="4e58b9e7d4343adcf905751261b789c8c3489496f8de5c3fc3844664ef5ec5a3") - version("3.9.1", sha256="8b7f56e0904c57cca08d1c24a1d8151d1554f06c9c5a31b16fb6db3bc928bbd8") - version("3.9.0", sha256="ae077dffd455014de16b6ed4ba014ac9e10227dc6b93f919a4229e8e1c870aec") - version("3.8.1", sha256="f6260a52dab02247f5b8d686a0587441b1a2048dff52263f1db42e75d2e3f330") - version("3.8.0", sha256="3445da12becf23ade4d40cdd04c746581982ab6a27f55fbb5cd29bc5560df4b1") - version("3.7.0", sha256="c04931a5ba3fd7c8c8d165aa7908688921ce3cf4cf8725d0cba73380c2107386") variant("mpi", default=True, description="Activates MPI support") @@ -73,12 +66,6 @@ class PyPetsc4py(PythonPackage): 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.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-pickleshare/package.py b/var/spack/repos/builtin/packages/py-pickleshare/package.py index a1c7ca0460..89c9775c1b 100644 --- a/var/spack/repos/builtin/packages/py-pickleshare/package.py +++ b/var/spack/repos/builtin/packages/py-pickleshare/package.py @@ -16,4 +16,3 @@ class PyPickleshare(PythonPackage): depends_on("python@2.7:2.8,3:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-pathlib2", type=("build", "run"), when="^python@2.6:2.8,3.2:3.3") diff --git a/var/spack/repos/builtin/packages/py-picrust/package.py b/var/spack/repos/builtin/packages/py-picrust/package.py deleted file mode 100644 index 50c52e516b..0000000000 --- a/var/spack/repos/builtin/packages/py-picrust/package.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyPicrust(PythonPackage): - """bioinformatics software package designed to predict metagenome - functional content from marker gene surveys and full genomes.""" - - homepage = "https://picrust.github.io/picrust/index.html" - url = "https://github.com/picrust/picrust/releases/download/v1.1.3/picrust-1.1.3.tar.gz" - - version("1.1.3", sha256="7538c8544899b8855deb73a2d7a4ccac4808ff294e161530a8c8762d472d8906") - - 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", 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-pil/package.py b/var/spack/repos/builtin/packages/py-pil/package.py deleted file mode 100644 index 89007cf491..0000000000 --- a/var/spack/repos/builtin/packages/py-pil/package.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class PyPil(PythonPackage): - """The Python Imaging Library (PIL) adds image processing capabilities - to your Python interpreter. This library supports many file formats, - and provides powerful image processing and graphics capabilities.""" - - homepage = "https://pillow.readthedocs.io/en/stable/" - url = "http://effbot.org/media/downloads/Imaging-1.1.7.tar.gz" - - version( - "1.1.7", - sha256="895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211", - deprecated=True, - ) - - provides("pil") - provides("pil@1.1.7", when="@1.1.7") - - # py-pil currently only works with Python2. - # If you are using Python 3, try using py-pillow instead. - depends_on("python@1.5.2:2.8", 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 aa98037062..efdc05f5a6 100644 --- a/var/spack/repos/builtin/packages/py-pillow/package.py +++ b/var/spack/repos/builtin/packages/py-pillow/package.py @@ -48,10 +48,6 @@ class PyPillowBase(PythonPackage): depends_on("python@2.7:2.8,3.5:3.8", when="@6.2.1:6.2.2", type=("build", "run")) 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", 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") # Optional dependencies @@ -124,9 +120,6 @@ class PyPillow(PyPillowBase): version("6.2.0", sha256="4548236844327a718ce3bb182ab32a16fa2050c61e334e959f554cac052fb0df") version("6.0.0", sha256="809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5") version("5.4.1", sha256="5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f") - version("5.1.0", sha256="cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef") - version("3.2.0", sha256="64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a") - version("3.0.0", sha256="ad50bef540fe5518a4653c3820452a881b6a042cb0f8bb7657c491c6bd3654bb") for ver in [ "9.2.0", @@ -143,8 +136,5 @@ class PyPillow(PyPillowBase): "6.2.0", "6.0.0", "5.4.1", - "5.1.0", - "3.2.0", - "3.0.0", ]: provides("pil@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/py-pint/package.py b/var/spack/repos/builtin/packages/py-pint/package.py index 15d0cc2dd7..bfb0cb8e1e 100644 --- a/var/spack/repos/builtin/packages/py-pint/package.py +++ b/var/spack/repos/builtin/packages/py-pint/package.py @@ -30,4 +30,3 @@ class PyPint(PythonPackage): 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") - depends_on("py-importlib-resources", type=("build", "run"), when="@0.17: ^python@:3.6") diff --git a/var/spack/repos/builtin/packages/py-pipits/package.py b/var/spack/repos/builtin/packages/py-pipits/package.py index 92f2d3fe17..8b97816378 100644 --- a/var/spack/repos/builtin/packages/py-pipits/package.py +++ b/var/spack/repos/builtin/packages/py-pipits/package.py @@ -13,26 +13,22 @@ class PyPipits(PythonPackage): url = "https://github.com/hsgweon/pipits/archive/2.4.tar.gz" version("2.4", sha256="b08a9d70ac6e5dd1c64d56b77384afd69e21e7d641b2fc4416feff862a2cd054") - version("1.5.0", sha256="6c76fff42a9db62ff4bb1d4d520ebee6cb20d5a726f12c3d5a3d42314947a659") # https://github.com/bioconda/bioconda-recipes/blob/master/recipes/pipits/meta.yaml - depends_on("python@3:", type=("build", "run"), when="@2:") - depends_on("python@:2", type=("build", "run"), when="@:1") - depends_on("py-setuptools", type="build", when="@2:") - depends_on("py-pispino@1.1:", type=("build", "run"), when="@2:") + depends_on("python@3:", type=("build", "run")) + depends_on("py-setuptools", type="build") + depends_on("py-pispino@1.1:", type=("build", "run")) depends_on("vsearch", type="run") depends_on("fastx-toolkit", type="run") depends_on("hmmer", type="run") depends_on("itsx", type="run") depends_on("py-biom-format", type=("build", "run")) - depends_on("rdptools", type="run", when="@2:") + depends_on("rdptools", type="run") depends_on("py-numpy", type=("build", "run")) - depends_on("py-pandas", type=("build", "run"), when="@2:") - depends_on("py-progressbar2", type=("build", "run"), when="@2:") - depends_on("py-requests", type=("build", "run"), when="@2:") + depends_on("py-pandas", type=("build", "run")) + depends_on("py-progressbar2", type=("build", "run")) + depends_on("py-requests", type=("build", "run")) depends_on("seqkit", type="run") - depends_on("java", type=("build", "run"), when="@:1") - depends_on("rdp-classifier", type="run", when="@:1") resource( name="UNITE_retrained", diff --git a/var/spack/repos/builtin/packages/py-plac/package.py b/var/spack/repos/builtin/packages/py-plac/package.py index 08ecdcbd26..35be55d077 100644 --- a/var/spack/repos/builtin/packages/py-plac/package.py +++ b/var/spack/repos/builtin/packages/py-plac/package.py @@ -21,4 +21,3 @@ class PyPlac(PythonPackage): version("1.1.3", sha256="398cb947c60c4c25e275e1f1dadf027e7096858fb260b8ece3b33bcff90d985f") depends_on("py-setuptools", type="build") - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py index d962b22c7a..f226506db5 100644 --- a/var/spack/repos/builtin/packages/py-platformdirs/package.py +++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py @@ -24,11 +24,3 @@ class PyPlatformdirs(PythonPackage): depends_on("py-setuptools-scm@5:+toml", when="@:2.5.1", type="build") depends_on("py-hatchling@0.22.0:", when="@2.5.2:", type="build") depends_on("py-hatch-vcs", when="@2.5.2:", type="build") - - @when("^python@:3.6") - def setup_build_environment(self, env): - """Python 3.6 needs a little help with setup.cfg re: - - https://github.com/platformdirs/platformdirs/issues/50 - """ - env.set("LC_ALL", "en_US.UTF-8") diff --git a/var/spack/repos/builtin/packages/py-poetry-core/package.py b/var/spack/repos/builtin/packages/py-poetry-core/package.py index 8353e1e1da..62bfa88309 100644 --- a/var/spack/repos/builtin/packages/py-poetry-core/package.py +++ b/var/spack/repos/builtin/packages/py-poetry-core/package.py @@ -19,14 +19,8 @@ class PyPoetryCore(PythonPackage): depends_on("python@2.7,3.5:3", type=("build", "run")) depends_on("python@3.7:3", when="@1.1.0:", type=("build", "run")) - depends_on( - "py-importlib-metadata@1.7:1", when="@:1.0 ^python@2.7,3.5:3.7", type=("build", "run") - ) + depends_on("py-importlib-metadata@1.7:1", when="@:1.0 ^python@:3.7", type=("build", "run")) depends_on("py-importlib-metadata@1.7:", when="@1.1: ^python@:3.7", type=("build", "run")) - depends_on("py-pathlib2@2.3.5:2", when="^python@2.7", type=("build", "run")) - depends_on("py-typing@3.7.4.1:3", when="^python@2.7", type=("build", "run")) - depends_on("py-enum34@1.1.10:1", when="^python@2.7", type=("build", "run")) - depends_on("py-functools32@3.2.3-2:3", when="^python@2.7", type=("build", "run")) # https://github.com/python-poetry/poetry/issues/5547 def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/py-poetry/package.py b/var/spack/repos/builtin/packages/py-poetry/package.py index 30b74ffcc1..ad48b5cb56 100644 --- a/var/spack/repos/builtin/packages/py-poetry/package.py +++ b/var/spack/repos/builtin/packages/py-poetry/package.py @@ -27,7 +27,6 @@ class PyPoetry(PythonPackage): depends_on( "py-backports-cached-property@1.0.2:1", when="@1.2.1: ^python@:3.7", type=("build", "run") ) - depends_on("py-cachecontrol@0.12.4:0.12+filecache", when="^python@:3.5", type=("build", "run")) depends_on("py-cachecontrol@0.12.9:0.12+filecache", when="@1.2.1:", type=("build", "run")) depends_on( "py-cachecontrol@0.12.9:0.12+filecache", when="^python@3.6:3", type=("build", "run") @@ -42,8 +41,6 @@ class PyPoetry(PythonPackage): depends_on("py-importlib-metadata@4.4:", when="@1.2.0 ^python@:3.9", type=("build", "run")) depends_on("py-importlib-metadata@4.4:4", when="@1.2.1: ^python@:3.9", type=("build", "run")) depends_on("py-jsonschema@4.10.0:4", when="@1.2:", type=("build", "run")) - depends_on("py-keyring@18.0.1:18", when="^python@2.7", type=("build", "run")) - depends_on("py-keyring@20.0.1:20", when="@:1.11.1 ^python@3.5", type=("build", "run")) depends_on("py-keyring@21.2.0:21", when="@1.1.12 ^python@3.6:3", type=("build", "run")) depends_on("py-keyring@21.2.0:", when="@1.1.13:", type=("build", "run")) depends_on("py-packaging@20.4:20", when="@:1.1", type=("build", "run")) @@ -64,9 +61,3 @@ class PyPoetry(PythonPackage): depends_on("py-urllib3@1.26.0:1", when="@1.2:") depends_on("py-dulwich@0.20.44:0.20", when="@1.2.0") depends_on("py-dulwich@0.20.46:0.20", when="@1.2.1:") - depends_on("py-typing@3.6:3", when="^python@2.7", type=("build", "run")) - depends_on("py-pathlib2@2.3:2", when="^python@2.7", type=("build", "run")) - depends_on("py-futures@3.3:3", when="^python@2.7", type=("build", "run")) - depends_on("py-glob2@0.6.0:0.6", when="^python@2.7", type=("build", "run")) - depends_on("py-functools32@3.2.3:3", when="^python@2.7", type=("build", "run")) - depends_on("py-subprocess32@3.5:3", when="^python@2.7", 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 62b39be721..f00b79bebd 100644 --- a/var/spack/repos/builtin/packages/py-pre-commit/package.py +++ b/var/spack/repos/builtin/packages/py-pre-commit/package.py @@ -32,6 +32,4 @@ class PyPreCommit(PythonPackage): depends_on("py-toml", type=("build", "run")) depends_on("py-virtualenv@15.2:", type=("build", "run")) depends_on("py-virtualenv@20.0.8:", type=("build", "run"), when="@2.4.0:") - 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@:5.2", type=("build", "run"), when="^python@:3.6") diff --git a/var/spack/repos/builtin/packages/py-promise/package.py b/var/spack/repos/builtin/packages/py-promise/package.py index 06008b8b74..c3c707ec7c 100644 --- a/var/spack/repos/builtin/packages/py-promise/package.py +++ b/var/spack/repos/builtin/packages/py-promise/package.py @@ -21,4 +21,3 @@ 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", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-protobuf/package.py b/var/spack/repos/builtin/packages/py-protobuf/package.py index ea263f13fc..908dca1178 100644 --- a/var/spack/repos/builtin/packages/py-protobuf/package.py +++ b/var/spack/repos/builtin/packages/py-protobuf/package.py @@ -79,8 +79,6 @@ class PyProtobuf(PythonPackage): depends_on("python@3.7:", when="@3.20:", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) depends_on("py-six@1.9:", when="@3:", type=("build", "run")) - depends_on("py-ordereddict", when="@3: ^python@:2", type=("build", "run")) - depends_on("py-unittest2", when="@3: ^python@:2", type=("build", "run")) # Setup dependencies for protobuf to use the same minor version as py-protobuf # Handle mapping the 4.x release to the protobuf 3.x releases diff --git a/var/spack/repos/builtin/packages/py-py2cairo/package.py b/var/spack/repos/builtin/packages/py-py2cairo/package.py deleted file mode 100644 index 2f315d4023..0000000000 --- a/var/spack/repos/builtin/packages/py-py2cairo/package.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyPy2cairo(WafPackage): - """Pycairo is a set of Python bindings for the cairo graphics library.""" - - homepage = "https://www.cairographics.org/pycairo/" - url = "https://cairographics.org/releases/py2cairo-1.10.0.tar.bz2" - - version("1.10.0", sha256="d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431") - - extends("python") - - depends_on("python@2", type=("build", "run")) - depends_on("cairo@1.10.0:") - depends_on("pixman") - depends_on("pkgconfig", type="build") - - depends_on("py-pytest", type="test") - - def install_test(self): - with working_dir("test"): - pytest = which("py.test") - pytest() diff --git a/var/spack/repos/builtin/packages/py-pyarrow/package.py b/var/spack/repos/builtin/packages/py-pyarrow/package.py index 30ff540ac9..49173b1e80 100644 --- a/var/spack/repos/builtin/packages/py-pyarrow/package.py +++ b/var/spack/repos/builtin/packages/py-pyarrow/package.py @@ -42,8 +42,6 @@ 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") - depends_on("py-enum34@1.1.6:", type=("build", "run"), when="@0.15.0:^python@:3.3") arrow_versions = ( "@0.9.0", diff --git a/var/spack/repos/builtin/packages/py-pyautogui/package.py b/var/spack/repos/builtin/packages/py-pyautogui/package.py index d1717cf7a3..8d9d440784 100644 --- a/var/spack/repos/builtin/packages/py-pyautogui/package.py +++ b/var/spack/repos/builtin/packages/py-pyautogui/package.py @@ -23,8 +23,7 @@ class PyPyautogui(PythonPackage): depends_on("py-pygetwindow@0.0.5:", type=("build", "run")) 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 platform=linux", type=("build", "run")) + depends_on("py-python3-xlib", when="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-pybtex/package.py b/var/spack/repos/builtin/packages/py-pybtex/package.py index 7111bfd2c5..f43e592eff 100644 --- a/var/spack/repos/builtin/packages/py-pybtex/package.py +++ b/var/spack/repos/builtin/packages/py-pybtex/package.py @@ -21,5 +21,4 @@ class PyPybtex(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-latexcodec@1.0.4:", type=("build", "run")) depends_on("py-pyyaml@3.01:", type=("build", "run")) - depends_on("py-counter@1:", when="^python@:2.6", type=("build", "run")) depends_on("py-six", type=("build", "run"), when="@0.24.0:") diff --git a/var/spack/repos/builtin/packages/py-pycbc/package.py b/var/spack/repos/builtin/packages/py-pycbc/package.py index 8072bd67a5..6d2cc2adaa 100644 --- a/var/spack/repos/builtin/packages/py-pycbc/package.py +++ b/var/spack/repos/builtin/packages/py-pycbc/package.py @@ -37,6 +37,5 @@ class PyPycbc(PythonPackage): depends_on("py-beautifulsoup4@4.6.0:", type=("build", "run")) depends_on("py-six@1.10.0:", type=("build", "run")) depends_on("py-ligo-segments", type=("build", "run")) - depends_on("py-weave@0.16.0:", when="^python@:2", type=("build", "run")) patch("for_aarch64.patch", when="@:1.14.1 target=aarch64:") diff --git a/var/spack/repos/builtin/packages/py-pydantic/package.py b/var/spack/repos/builtin/packages/py-pydantic/package.py index 957ed6cf64..c83ea63ace 100644 --- a/var/spack/repos/builtin/packages/py-pydantic/package.py +++ b/var/spack/repos/builtin/packages/py-pydantic/package.py @@ -19,6 +19,5 @@ class PyPydantic(PythonPackage): depends_on("python@3.7:", when="@1.10.2:", type=("build", "run")) depends_on("python@3.6.1:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-dataclasses@0.6:", when="^python@:3.6", type=("build", "run")) depends_on("py-typing-extensions@4.1.0:", when="@1.10.2:", type=("build", "run")) depends_on("py-typing-extensions@3.7.4.3:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pydap/package.py b/var/spack/repos/builtin/packages/py-pydap/package.py index 9a01e37e5f..83c8cdf6d6 100644 --- a/var/spack/repos/builtin/packages/py-pydap/package.py +++ b/var/spack/repos/builtin/packages/py-pydap/package.py @@ -21,4 +21,3 @@ 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", 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 b22793b422..7b299076b0 100644 --- a/var/spack/repos/builtin/packages/py-pydeps/package.py +++ b/var/spack/repos/builtin/packages/py-pydeps/package.py @@ -16,6 +16,5 @@ 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") depends_on("py-stdlib-list", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pydv/package.py b/var/spack/repos/builtin/packages/py-pydv/package.py index 2090ed4f84..5446f48248 100644 --- a/var/spack/repos/builtin/packages/py-pydv/package.py +++ b/var/spack/repos/builtin/packages/py-pydv/package.py @@ -16,7 +16,6 @@ class PyPydv(PythonPackage): version("2.4.2", sha256="46bda76e27e85beaad446455d0cc279388d455f05912a8ff8e4fb66de983992c") depends_on("py-setuptools", type="build") - depends_on("py-backports-functools-lru-cache", type=("build", "run")) depends_on("py-cycler", type=("build", "run")) depends_on("py-python-dateutil", type=("build", "run")) depends_on("py-matplotlib", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyfaidx/package.py b/var/spack/repos/builtin/packages/py-pyfaidx/package.py index 215abfda82..1c4ac91ef2 100644 --- a/var/spack/repos/builtin/packages/py-pyfaidx/package.py +++ b/var/spack/repos/builtin/packages/py-pyfaidx/package.py @@ -15,5 +15,3 @@ class PyPyfaidx(PythonPackage): depends_on("py-setuptools@0.7:", type=("build", "run")) depends_on("py-six", type=("build", "run")) - depends_on("py-ordereddict", type=("build", "run"), when="^python@:2.6") - depends_on("py-argparse", type=("build", "run"), when="^python@:2.6,3.0:3.1") diff --git a/var/spack/repos/builtin/packages/py-pygdbmi/package.py b/var/spack/repos/builtin/packages/py-pygdbmi/package.py index 1b39e9fe7d..803bedff01 100644 --- a/var/spack/repos/builtin/packages/py-pygdbmi/package.py +++ b/var/spack/repos/builtin/packages/py-pygdbmi/package.py @@ -13,9 +13,6 @@ class PyPygdbmi(PythonPackage): pypi = "pygdbmi/pygdbmi-0.8.2.0.tar.gz" version("0.9.0.3", sha256="5bdf2f072e8f2f6471f19f8dcd87d6425c5d8069d47c0a5ffe8d0eff48cb171e") - version("0.8.2.0", sha256="47cece65808ca42edf6966ac48e2aedca7ae1c675c4d2f0d001c7f3a7fa245fe") - depends_on("python@3.5:", type=("build", "run"), when="@0.9.0.3:") - depends_on("python@2.7:2.8,3.4:3.6", type=("build", "run"), when="@0.9.0.0:0.9.0.2") - depends_on("python@2.7:2.8,3.3:3.6", type=("build", "run"), when="@:0.8.4.0") + depends_on("python@3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pygobject/package.py b/var/spack/repos/builtin/packages/py-pygobject/package.py index 298cbfdcfa..57a1828041 100644 --- a/var/spack/repos/builtin/packages/py-pygobject/package.py +++ b/var/spack/repos/builtin/packages/py-pygobject/package.py @@ -15,11 +15,6 @@ class PyPygobject(PythonPackage): version("3.38.0", sha256="0372d1bb9122fc19f500a249b1f38c2bb67485000f5887497b4b205b3e7084d5") version("3.28.3", sha256="3dd3e21015d06e00482ea665fc1733b77e754a6ab656a5db5d7f7bfaf31ad0b0") version("2.28.6", sha256="fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8") - version( - "2.28.3", - sha256="7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6", - url="http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.3.tar.bz2", - ) extends("python") @@ -27,17 +22,9 @@ class PyPygobject(PythonPackage): depends_on("pkgconfig", type="build") depends_on("libffi") depends_on("glib") - 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.0:2") + depends_on("py-pycairo", type=("build", "run")) depends_on("gobject-introspection") - depends_on("gtkplus", when="@3:") - - patch("pygobject-2.28.6-introspection-1.patch", when="@2.28.3:2.28.6") - - # patch from https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/python-modules/pygobject/pygobject-2.28.6-gio-types-2.32.patch - # for https://bugzilla.gnome.org/show_bug.cgi?id=668522 - patch("pygobject-2.28.6-gio-types-2.32.patch", when="@2.28.6") + depends_on("gtkplus") # pygobject links directly using the compiler, not spack's wrapper. # This causes it to fail to add the appropriate rpaths. This patch modifies @@ -49,15 +36,5 @@ class PyPygobject(PythonPackage): url = "http://ftp.gnome.org/pub/GNOME/sources/pygobject" return url + "/%s/pygobject-%s.tar.xz" % (version.up_to(2), version) - # pygobject version 2 requires an autotools build - @when("@2.0:2") - def build(self, spec, prefix): - configure("--prefix=%s" % spec.prefix) - - @when("@2.0:2") - def install(self, spec, prefix): - make("install", parallel=False) - - @when("^python@3:") def patch(self): filter_file(r"Pycairo_IMPORT", r"//Pycairo_IMPORT", "gi/pygi-foreign-cairo.c") diff --git a/var/spack/repos/builtin/packages/py-pygobject/pygobject-2.28.6-gio-types-2.32.patch b/var/spack/repos/builtin/packages/py-pygobject/pygobject-2.28.6-gio-types-2.32.patch deleted file mode 100644 index fa0adf54ad..0000000000 --- a/var/spack/repos/builtin/packages/py-pygobject/pygobject-2.28.6-gio-types-2.32.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Mon, 12 Mar 2012 16:44:14 -0400 -Subject: [PATCH] gio-types.defs: change some enums to flags - -These flags types were originally incorrectly handled in glib as being -enums. That bug was fixed, but they're still enums here, leading to -warnings about the mismatch. - -Change them to flags. - -https://bugzilla.gnome.org/show_bug.cgi?id=668522 ---- - gio/gio-types.defs | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gio-types.defs b/gio/gio-types.defs -index 331e0bc..7eee5c8 100644 ---- a/gio/gio-types.defs -+++ b/gio/gio-types.defs -@@ -526,7 +526,7 @@ - ) - ) - --(define-enum MountMountFlags -+(define-flags MountMountFlags - (in-module "gio") - (c-name "GMountMountFlags") - (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") -@@ -545,7 +545,7 @@ - ) - ) - --(define-enum DriveStartFlags -+(define-flags DriveStartFlags - (in-module "gio") - (c-name "GDriveStartFlags") - (gtype-id "G_TYPE_DRIVE_START_FLAGS") -@@ -770,7 +770,7 @@ - ) - ) - --(define-enum SocketMsgFlags -+(define-flags SocketMsgFlags - (in-module "gio") - (c-name "GSocketMsgFlags") - (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") --- -1.7.8.5 - diff --git a/var/spack/repos/builtin/packages/py-pygobject/pygobject-2.28.6-introspection-1.patch b/var/spack/repos/builtin/packages/py-pygobject/pygobject-2.28.6-introspection-1.patch deleted file mode 100644 index ef96ba3352..0000000000 --- a/var/spack/repos/builtin/packages/py-pygobject/pygobject-2.28.6-introspection-1.patch +++ /dev/null @@ -1,35 +0,0 @@ -Submitted By: Andrew Benton <andy@benton.eu.com> -Date: 2012-03-29 -Initial Package Version: 2.28.6 -Upstream Status: not submitted -Origin: me -Description: Fixes compiling with a recent version of gobject-introspection - ---- pygobject-2.28.6/gi/pygi-info.c-orig 2012-03-29 02:27:37.494228732 +0100 -+++ pygobject-2.28.6/gi/pygi-info.c 2012-03-29 02:26:37.735132310 +0100 -@@ -162,9 +162,6 @@ - case GI_INFO_TYPE_CONSTANT: - type = &PyGIConstantInfo_Type; - break; -- case GI_INFO_TYPE_ERROR_DOMAIN: -- type = &PyGIErrorDomainInfo_Type; -- break; - case GI_INFO_TYPE_UNION: - type = &PyGIUnionInfo_Type; - break; -@@ -481,7 +478,6 @@ - case GI_INFO_TYPE_INVALID: - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CONSTANT: -- case GI_INFO_TYPE_ERROR_DOMAIN: - case GI_INFO_TYPE_VALUE: - case GI_INFO_TYPE_SIGNAL: - case GI_INFO_TYPE_PROPERTY: -@@ -860,7 +856,6 @@ - case GI_INFO_TYPE_INVALID: - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CONSTANT: -- case GI_INFO_TYPE_ERROR_DOMAIN: - case GI_INFO_TYPE_VALUE: - case GI_INFO_TYPE_SIGNAL: - case GI_INFO_TYPE_PROPERTY: diff --git a/var/spack/repos/builtin/packages/py-pygtk/package.py b/var/spack/repos/builtin/packages/py-pygtk/package.py deleted file mode 100644 index 464c98480e..0000000000 --- a/var/spack/repos/builtin/packages/py-pygtk/package.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyPygtk(AutotoolsPackage): - """bindings for the Gtk2 in Python. - use pygobject for Gtk3.""" - - homepage = "http://www.pygtk.org/" - url = "http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.24/pygtk-2.24.0.tar.gz" - - version("2.24.0", sha256="6e3e54fa6e65a69ac60bd58cb2e60a57f3346ac52efe995f3d10b6c38c972fd8") - - extends("python") - - depends_on("pkgconfig", type=("build")) - depends_on("libffi") - # atk@2.28.1 depends on meson which requires python 3 - depends_on("atk@:2.20.0") - # PyGTK requires python 2 - # Use py-pygobject@3: for GTK bindings for python 3 - 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") - depends_on("py-pygobject@2.28:2", type=("build", "run")) - depends_on("py-py2cairo", type=("build", "run")) - - def install(self, spec, prefix): - make("install", parallel=False) diff --git a/var/spack/repos/builtin/packages/py-pykml/package.py b/var/spack/repos/builtin/packages/py-pykml/package.py index fabaf8136d..9ac05714c9 100644 --- a/var/spack/repos/builtin/packages/py-pykml/package.py +++ b/var/spack/repos/builtin/packages/py-pykml/package.py @@ -15,9 +15,6 @@ class PyPykml(PythonPackage): pypi = "pykml/pykml-0.1.3.tar.gz" version("0.2.0", sha256="44a1892e7c2a649c8ae9f8e2899ff76cae79ec6749ffb64d11140b4e87d0f957") - version("0.1.3", sha256="e1a133e582f0b4652a6b00bac970b446d90580664e5a634a670731c990ff9f05") - depends_on("python@2", type=("build", "run"), when="@0.1") depends_on("py-setuptools", type="build") - depends_on("py-lxml@3.3.6:", type=("build", "run"), when="@0.2.0:") - depends_on("py-lxml@2.2.6:", type=("build", "run")) + depends_on("py-lxml@3.3.6:", 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 19a9af74e5..eb2a990de7 100644 --- a/var/spack/repos/builtin/packages/py-pykwalify/package.py +++ b/var/spack/repos/builtin/packages/py-pykwalify/package.py @@ -24,5 +24,3 @@ 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", when="@1.6.1") - conflicts("^python@2.8.0:3.4", when="@1.7.0:") diff --git a/var/spack/repos/builtin/packages/py-pylatex/package.py b/var/spack/repos/builtin/packages/py-pylatex/package.py index c55cf6c870..009d2ffd18 100644 --- a/var/spack/repos/builtin/packages/py-pylatex/package.py +++ b/var/spack/repos/builtin/packages/py-pylatex/package.py @@ -25,7 +25,6 @@ class PyPylatex(PythonPackage): depends_on("py-ordered-set", type=("build", "run")) # from extras section in setup.py - depends_on("py-future@0.15.2:", type=("build", "run"), when="^python@:2") depends_on("py-sphinx", type="run", when="+docs") depends_on("py-matplotlib", type="run", when="+matplotlib") depends_on("py-numpy", type="run", when="+matrices") diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 675f292e8c..b94f7aa085 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -32,14 +32,8 @@ class PyPylint(PythonPackage): version("2.8.2", sha256="586d8fa9b1891f4b725f587ef267abe2a1bad89d6b184520c7f07a253dd6e217") version("2.3.1", sha256="723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1") version("2.3.0", sha256="ee80c7af4f127b2a480d83010c9f0e97beb8eaa652b78c2837d3ed30b12e1182") - version("1.9.4", sha256="ee1e85575587c5b58ddafa25e1c1b01691ef172e139fc25585e5d3f02451da93") - # version('1.7.2', sha256='ea6afb93a9ed810cf52ff3838eb3a15e2bf6a81b80de0eaede1ce442caa5ca69') # see dependencies - version("1.6.5", sha256="a673984a8dd78e4a8b8cfdee5359a1309d833cf38405008f4a249994a8456719") - version("1.4.3", sha256="1dce8c143a5aa15e0638887c2b395e2e823223c63ebaf8d5f432a99e44b29f60") - version("1.4.1", sha256="3e383060edd432cbbd0e8bd686f5facfe918047ffe1bb401ab5897cb6ee0f030") 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", type=("build", "run")) depends_on("python@3.6:", when="@2.8.2:", type=("build", "run")) depends_on("python@3.6.2:", when="@2.13.5:", type=("build", "run")) @@ -53,7 +47,6 @@ class PyPylint(PythonPackage): depends_on("py-astroid", type=("build", "run")) # note there is no working version of astroid for this depends_on("py-astroid@1.5.1:", when="@1.7:", type=("build", "run")) - depends_on("py-astroid@1.6:1.9", when="@1.9.4", type=("build", "run")) depends_on("py-astroid@2.0:", when="@2.2.0:", type=("build", "run")) depends_on("py-astroid@2.2.0:2", when="@2.3.0:2.7", type=("build", "run")) depends_on("py-astroid@2.5.6:2.6", when="@2.8.0:2.10", type=("build", "run")) @@ -70,9 +63,5 @@ class PyPylint(PythonPackage): depends_on("py-tomlkit@0.10.1:", when="@2.14.0:", type=("build", "run")) depends_on("py-colorama@0.4.5:", when="platform=windows", type=("build", "run")) depends_on("py-typing-extensions@3.10.0:", when="@2.11.1: ^python@:3.9", type=("build", "run")) - depends_on("py-backports-functools-lru-cache", when="^python@:2.8", type=("build", "run")) - depends_on("py-configparser", when="^python@:2.8", type=("build", "run")) - depends_on("py-editdistance", when="@:1.7", type=("build", "run")) - depends_on("py-singledispatch", when="^python@:3.3", type=("build", "run")) depends_on("py-six", when="@1:2.3.1", type=("build", "run")) depends_on("py-toml@0.7.1:", when="@2.8.2:2.12.2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pymatgen/package.py b/var/spack/repos/builtin/packages/py-pymatgen/package.py index c3277cc6e0..98415c3f5b 100644 --- a/var/spack/repos/builtin/packages/py-pymatgen/package.py +++ b/var/spack/repos/builtin/packages/py-pymatgen/package.py @@ -19,23 +19,15 @@ class PyPymatgen(PythonPackage): version( "2020.12.31", sha256="5002490facd47c55d2dae42c35712e061c1f5d881180485c0543a899589856d6" ) - version("4.7.2", sha256="e439b78cc3833a03963c3c3efe349d8a0e52a1550c8a05c56a89aa1b86657436") - version("4.6.2", sha256="f34349090c6f604f7d402cb09cd486830b38523639d7160d7fd282d504036a0e") - # Old versions come pre-cythonized and so don't support newer python versions - # and 2021.1.1 and newer require Python >= 3.7 - extends("python@:3.6", ignore="bin/tabulate", when="@:4.7.2") - extends("python@3.7:", ignore="bin/tabulate", when="@2021.1.1:") + extends("python@3.7:", ignore="bin/tabulate") depends_on("py-setuptools@18.0:", type="build") depends_on("py-numpy@1.9:", type=("build", "run")) - depends_on("py-six", type=("build", "run"), when="@:4.7.2") depends_on("py-requests", type=("build", "run")) - depends_on("py-pyyaml@3.11:", type=("build", "run"), when="@:4.7.2") depends_on("py-monty@0.9.6:", type=("build", "run")) depends_on("py-scipy@0.14:", type=("build", "run")) - depends_on("py-pydispatcher@2.0.5:", type=("build", "run"), when="@:4.7.2") depends_on("py-tabulate", type=("build", "run")) depends_on("py-spglib@1.9.8.7:", type=("build", "run")) depends_on("py-matplotlib@1.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pympler/package.py b/var/spack/repos/builtin/packages/py-pympler/package.py index 3f3ba2cf7b..5618bea8c2 100644 --- a/var/spack/repos/builtin/packages/py-pympler/package.py +++ b/var/spack/repos/builtin/packages/py-pympler/package.py @@ -15,17 +15,6 @@ class PyPympler(PythonPackage): pypi = "Pympler/Pympler-0.4.3.tar.gz" version("1.0.1", sha256="993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa") - version("0.4.3", sha256="430528fff6cde1bae0a305e8df647b158c3cc4930cff122bf228293829ee1e56") - version("0.4.2", sha256="3c3f9d8eb3dddf4f29c433433ea77c9c3f2f0dcc06575c0c2a9d81b2602893b2") - version("0.4.1", sha256="6a8bfd2972c4ec34ac8750358515950be4a4ca13dfa6a05a9a22419786745f90") - version("0.4", sha256="b280480502df658b18cb6310d2c744fabf05d4c518f873377884b4d4b5d2992d") - version("0.3.1", sha256="8cb170fddfe592342856590e2239e8c20ac61eacf18bc4f65a95ccaf74475e3e") - depends_on("python@3.6:3.10", when="@1:", type=("build", "run")) - depends_on("python@2.7,3.5:3.9", when="@0.9", type=("build", "run")) - depends_on("python@2.7,3.4:3.8", when="@0.8", type=("build", "run")) - depends_on("python@2.7,3.3:3.7", when="@0.6:0.7", type=("build", "run")) - depends_on("python@2.6:2.7,3.2:3.6", when="@0.5", type=("build", "run")) - depends_on("python@2.5:2.7,3.1:3.4", when="@0.4", type=("build", "run")) - depends_on("python@2.4:2.7,3.1:3.3", when="@0.3", type=("build", "run")) + depends_on("python@3.6:3.10", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-pypinyin/package.py b/var/spack/repos/builtin/packages/py-pypinyin/package.py index 39a9937d4e..5c3a6c5baf 100644 --- a/var/spack/repos/builtin/packages/py-pypinyin/package.py +++ b/var/spack/repos/builtin/packages/py-pypinyin/package.py @@ -16,6 +16,3 @@ class PyPypinyin(PythonPackage): depends_on("python@2.6:2,3.3:3", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-argparse", type=("build", "run"), when="^python@:2.6") - depends_on("py-enum34", type=("build", "run"), when="^python@:3.3") - depends_on("py-typing", type=("build", "run"), when="^python@:3.4") diff --git a/var/spack/repos/builtin/packages/py-pyproj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py index 86e1cedf67..da74c56c0b 100644 --- a/var/spack/repos/builtin/packages/py-pyproj/package.py +++ b/var/spack/repos/builtin/packages/py-pyproj/package.py @@ -38,7 +38,6 @@ class PyPyproj(PythonPackage): depends_on("python@2.7:2.8,3.5:", when="@2.2:", type=("build", "link", "run")) depends_on("python@2.6:2.8,3.3:", type=("build", "link", "run")) depends_on("py-certifi", when="@3.0:", type=("build", "run")) - depends_on("py-aenum", when="@2.2 ^python@:3.5", type=("build", "run")) # https://pyproj4.github.io/pyproj/stable/installation.html#installing-from-source depends_on("proj@8.2:", when="@3.4:") diff --git a/var/spack/repos/builtin/packages/py-pyqt5/package.py b/var/spack/repos/builtin/packages/py-pyqt5/package.py index f28e826aac..a439cbfed7 100644 --- a/var/spack/repos/builtin/packages/py-pyqt5/package.py +++ b/var/spack/repos/builtin/packages/py-pyqt5/package.py @@ -30,7 +30,6 @@ class PyPyqt5(SIPPackage): # sip: QOpenGLFramebufferObject is undefined depends_on("qt@5:+opengl") depends_on("python@2.6:", type=("build", "run")) - depends_on("py-enum34", type=("build", "run"), when="^python@:3.3") depends_on("py-sip module=PyQt5.sip", type=("build", "run")) depends_on("py-sip@:4.19.18 module=PyQt5.sip", type=("build", "run"), when="@:5.13.0") diff --git a/var/spack/repos/builtin/packages/py-pyrad/package.py b/var/spack/repos/builtin/packages/py-pyrad/package.py deleted file mode 100644 index e6272fd98a..0000000000 --- a/var/spack/repos/builtin/packages/py-pyrad/package.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyPyrad(PythonPackage): - """RADseq for phylogenetics & introgression analyses""" - - homepage = "http://dereneaton.com/software/pyrad/" - url = "https://github.com/dereneaton/pyrad/archive/3.0.66.tar.gz" - - version("3.0.66", sha256="7dbd67e532058f7b7de76d14cf631fd3e3c841cd80fac4e55fbce8bb52ac6537") - - 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")) - depends_on("vsearch") - depends_on("muscle") diff --git a/var/spack/repos/builtin/packages/py-pyro4/package.py b/var/spack/repos/builtin/packages/py-pyro4/package.py index e76ce505ed..076e28a540 100644 --- a/var/spack/repos/builtin/packages/py-pyro4/package.py +++ b/var/spack/repos/builtin/packages/py-pyro4/package.py @@ -84,4 +84,3 @@ class PyPyro4(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-serpent@1.27:", type=("build", "run")) - depends_on("py-selectors34", when="^python@:3.3", 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 deleted file mode 100644 index a9b5b2567e..0000000000 --- a/var/spack/repos/builtin/packages/py-pysqlite/package.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyPysqlite(PythonPackage): - """Python DB-API module for SQLite 3.""" - - homepage = "https://github.com/ghaering/pysqlite" - pypi = "pysqlite/pysqlite-2.8.3.tar.gz" - - version("2.8.3", sha256="17d3335863e8cf8392eea71add33dab3f96d060666fe68ab7382469d307f4490") - - # pysqlite is built into Python3 - depends_on("python@2.7.0:2.7", type=("build", "run")) - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") - depends_on("sqlite", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytest-mypy/package.py b/var/spack/repos/builtin/packages/py-pytest-mypy/package.py index 1f887ddcaa..6adff7a6a1 100644 --- a/var/spack/repos/builtin/packages/py-pytest-mypy/package.py +++ b/var/spack/repos/builtin/packages/py-pytest-mypy/package.py @@ -16,8 +16,6 @@ class PyPytestMypy(PythonPackage): depends_on("python@3.4:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-pytest@2.8:", when="^python@3.5:", type=("build", "run")) - depends_on("py-pytest@2.8:4.6", when="^python@:3.4", type=("build", "run")) - depends_on("py-mypy@0.500:0.699", when="^python@:3.4", type=("build", "run")) - depends_on("py-mypy@0.500:", when="^python@3.5:3.7", type=("build", "run")) + depends_on("py-pytest@2.8:", type=("build", "run")) + depends_on("py-mypy@0.500:", when="^python@:3.7", type=("build", "run")) depends_on("py-mypy@0.700:", when="^python@3.8:", 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 d9d1ef217d..bcd7b5ec65 100644 --- a/var/spack/repos/builtin/packages/py-pytest/package.py +++ b/var/spack/repos/builtin/packages/py-pytest/package.py @@ -79,11 +79,4 @@ class PyPytest(PythonPackage): depends_on("py-toml", when="@6", type=("build", "run")) 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", 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", 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 88a624aa55..efe1e6a3e3 100644 --- a/var/spack/repos/builtin/packages/py-python-benedict/package.py +++ b/var/spack/repos/builtin/packages/py-python-benedict/package.py @@ -17,8 +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", type=("build", "run")) - depends_on("py-ftfy", when="^python@3.4:", type=("build", "run")) + depends_on("py-ftfy", type=("build", "run")) depends_on("py-mailchecker", type=("build", "run")) depends_on("py-phonenumbers", type=("build", "run")) depends_on("py-python-dateutil", 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 12448edfe3..2da3df156a 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,4 @@ 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") depends_on("py-certifi", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-python-meep/package.py b/var/spack/repos/builtin/packages/py-python-meep/package.py deleted file mode 100644 index b2aec9d0a3..0000000000 --- a/var/spack/repos/builtin/packages/py-python-meep/package.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyPythonMeep(PythonPackage): - """Python-meep is a wrapper around libmeep. It allows the scripting of - Meep-simulations with Python""" - - homepage = "https://launchpad.net/python-meep" - url = "https://launchpad.net/python-meep/1.4/1.4/+download/python-meep-1.4.2.tar" - - version("1.4.2", sha256="d91428aa4727c308383cea31ca9cdacee409320c686e9a8368769933e56c8762") - - variant("mpi", default=True, description="Enable MPI support") - - depends_on("python@2.6:2.7", type=("build", "run")) - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") - depends_on("py-numpy", type=("build", "run")) - depends_on("py-scipy", type=("build", "run")) - depends_on("py-matplotlib", type=("build", "run")) - - depends_on("mpi", when="+mpi") - depends_on("meep~mpi", when="~mpi") - depends_on("meep+mpi", when="+mpi") - - # As of SWIG 3.0.3, Python-style comments are now treated as - # pre-processor directives. Use older SWIG. But not too old, - # or else it can't handle newer C++ compilers and flags. - depends_on("swig@1.3.39:3.0.2") - - def patch(self): - if "+mpi" in self.spec: - copy("setup-mpi.py", "setup.py") diff --git a/var/spack/repos/builtin/packages/py-python-swiftclient/package.py b/var/spack/repos/builtin/packages/py-python-swiftclient/package.py index 2d480e4ec1..1120d381b9 100644 --- a/var/spack/repos/builtin/packages/py-python-swiftclient/package.py +++ b/var/spack/repos/builtin/packages/py-python-swiftclient/package.py @@ -28,7 +28,6 @@ class PyPythonSwiftclient(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-pbr", type="build") - depends_on("py-futures@3:", type=("build", "run"), when="^python@:2") depends_on("py-requests@1.1.0:", type=("build", "run")) depends_on("py-six@1.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pytools/package.py b/var/spack/repos/builtin/packages/py-pytools/package.py index 30e2fc0f70..96884b3db6 100644 --- a/var/spack/repos/builtin/packages/py-pytools/package.py +++ b/var/spack/repos/builtin/packages/py-pytools/package.py @@ -26,7 +26,6 @@ class PyPytools(PythonPackage): depends_on("py-six@1.8.0:", when="@:2019.1.1", type=("build", "run")) depends_on("py-numpy@1.6.0:", when="@:2021.2.9", type=("build", "run")) depends_on("py-numpy@1.6.0:", when="@2022.1.12: +numpy", type=("build", "run")) - depends_on("py-dataclasses@0.7:", when="@2021.2.9: ^python@:3.6", type=("build", "run")) depends_on("py-typing-extensions@4.0:", when="@2021.2.9: ^python@:3.10", type=("build", "run")) depends_on("python@2.6:2.8,3.4:", type=("build", "run")) depends_on("python@3.6:3", when="@2021.2.9:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyvcf/package.py b/var/spack/repos/builtin/packages/py-pyvcf/package.py index a249e7046e..89235af573 100644 --- a/var/spack/repos/builtin/packages/py-pyvcf/package.py +++ b/var/spack/repos/builtin/packages/py-pyvcf/package.py @@ -16,7 +16,3 @@ class PyPyvcf(PythonPackage): version("0.6.0", sha256="d9ec3bbedb64fa35c2648a9c41fdefaedd3912ff597a436e073d27aeccf5de7c") depends_on("py-setuptools@:57", type="build") - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) - depends_on("py-counter", when="^python@:2.6", type=("build", "run")) - depends_on("py-ordereddict", when="^python@:2.6", type=("build", "run")) - depends_on("py-unittest2", when="^python@:2.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-pyvista/package.py b/var/spack/repos/builtin/packages/py-pyvista/package.py index d7d5164cb2..9b38eae8b6 100644 --- a/var/spack/repos/builtin/packages/py-pyvista/package.py +++ b/var/spack/repos/builtin/packages/py-pyvista/package.py @@ -23,5 +23,4 @@ class PyPyvista(PythonPackage): depends_on("py-scooby@0.5.1:", 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-qiskit-nature/package.py b/var/spack/repos/builtin/packages/py-qiskit-nature/package.py index 7f1831280c..48bde07d87 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-nature/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-nature/package.py @@ -26,4 +26,3 @@ class PyQiskitNature(PythonPackage): depends_on("py-psutil@5:", type=("build", "run")) depends_on("py-h5py@:3.2", type=("build", "run")) depends_on("py-scikit-learn@0.20.0:", type=("build", "run")) - depends_on("py-dataclasses", when="python@:3.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py index 097916ed5f..89a3db23e3 100644 --- a/var/spack/repos/builtin/packages/py-qiskit-terra/package.py +++ b/var/spack/repos/builtin/packages/py-qiskit-terra/package.py @@ -31,7 +31,6 @@ class PyQiskitTerra(PythonPackage): with when("@0.18.3"): depends_on("python@3.6:", type=("build", "run")) depends_on("py-cython@0.27.1:", type="build") - depends_on("py-contextvars@2.4:", when="^python@:3.6", type=("build", "run")) depends_on("py-jsonschema@2.6:", type=("build", "run")) depends_on("py-retworkx@0.9.0:", type=("build", "run")) depends_on("py-scipy@1.4:", 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 fdaaa1d9fd..4839a5c1da 100644 --- a/var/spack/repos/builtin/packages/py-quantities/package.py +++ b/var/spack/repos/builtin/packages/py-quantities/package.py @@ -17,18 +17,7 @@ class PyQuantities(PythonPackage): version("0.12.5", sha256="67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0") version("0.12.4", sha256="a33d636d1870c9e1127631185d89b0105a49f827d6aacd44ad9d8f151f331d8b") version("0.12.3", sha256="582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883") - version("0.12.2", sha256="92e8397938516483f4fd1855097ec11953ab10dd0bf3293954559226679f76f0") - version("0.12.1", sha256="0a03e8511db603c57ca80dee851c43f08d0457f4d592bcac2e154570756cb934") - 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") - - depends_on("python@2.6:2.7,3.3:3.4", type=("build", "run"), when="@:0.11") - depends_on("python@2.7.0:2.7,3.4:3.6", type=("build", "run"), when="@0.12.0:0.12.2") + depends_on("python@2.7.0:2.7,3.4:3.7", type=("build", "run"), when="@0.12.3") depends_on("python@2.7.0:2.7,3.4:3.8", type=("build", "run"), when="@0.12.4:0.12.5") depends_on("python@3.7:3.10", type=("build", "run"), when="@0.13:") @@ -36,9 +25,6 @@ class PyQuantities(PythonPackage): # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.7.1:1.9", type=("build", "run"), when="@:0.11") - depends_on("py-numpy@1.8.2:1.13", type=("build", "run"), when="@0.12.0:0.12.1") - depends_on("py-numpy@1.8.2:1.14", type=("build", "run"), when="@0.12.2") depends_on("py-numpy@1.8.2:1.16", type=("build", "run"), when="@0.12.3") depends_on("py-numpy@1.8.2:1.17", type=("build", "run"), when="@0.12.4:0.12") depends_on("py-numpy@1.16:", type=("build", "run"), when="@0.13.0:") diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py index 1afdfa5e66..1980110b72 100644 --- a/var/spack/repos/builtin/packages/py-rasterio/package.py +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -61,4 +61,3 @@ class PyRasterio(PythonPackage): depends_on("py-snuggs@1.4.1:", type=("build", "run")) depends_on("py-click-plugins", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) - depends_on("py-enum34", type="run", when="^python@:3.3") diff --git a/var/spack/repos/builtin/packages/py-ray/package.py b/var/spack/repos/builtin/packages/py-ray/package.py index a7b07f6f19..00d4b675fa 100644 --- a/var/spack/repos/builtin/packages/py-ray/package.py +++ b/var/spack/repos/builtin/packages/py-ray/package.py @@ -29,7 +29,6 @@ class PyRay(PythonPackage): depends_on("py-attrs", when="@2.0.1", type=("build", "run")) depends_on("py-click@7:8.0.4", when="@2.0.1", type=("build", "run")) depends_on("py-click@7.0:", when="@0.8.7", type=("build", "run")) - depends_on("py-dataclasses", when="@2.0.1 ^python@:3.6", type=("build", "run")) depends_on("py-filelock", type=("build", "run")) depends_on("py-grpcio@1.32:1.43.0", when="@2.0.1 ^python@:3.9", type=("build", "run")) depends_on("py-grpcio@1.42:1.43.0", when="@2.0.1 ^python@3.10:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rbtools/package.py b/var/spack/repos/builtin/packages/py-rbtools/package.py index 84a192f059..abe67104d5 100644 --- a/var/spack/repos/builtin/packages/py-rbtools/package.py +++ b/var/spack/repos/builtin/packages/py-rbtools/package.py @@ -23,4 +23,3 @@ class PyRbtools(PythonPackage): depends_on("py-texttable", type=("build", "run")) depends_on("py-tqdm", type=("build", "run")) depends_on("py-six@1.8.0:", type=("build", "run")) - depends_on("py-backports-shutil-get-terminal-size", when="^python@:2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rdt/package.py b/var/spack/repos/builtin/packages/py-rdt/package.py index 9398f0edb8..4ee6bb8e79 100644 --- a/var/spack/repos/builtin/packages/py-rdt/package.py +++ b/var/spack/repos/builtin/packages/py-rdt/package.py @@ -18,8 +18,7 @@ class PyRdt(PythonPackage): depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.18:1.19", type=("build", "run"), when="^python@3.6") - depends_on("py-numpy@1.20:1", type=("build", "run"), when="^python@3.7:") + depends_on("py-numpy@1.20:1", type=("build", "run")) depends_on("py-pandas@1.1.3:1.1.4", type=("build", "run")) depends_on("py-scipy@1.5.4:1", type=("build", "run")) depends_on("py-psutil@5.7:5", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-requests-futures/package.py b/var/spack/repos/builtin/packages/py-requests-futures/package.py index b2662331d1..e928e9e1df 100644 --- a/var/spack/repos/builtin/packages/py-requests-futures/package.py +++ b/var/spack/repos/builtin/packages/py-requests-futures/package.py @@ -16,5 +16,4 @@ class PyRequestsFutures(PythonPackage): version("0.9.7", sha256="a9ca2c3480b6fac29ec5de59c146742e2ab2b60f8c68581766094edb52ea7bad") depends_on("py-setuptools@38.6.1:", type="build") - depends_on("py-futures@2.1.3:", type=("build", "run"), when="^python@:3.1") depends_on("py-requests@1.2.0:", 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 6e2fd9bfc2..5564245253 100644 --- a/var/spack/repos/builtin/packages/py-requests/package.py +++ b/var/spack/repos/builtin/packages/py-requests/package.py @@ -34,15 +34,11 @@ class PyRequests(PythonPackage): depends_on("python@3.7:", type=("build", "run"), when="@2.28.0:") depends_on("py-setuptools", type="build") - depends_on("py-chardet@3.0.2:4", type=("build", "run"), when="@2.26: ^python@2:2") depends_on("py-chardet@3.0.2:4", type=("build", "run"), when="@2.25.1:2.25") 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-charset-normalizer@2.0.0:2.0", type=("build", "run"), when="@2.26.0: ^python@3:" - ) - depends_on("py-idna@2.5:3", type=("build", "run"), when="@2.26.0: ^python@3:") - depends_on("py-idna@2.5:2", type=("build", "run"), when="@2.26.0: ^python@:2") + depends_on("py-charset-normalizer@2.0.0:2.0", type=("build", "run"), when="@2.26.0:") + depends_on("py-idna@2.5:3", type=("build", "run"), when="@2.26.0:") depends_on("py-idna@2.5:2", type=("build", "run"), when="@2.23:2.25") 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:") diff --git a/var/spack/repos/builtin/packages/py-responses/package.py b/var/spack/repos/builtin/packages/py-responses/package.py index 2bf3a6e323..d1d63797cf 100644 --- a/var/spack/repos/builtin/packages/py-responses/package.py +++ b/var/spack/repos/builtin/packages/py-responses/package.py @@ -18,8 +18,6 @@ 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", 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-restview/package.py b/var/spack/repos/builtin/packages/py-restview/package.py deleted file mode 100644 index 2d0b0ec3dd..0000000000 --- a/var/spack/repos/builtin/packages/py-restview/package.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyRestview(PythonPackage): - """A viewer for ReStructuredText documents that renders them on the fly.""" - - homepage = "https://mg.pov.lt/restview/" - pypi = "restview/restview-2.6.1.tar.gz" - - version("2.6.1", sha256="14d261ee0edf30e0ebc1eb320428ef4898e97422b00337863556966b851fb5af") - - depends_on("python@2.7:2.8,3.3:3.5") - depends_on("py-setuptools", type="build") - depends_on("py-docutils@0.13.1:", type=("build", "run")) - depends_on("py-readme-renderer", type=("build", "run")) - depends_on("py-pygments", 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 9f12f4ae3c..ae1555492b 100644 --- a/var/spack/repos/builtin/packages/py-resultsfile/package.py +++ b/var/spack/repos/builtin/packages/py-resultsfile/package.py @@ -16,9 +16,7 @@ class PyResultsfile(PythonPackage): maintainers = ["scemama"] version("2.0", sha256="2a34208254e4bea155695690437f6a59bf5f7b0ddb421d6c1a2d377510f018f7") - version("1.0", sha256="e029054b2727131da9684fa2ec9fb8b6a3225dc7f648216a9390267b2d5d60c3") - depends_on("python@2.7:2.8", type=("build", "run"), when="@1.0:1") - depends_on("python@3:", type=("build", "run"), when="@2.0:") + depends_on("python@3:", type=("build", "run")) # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-rich/package.py b/var/spack/repos/builtin/packages/py-rich/package.py index 885471f7ab..00a87fc6e9 100644 --- a/var/spack/repos/builtin/packages/py-rich/package.py +++ b/var/spack/repos/builtin/packages/py-rich/package.py @@ -39,7 +39,6 @@ class PyRich(PythonPackage): "py-typing-extensions@3.7.4:4", when="@10.14.0: ^python@:3.7", type=("build", "run") ) depends_on("py-typing-extensions@3.7.4:3", when="@:10.13.0", 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", 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"), when="@:10.14.0") diff --git a/var/spack/repos/builtin/packages/py-rnacocktail/package.py b/var/spack/repos/builtin/packages/py-rnacocktail/package.py deleted file mode 100644 index 21bf90859d..0000000000 --- a/var/spack/repos/builtin/packages/py-rnacocktail/package.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyRnacocktail(PythonPackage): - """RNACocktail: A comprehensive framework - for accurate and efficient RNA-Seq analysis.""" - - homepage = "https://bioinform.github.io/rnacocktail/" - url = "https://github.com/bioinform/rnacocktail/archive/v0.2.2.tar.gz" - - version("0.2.2", sha256="34aa0d1d7bd9d80303fe7dac5acc0519f7c1ed986397692588343d82ce45c7a5") - - depends_on("python@2.7:2.8", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-pybedtools", type=("build", "run")) - depends_on("py-pysam", type=("build", "run")) - # Higher version of py-pandas and py-numpy - # depends on python@3: which conflicts with py-rnacocktail - depends_on("py-pandas@:0.24.2", type=("build", "run")) - depends_on("py-numpy@:1.16.5", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rosdistro/package.py b/var/spack/repos/builtin/packages/py-rosdistro/package.py index 7f2ac14e74..2efc76b4a7 100644 --- a/var/spack/repos/builtin/packages/py-rosdistro/package.py +++ b/var/spack/repos/builtin/packages/py-rosdistro/package.py @@ -17,6 +17,5 @@ class PyRosdistro(PythonPackage): depends_on("py-pyyaml", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) depends_on("py-catkin-pkg", type=("build", "run")) depends_on("py-rospkg", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rospkg/package.py b/var/spack/repos/builtin/packages/py-rospkg/package.py index 61f4e5c958..4f7eb81d98 100644 --- a/var/spack/repos/builtin/packages/py-rospkg/package.py +++ b/var/spack/repos/builtin/packages/py-rospkg/package.py @@ -19,4 +19,3 @@ class PyRospkg(PythonPackage): depends_on("py-catkin-pkg", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) depends_on("py-distro", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", 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 7d00b0d62f..a788fba334 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -44,5 +44,4 @@ class PyRpy2(PythonPackage): # @:2.8.6 depends_on("r@2.8:", when="@:2.8.6", type=("build", "run")) - depends_on("py-singledispatch", when="^python@:2", type=("build", "run")) depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-rseqc/package.py b/var/spack/repos/builtin/packages/py-rseqc/package.py index 47d5519748..54d2e9fb5d 100644 --- a/var/spack/repos/builtin/packages/py-rseqc/package.py +++ b/var/spack/repos/builtin/packages/py-rseqc/package.py @@ -15,15 +15,13 @@ class PyRseqc(PythonPackage): pypi = "RSeQC/RSeQC-2.6.4.tar.gz" version("3.0.1", sha256="d5f4cb2c24a7348929f5c4947d84c5869e8cd2cba5ba5248d991ebb37c4c6b3d") - version("2.6.4", sha256="e11df661bda1c24fc950f0bce06f586a68ab5f4a2c356f43e4a0dfdc1e184315") - depends_on("python@2.7:2.8", type=("build", "run"), when="@:2") - depends_on("python@3.5:", type=("build", "run"), when="@3:") + depends_on("python@3.5:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-nose@0.10.4:", type="build") depends_on("py-cython@0.17:", type=("build", "run")) depends_on("py-bx-python", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) depends_on("py-pysam", type=("build", "run")) - depends_on("py-pybigwig", type=("build", "run"), when="@3:") + depends_on("py-pybigwig", type=("build", "run")) depends_on("r", type="run") diff --git a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py index d40069be3f..81ce1f35ee 100644 --- a/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py +++ b/var/spack/repos/builtin/packages/py-ruamel-yaml/package.py @@ -24,7 +24,6 @@ class PyRuamelYaml(PythonPackage): depends_on("python@3.5:", when="@0.17:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-setuptools@28.7:", when="@0.17:", type=("build")) - depends_on("py-ruamel-ordereddict", when="@0.15:^python@:2", type=("build", "run")) depends_on("py-ruamel-yaml-clib@0.1.2:", when="@0.16:^python@:3.8", type=("build", "run")) @run_after("install") diff --git a/var/spack/repos/builtin/packages/py-s3transfer/package.py b/var/spack/repos/builtin/packages/py-s3transfer/package.py index 30cd14eab1..c595150b1f 100644 --- a/var/spack/repos/builtin/packages/py-s3transfer/package.py +++ b/var/spack/repos/builtin/packages/py-s3transfer/package.py @@ -23,4 +23,3 @@ class PyS3transfer(PythonPackage): depends_on("py-setuptools", type="build") 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-scipy/package.py b/var/spack/repos/builtin/packages/py-scipy/package.py index 752e40976f..41d60bc946 100644 --- a/var/spack/repos/builtin/packages/py-scipy/package.py +++ b/var/spack/repos/builtin/packages/py-scipy/package.py @@ -50,12 +50,6 @@ class PyScipy(PythonPackage): version("1.2.2", sha256="a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1") version("1.2.1", sha256="e085d1babcb419bbe58e2e805ac61924dac4ca45a07c9fa081144739e500aa3c") version("1.1.0", sha256="878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1") - version("1.0.0", sha256="87ea1f11a0e9ec08c264dc64551d501fa307289460705f6fccd84cbfc7926d10") - version("0.19.1", sha256="a19a2ca7a7336495ec180adeaa0dfdcf41e96dbbee90d51c3ed828ba570884e6") - version("0.18.1", sha256="8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e") - version("0.17.0", sha256="f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089") - version("0.15.1", sha256="a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a") - version("0.15.0", sha256="0c74e31e08acc8bf9b6ceb9bced73df2ae0cc76003e0366350bc7b26292bf8b1") # TODO: remove once pip build supports BLAS/LAPACK specification # https://github.com/mesonbuild/meson-python/pull/167 @@ -95,10 +89,7 @@ class PyScipy(PythonPackage): depends_on("py-numpy@1.16.5:+blas+lapack", when="@1.6:1.6.1", 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.13.3:+blas+lapack", when="@1.3:1.4", 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.7.1:+blas+lapack", when="@0.18.0:0.18", 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.5.1:+blas+lapack", when="@:0.15", type=("build", "link", "run")) + depends_on("py-numpy@1.8.2:+blas+lapack", when="@:1.2", type=("build", "link", "run")) depends_on("python@3.8:3.11", when="@1.9:", type=("build", "link", "run")) depends_on("python@3.8:3.10", when="@1.8", type=("build", "link", "run")) depends_on("python@3.7:3.10", when="@1.7.2:1.7", type=("build", "link", "run")) @@ -106,8 +97,7 @@ class PyScipy(PythonPackage): depends_on("python@3.7:", when="@1.6:1.6.1", type=("build", "link", "run")) depends_on("python@3.6:", when="@1.5.0:1.5", type=("build", "link", "run")) depends_on("python@3.5:", when="@1.3:1.4", 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@2.6:2.8,3.2:", when="@:0.17", type=("build", "link", "run")) + depends_on("python@2.7:2.8,3.4:", when="@:1.2", type=("build", "link", "run")) depends_on("py-pytest", type="test") # NOTE: scipy should use the same BLAS/LAPACK as numpy. diff --git a/var/spack/repos/builtin/packages/py-scoop/package.py b/var/spack/repos/builtin/packages/py-scoop/package.py index 6ab7da9912..40cca3857d 100644 --- a/var/spack/repos/builtin/packages/py-scoop/package.py +++ b/var/spack/repos/builtin/packages/py-scoop/package.py @@ -20,4 +20,3 @@ class PyScoop(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-greenlet@0.3.4:", type=("build", "run")) depends_on("py-pyzmq@13.1.0:", type=("build", "run")) - depends_on("py-argparse@1.1:", when="^python@:2.6,3.0:3.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sdmetrics/package.py b/var/spack/repos/builtin/packages/py-sdmetrics/package.py index 76973ed26a..ca13a61550 100644 --- a/var/spack/repos/builtin/packages/py-sdmetrics/package.py +++ b/var/spack/repos/builtin/packages/py-sdmetrics/package.py @@ -21,8 +21,7 @@ class PySdmetrics(PythonPackage): depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.18:1.19", type=("build", "run"), when="^python@3.6") - depends_on("py-numpy@1.20:1", type=("build", "run"), when="^python@3.7:") + depends_on("py-numpy@1.20:1", type=("build", "run")) depends_on("py-pandas@1.1.3:1.1.4", type=("build", "run")) depends_on("py-scikit-learn@0.24:1", type=("build", "run")) depends_on("py-scipy@1.5.4:1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sdv/package.py b/var/spack/repos/builtin/packages/py-sdv/package.py index 39a8848c64..9988a2e48d 100644 --- a/var/spack/repos/builtin/packages/py-sdv/package.py +++ b/var/spack/repos/builtin/packages/py-sdv/package.py @@ -26,8 +26,7 @@ class PySdv(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-faker@3.0.0:9", type=("build", "run")) depends_on("py-graphviz@0.13.2:0", type=("build", "run")) - depends_on("py-numpy@1.18:1.19", type=("build", "run"), when="^python@3.6") - depends_on("py-numpy@1.20:1", type=("build", "run"), when="^python@3.7:") + depends_on("py-numpy@1.20:1", type=("build", "run")) depends_on("py-pandas@1.1.3:1.1.4", type=("build", "run")) depends_on("py-tqdm@4.15:4", type=("build", "run")) depends_on("py-copulas@0.6.0:0.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-selectors34/package.py b/var/spack/repos/builtin/packages/py-selectors34/package.py deleted file mode 100644 index 2c4147ef80..0000000000 --- a/var/spack/repos/builtin/packages/py-selectors34/package.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - -# Package automatically generated using 'pip2spack' converter - - -class PySelectors34(PythonPackage): - """ - Backport of the selectors module from Python 3.4. - """ - - homepage = "https://github.com/berkerpeksag/selectors34" - pypi = "selectors34/selectors34-1.2.tar.gz" - maintainers = ["liuyangzhuan"] - - version("1.2", sha256="09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c") - - depends_on("py-setuptools", type="build") - depends_on("py-six", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-singledispatch/package.py b/var/spack/repos/builtin/packages/py-singledispatch/package.py deleted file mode 100644 index 65cf696603..0000000000 --- a/var/spack/repos/builtin/packages/py-singledispatch/package.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PySingledispatch(PythonPackage): - """This library brings functools.singledispatch to Python 2.6-3.3.""" - - pypi = "singledispatch/singledispatch-3.4.0.3.tar.gz" - - version("3.7.0", sha256="c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092") - version("3.4.0.3", sha256="5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c") - - depends_on("python@2.6:", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-setuptools@42:", type="build", when="@3.7:") - depends_on("py-setuptools-scm@3.4.1: +toml", type="build", when="@3.7:") - depends_on("py-six", type=("build", "run")) - depends_on("py-ordereddict", when="^python@:2.6", 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 985159e822..733b8f4c2a 100644 --- a/var/spack/repos/builtin/packages/py-slepc4py/package.py +++ b/var/spack/repos/builtin/packages/py-slepc4py/package.py @@ -31,10 +31,6 @@ class PySlepc4py(PythonPackage): version("3.13.0", sha256="780eff0eea1a5217642d23cd563786ef22df27e1d772a1b0bb4ccc5701df5ea5") version("3.12.0", sha256="d8c06953b7d00f529a9a7fd016dfa8efdf1d05995baeea7688d1d59611f424f7") version("3.11.0", sha256="1e591056beee209f585cd781e5fe88174cd2a61215716a71d9eaaf9411b6a775") - version("3.10.0", sha256="6494959f44280d3b80e73978d7a6bf656c9bb04bb3aa395c668c7a58948db1c6") - version("3.9.0", sha256="84cab4216268c2cb7d01e7cdbb1204a3c3e13cdfcd7a78ea057095f96f68c3c0") - version("3.8.0", sha256="988815b3650b69373be9abbf2355df512dfd200aa74b1785b50a484d6dfee971") - version("3.7.0", sha256="139f8bb325dad00a0e8dbe5b3e054050c82547936c1b6e7812fb1a3171c9ad0b") patch("ldshared.patch", when="@:99") patch("ldshared-dev.patch", when="@main") @@ -50,10 +46,6 @@ class PySlepc4py(PythonPackage): 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("slepc") depends_on("slepc@3.18.0:3.18", when="@3.18.0:3.18") @@ -63,10 +55,6 @@ class PySlepc4py(PythonPackage): 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") @property def build_directory(self): diff --git a/var/spack/repos/builtin/packages/py-smart-open/package.py b/var/spack/repos/builtin/packages/py-smart-open/package.py index 0922b1425f..2300387d51 100644 --- a/var/spack/repos/builtin/packages/py-smart-open/package.py +++ b/var/spack/repos/builtin/packages/py-smart-open/package.py @@ -45,7 +45,6 @@ class PySmartOpen(PythonPackage): depends_on("py-azure-core", type=("build", "run")) with when("@:2"): - depends_on("py-bz2file", when="^python@:2", type=("build", "run")) depends_on("py-requests", type=("build", "run")) depends_on("py-boto3", type=("build", "run")) depends_on("py-boto@2.3.2:", when="@1.8.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sniffio/package.py b/var/spack/repos/builtin/packages/py-sniffio/package.py index 257c236604..f37ef999df 100644 --- a/var/spack/repos/builtin/packages/py-sniffio/package.py +++ b/var/spack/repos/builtin/packages/py-sniffio/package.py @@ -20,4 +20,3 @@ class PySniffio(PythonPackage): depends_on("python@3.5:", type=("build", "run")) depends_on("python@3.7:", when="@1.3.0:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-contextvars@2.1:", when="^python@:3.6", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-soupsieve/package.py b/var/spack/repos/builtin/packages/py-soupsieve/package.py index c1e694ea50..93e30679a5 100644 --- a/var/spack/repos/builtin/packages/py-soupsieve/package.py +++ b/var/spack/repos/builtin/packages/py-soupsieve/package.py @@ -23,4 +23,3 @@ class PySoupsieve(PythonPackage): depends_on("py-setuptools", when="@:2.1", type="build") depends_on("py-setuptools@42:", when="@2.2", type="build") depends_on("py-hatchling@0.21.1:", when="@2.3.2:", type="build") - depends_on("py-backports-functools-lru-cache", when="^python@:2", 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 746f00aa4a..a8cedbb9ff 100644 --- a/var/spack/repos/builtin/packages/py-spacy/package.py +++ b/var/spack/repos/builtin/packages/py-spacy/package.py @@ -37,4 +37,3 @@ class PySpacy(PythonPackage): 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", 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-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index 86de3285a1..2ec22cc58a 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -104,5 +104,3 @@ class PySphinx(PythonPackage): depends_on("py-sphinxcontrib-websupport", when="@1.6:1", type=("build", "run")) depends_on("py-six@1.5:", when="@:1", type=("build", "run")) depends_on("py-sphinx-rtd-theme@0.1:", when="@:1.3", type=("build", "run")) - depends_on("py-typing", when="@1.6.2:^python@2.7:3.4", type=("build", "run")) - depends_on("py-typing", when="@1.6.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py index 5689814b0a..c867367be7 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-bibtex/package.py @@ -36,5 +36,4 @@ class PySphinxcontribBibtex(PythonPackage): depends_on("py-sphinx@2.1:", type=("build", "run"), when="@2.1.3:") depends_on("py-oset@0.1.3:", type=("build", "run"), when="@:2.0.0") depends_on("py-docutils@0.8:", type=("build", "run"), when="@2.1.0:") - depends_on("py-dataclasses", when="@2.2.0: ^python@:3.6", type=("build", "run")) depends_on("py-importlib-metadata@3.6:", when="@2.5.0: ^python@:3.9", 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 b2efca510b..355922c068 100644 --- a/var/spack/repos/builtin/packages/py-sqlalchemy/package.py +++ b/var/spack/repos/builtin/packages/py-sqlalchemy/package.py @@ -49,7 +49,7 @@ class PySqlalchemy(PythonPackage): depends_on("python@2.7:2.8,3.4:", when="@:1.3", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-importlib-metadata", when="@1.4.0: ^python@:3.7", type="run") - depends_on("py-greenlet@:0.4.16,0.4.18:", when="@1.4.0: ^python@3:", type="run") + depends_on("py-greenlet@:0.4.16,0.4.18:", when="@1.4.0:", type="run") variant( "backend", @@ -58,12 +58,8 @@ 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", 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", when="backend=pymysql @1.4: ^python@:2.7", type=("build", "run")) + depends_on("py-mysqlclient@1.4:", when="backend=mysql @1.4:", type=("build", "run")) + depends_on("py-pymysql", when="backend=pymysql @1.4:", 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-srsly/package.py b/var/spack/repos/builtin/packages/py-srsly/package.py index 636ae4cb14..cfe2268aef 100644 --- a/var/spack/repos/builtin/packages/py-srsly/package.py +++ b/var/spack/repos/builtin/packages/py-srsly/package.py @@ -21,7 +21,6 @@ class PySrsly(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-wheel", when="@2:", type="build") depends_on("py-cython@0.25:", when="@2:", type="build") - depends_on("py-pathlib@1.0.1", when="^python@:3.3", type=("build", "run")) # https://github.com/explosion/srsly/pull/24 patch("subprocess.patch", when="@2.0.0:2.0.1") diff --git a/var/spack/repos/builtin/packages/py-statsmodels/package.py b/var/spack/repos/builtin/packages/py-statsmodels/package.py index 4e2b937411..b3fc5951c6 100644 --- a/var/spack/repos/builtin/packages/py-statsmodels/package.py +++ b/var/spack/repos/builtin/packages/py-statsmodels/package.py @@ -19,11 +19,7 @@ class PyStatsmodels(PythonPackage): version("0.12.1", sha256="a271b4ccec190148dccda25f0cbdcbf871f408fc1394a10a7dc1af4a62b91c8e") version("0.10.2", sha256="9cd2194c6642a8754e85f9a6e6912cdf996bebf6ff715d3cc67f65dadfd37cc9") version("0.10.1", sha256="320659a80f916c2edf9dfbe83512d9004bb562b72eedb7d9374562038697fa10") - version("0.8.0", sha256="26431ab706fbae896db7870a0892743bfbb9f5c83231644692166a31d2d86048") - variant("plotting", default=False, description="With matplotlib") - - depends_on("python@:3.6", when="@:0.8.0", type=("build", "link", "run")) depends_on("python@2.7:2.8,3.4:", when="@0.10.1:", type=("build", "link", "run")) depends_on("python@3.6:", when="@0.12.1:", type=("build", "link", "run")) @@ -38,24 +34,19 @@ class PyStatsmodels(PythonPackage): # https://github.com/statsmodels/statsmodels/issues/5343 and # https://github.com/pydata/patsy/pull/131 - depends_on("py-numpy@1.7.0:", type=("build", "link", "run"), when="@0.8.0:") depends_on("py-numpy@1.11.0:", type=("build", "link", "run"), when="@0.10.1:") depends_on("py-numpy@1.15.0:", type=("build", "link", "run"), when="@0.12.1:") depends_on("py-numpy@1.17.0:", type=("build", "link", "run"), when="@0.13.0:") - depends_on("py-pandas@0.12:", type=("build", "run"), when="@0.8.0:") depends_on("py-pandas@0.19:", type=("build", "run"), when="@0.10.1:") depends_on("py-pandas@0.23:", type=("build", "run"), when="@0.12.0:") depends_on("py-pandas@0.25:", type=("build", "run"), when="@0.13.0:") - depends_on("py-patsy@0.2.1:", type=("build", "run"), when="@0.8.0:") depends_on("py-patsy@0.4.0:", type=("build", "run"), when="@0.10.1:") depends_on("py-patsy@0.5.1:", type=("build", "run"), when="@0.12.0:") depends_on("py-patsy@0.5.2:", type=("build", "run"), when="@0.13.0:") - depends_on("py-scipy@0.11:", type=("build", "run"), when="@0.8.0:") depends_on("py-scipy@0.18:", type=("build", "run"), when="@0.10.1:") depends_on("py-scipy@1.2:", type=("build", "run"), when="@0.12.0:") depends_on("py-scipy@1.3:", type=("build", "run"), when="@0.13.0:") depends_on("py-packaging@21.3:", type=("build", "run"), when="@0.13.2:") - depends_on("py-matplotlib@1.3:", type=("build", "run"), when="@0.8.0 +plotting") depends_on("py-pytest", type="test") diff --git a/var/spack/repos/builtin/packages/py-stdlib-list/package.py b/var/spack/repos/builtin/packages/py-stdlib-list/package.py index 0b4d7785cc..972ceb2798 100644 --- a/var/spack/repos/builtin/packages/py-stdlib-list/package.py +++ b/var/spack/repos/builtin/packages/py-stdlib-list/package.py @@ -16,5 +16,4 @@ class PyStdlibList(PythonPackage): version("0.6.0", sha256="133cc99104f5a4e1604dc88ebb393529bd4c2b99ae7e10d46c0b596f3c67c3f0") - depends_on("py-functools32", when="^python@:3.1", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-storm/package.py b/var/spack/repos/builtin/packages/py-storm/package.py index 89699baa28..9e9c4f1afa 100644 --- a/var/spack/repos/builtin/packages/py-storm/package.py +++ b/var/spack/repos/builtin/packages/py-storm/package.py @@ -18,10 +18,8 @@ class PyStorm(PythonPackage): sha256="01c59f1c898fb9891333abd65519ba2dd5f68623ac8e67b54932e99ce52593d3", url="https://files.pythonhosted.org/packages/source/s/storm/storm-0.23.tar.bz2", ) - version("0.20", sha256="35f5883e93a262002ca59dbb39645c67434a182d758543c4a2467ff690ac23a5") depends_on("py-setuptools", type="build") - depends_on("py-six", type=("build", "run"), when="@0.23:") + depends_on("py-six", type=("build", "run")) depends_on("py-zope-interface@4:", type=("build", "run")) - depends_on("python@2.7:2.8", type=("build", "run"), when="@:0.20") - depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@0.21:") + depends_on("python@2.7:2.8,3.5:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-subprocess32/package.py b/var/spack/repos/builtin/packages/py-subprocess32/package.py deleted file mode 100644 index 11f8144153..0000000000 --- a/var/spack/repos/builtin/packages/py-subprocess32/package.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PySubprocess32(PythonPackage): - """A backport of the subprocess module from Python 3.2/3.3 for 2.x.""" - - pypi = "subprocess32/subprocess32-3.2.7.tar.gz" - - version("3.5.4", sha256="eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d") - version("3.2.7", sha256="1e450a4a4c53bf197ad6402c564b9f7a53539385918ef8f12bdf430a61036590") - - depends_on("py-setuptools", type="build", when="@3.5.0:") diff --git a/var/spack/repos/builtin/packages/py-symfit/package.py b/var/spack/repos/builtin/packages/py-symfit/package.py index 6c551bcadd..fe6dee4a10 100644 --- a/var/spack/repos/builtin/packages/py-symfit/package.py +++ b/var/spack/repos/builtin/packages/py-symfit/package.py @@ -19,4 +19,3 @@ class PySymfit(PythonPackage): depends_on("py-numpy", type="run") depends_on("py-scipy", type="run") depends_on("py-sympy", type="run") - depends_on("py-funcsigs", type="run", when="^python@:2.8") 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 d641db08d1..f4897c0534 100644 --- a/var/spack/repos/builtin/packages/py-tap-py/package.py +++ b/var/spack/repos/builtin/packages/py-tap-py/package.py @@ -14,13 +14,9 @@ class PyTapPy(PythonPackage): version("3.0", sha256="f5eeeeebfd64e53d32661752bb4c288589a3babbb96db3f391a4ec29f1359c70") version("2.6.2", sha256="5f219d92dbad5e378f8f7549cdfe655b0d5fd2a778f9c83bee51b61c6ca40efb") - version("1.6", sha256="3ee315567cd1cf444501c405b7f7146ffdb2e630bac58d0840d378a3b9a0dbe4") extends("python", ignore="bin/nosetests|bin/pygmentize") - 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") - depends_on("py-pygments", type=("build", "run"), when="@:1") + depends_on("python@3.5:3.7", when="@3.0:", type=("build", "run")) + depends_on("python@2.7:2.8,3.5:3.7", type=("build", "run")) 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 f53fd55d5b..ce24e43d76 100644 --- a/var/spack/repos/builtin/packages/py-tatsu/package.py +++ b/var/spack/repos/builtin/packages/py-tatsu/package.py @@ -20,7 +20,5 @@ 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") # 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 8dd3a67ac4..776677ac16 100644 --- a/var/spack/repos/builtin/packages/py-tenacity/package.py +++ b/var/spack/repos/builtin/packages/py-tenacity/package.py @@ -22,7 +22,3 @@ class PyTenacity(PythonPackage): depends_on("py-setuptools-scm@3.4:+toml", type="build") depends_on("py-six@1.9.0:", type=("build", "run"), when="@:7") - - 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 3d4c88ac4e..cdbfaa7a4e 100644 --- a/var/spack/repos/builtin/packages/py-tensorboard/package.py +++ b/var/spack/repos/builtin/packages/py-tensorboard/package.py @@ -92,5 +92,4 @@ class PyTensorboard(PythonPackage): depends_on("py-werkzeug@0.11.15:", type=("build", "run")) depends_on("py-werkzeug@1.0.1:", type=("build", "run"), when="@2.9:") depends_on("py-wheel@0.26:", type="build") - depends_on("py-futures@3.1.1:", type=("build", "run"), when="^python@:2") depends_on("py-six@1.10.0:", type=("build", "run"), when="@:2.4") diff --git a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py index f6c9fcae57..c1c26bb73b 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-datasets/package.py @@ -32,6 +32,5 @@ class PyTensorflowDatasets(PythonPackage): depends_on("py-tensorflow-metadata", type=("build", "run")) depends_on("py-termcolor", type=("build", "run")) depends_on("py-tqdm", type=("build", "run")) - depends_on("py-dataclasses", type=("build", "run"), when="python@:3.6") depends_on("py-typing-extensions", type=("build", "run"), when="python@:3.7") depends_on("py-importlib-resources", type=("build", "run"), when="python@:3.8") 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 f83ea56800..fd0576d259 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow-estimator/package.py @@ -56,7 +56,6 @@ class PyTensorflowEstimator(Package): depends_on("bazel@0.19.0:", type="build") depends_on("py-pip", type="build") depends_on("py-wheel", type="build") - depends_on("py-funcsigs@1.0.2:", type=("build", "run"), when="^python@:3.2") def install(self, spec, prefix): self.tmp_path = tempfile.mkdtemp(prefix="spack") diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index 2933f80cb6..f9f8aa04e4 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -178,7 +178,6 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage): depends_on("swig", type="build") depends_on("py-pip", type="build") depends_on("py-wheel", type="build") - 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@1:", type=("build", "run"), when="@2.9:") @@ -306,20 +305,14 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage): # No longer a dependency in latest versions depends_on("py-astor@0.6:", type=("build", "run"), when="@1.6:2.1") - depends_on("py-backports-weakref@1.0:", type=("build", "run"), when="@1.3: ^python@:3.3") depends_on("py-backports-weakref@1.0rc1", type=("build", "run"), when="@1.2") - depends_on("py-enum34@1.1.6:", type=("build", "run"), when="@1.5: ^python@:3.3") - depends_on("py-enum34@1.1.6:", type=("build", "run"), when="@1.4.0:1.4.1") 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") - depends_on("py-mock@2:", 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-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-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") depends_on("py-wheel@0.32:0", type=("build", "run"), when="@2.7") - depends_on("py-wheel@0.35:0", type=("build", "run"), when="@2.4:2.6 ^python@3:") - depends_on("py-wheel@0.26:", type=("build", "run"), when="@:2.3 ^python@3:") + depends_on("py-wheel@0.35:0", type=("build", "run"), when="@2.4:2.6") + depends_on("py-wheel@0.26:", type=("build", "run"), when="@:2.3") # TODO: add packages for some of these dependencies depends_on("mkl", when="+mkl") diff --git a/var/spack/repos/builtin/packages/py-testinfra/package.py b/var/spack/repos/builtin/packages/py-testinfra/package.py index 466f046b4d..d669d164ee 100644 --- a/var/spack/repos/builtin/packages/py-testinfra/package.py +++ b/var/spack/repos/builtin/packages/py-testinfra/package.py @@ -20,7 +20,6 @@ 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", 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 5c6f025c0f..0e5a819bf0 100644 --- a/var/spack/repos/builtin/packages/py-thinc/package.py +++ b/var/spack/repos/builtin/packages/py-thinc/package.py @@ -27,4 +27,3 @@ class PyThinc(PythonPackage): 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", 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 d07fd91339..b28b0890e2 100644 --- a/var/spack/repos/builtin/packages/py-tomlkit/package.py +++ b/var/spack/repos/builtin/packages/py-tomlkit/package.py @@ -20,6 +20,3 @@ class PyTomlkit(PythonPackage): depends_on("python@2.7,3.5:", type=("build", "run")) depends_on("python@3.6:3", when="@0.11.0:", type=("build", "run")) depends_on("py-poetry-core@1:", type="build") - depends_on("py-enum34@1.1:1", when="^python@2.7", type=("build", "run")) - depends_on("py-functools32@3.2.3:3", when="^python@2.7", type=("build", "run")) - depends_on("py-typing@3.6:3", when="^python@2.7,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 d23b1aceea..8533ce4f22 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -136,13 +136,10 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage): depends_on("py-cffi", type=("build", "run")) depends_on("py-typing-extensions@3.6.2.1:", when="@1.7:", 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")) depends_on("py-six", when="@1.13:", type=("build", "run")) depends_on("py-requests", when="@1.13:", type=("build", "run")) - depends_on("py-dataclasses", when="@1.7: ^python@3.6", type=("build", "run")) # Undocumented dependencies - depends_on("py-typing", when="^python@:3.4", type=("build", "run")) depends_on("py-tqdm", type="run") depends_on("blas") depends_on("lapack") diff --git a/var/spack/repos/builtin/packages/py-torchgeo/package.py b/var/spack/repos/builtin/packages/py-torchgeo/package.py index 5fc2d4b7ea..26096ad0ee 100644 --- a/var/spack/repos/builtin/packages/py-torchgeo/package.py +++ b/var/spack/repos/builtin/packages/py-torchgeo/package.py @@ -37,7 +37,6 @@ class PyTorchgeo(PythonPackage): depends_on("python@3.6:3+bz2", when="@:0.2", type=("build", "run")) depends_on("py-setuptools@42:65", when="@0.3.1:", type="build") depends_on("py-setuptools@42:63", when="@:0.3.0", type="build") - depends_on("py-dataclasses", when="@0.2 ^python@3.6", type=("build", "run")) depends_on("py-einops@0.3:0.4", type=("build", "run")) depends_on("py-fiona@1.8:1", when="@0.3:", type=("build", "run")) depends_on("py-fiona@1.5:1", when="@:0.2", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-tornado/package.py b/var/spack/repos/builtin/packages/py-tornado/package.py index a479d4a938..e78b3cb0cf 100644 --- a/var/spack/repos/builtin/packages/py-tornado/package.py +++ b/var/spack/repos/builtin/packages/py-tornado/package.py @@ -24,8 +24,3 @@ class PyTornado(PythonPackage): depends_on("python@3.7:", when="@6.2:", type=("build", "run")) 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 ^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", 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-tqdm/package.py b/var/spack/repos/builtin/packages/py-tqdm/package.py index 9769e7e1af..1c4348cb68 100644 --- a/var/spack/repos/builtin/packages/py-tqdm/package.py +++ b/var/spack/repos/builtin/packages/py-tqdm/package.py @@ -30,6 +30,5 @@ class PyTqdm(PythonPackage): depends_on("py-setuptools@42:", type=("build", "run")) depends_on("py-setuptools-scm@3.4:+toml", type="build") depends_on("py-colorama", when="platform=windows", type=("build", "run")) - depends_on("py-importlib-resources", when="@4.63: ^python@:3.6", type=("build", "run")) depends_on("py-requests", when="+telegram", type=("build", "run")) depends_on("py-ipywidgets@6:", when="+notebook", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-traitlets/package.py b/var/spack/repos/builtin/packages/py-traitlets/package.py index e8117993d4..96ba64e57c 100644 --- a/var/spack/repos/builtin/packages/py-traitlets/package.py +++ b/var/spack/repos/builtin/packages/py-traitlets/package.py @@ -31,4 +31,3 @@ class PyTraitlets(PythonPackage): depends_on("py-ipython-genutils", when="@:5.0", type=("build", "run")) depends_on("py-six", when="@:4", type=("build", "run")) depends_on("py-decorator", when="@:4", type=("build", "run")) - depends_on("py-enum34", when="^python@:3.3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-transformers/package.py b/var/spack/repos/builtin/packages/py-transformers/package.py index d2643b732c..705aaabade 100644 --- a/var/spack/repos/builtin/packages/py-transformers/package.py +++ b/var/spack/repos/builtin/packages/py-transformers/package.py @@ -40,8 +40,6 @@ class PyTransformers(PythonPackage): depends_on("py-tqdm@4.27:", type=("build", "run")) # Historical requirements - depends_on("py-dataclasses", when="@4.6.1 ^python@:3.6", type=("build", "run")) depends_on("py-sacremoses", when="@:4.6", type=("build", "run")) depends_on("py-boto3", when="@2.8.0", type=("build", "run")) - depends_on("py-dataclasses", when="@2.8.0 ^python@:3.6", type=("build", "run")) depends_on("py-sentencepiece", when="@2.8.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-twisted/package.py b/var/spack/repos/builtin/packages/py-twisted/package.py index 6df8cacf57..61f7266720 100644 --- a/var/spack/repos/builtin/packages/py-twisted/package.py +++ b/var/spack/repos/builtin/packages/py-twisted/package.py @@ -21,8 +21,7 @@ class PyTwisted(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-setuptools@35.0.2:", type="build", when="@21.7.0:") - depends_on("py-zope-interface@3.6.0:", type=("build", "run"), when="^python@:2") - depends_on("py-zope-interface@4.0.2:", type=("build", "run"), when="^python@3:") + depends_on("py-zope-interface@4.0.2:", type=("build", "run")) depends_on("py-zope-interface@4.4.2:", type=("build", "run"), when="@21.7.0:") depends_on("py-incremental@21.3.0:", type=("build", "run"), when="@21.7.0:") diff --git a/var/spack/repos/builtin/packages/py-typing-extensions/package.py b/var/spack/repos/builtin/packages/py-typing-extensions/package.py index 4f6418bb0e..2df414e3db 100644 --- a/var/spack/repos/builtin/packages/py-typing-extensions/package.py +++ b/var/spack/repos/builtin/packages/py-typing-extensions/package.py @@ -33,5 +33,3 @@ class PyTypingExtensions(PythonPackage): # typing-extensions 3 uses setuptools depends_on("python@2.7:2.8,3.4:", when="@:3", type=("build", "run")) depends_on("py-setuptools", when="@:3", type="build") - depends_on("py-typing@3.7.4:", when="@3.7:3 ^python@:3.4", type=("build", "run")) - depends_on("py-typing@3.6.2:", when="@:3.6 ^python@:3.4", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-typing/package.py b/var/spack/repos/builtin/packages/py-typing/package.py deleted file mode 100644 index b9b98ccb98..0000000000 --- a/var/spack/repos/builtin/packages/py-typing/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyTyping(PythonPackage): - """This is a backport of the standard library typing module to Python - versions older than 3.6.""" - - homepage = "https://docs.python.org/3/library/typing.html" - pypi = "typing/typing-3.7.4.1.tar.gz" - - version("3.7.4.3", sha256="1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9") - version("3.7.4.1", sha256="91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23") - version("3.6.6", sha256="4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d") - version("3.6.4", sha256="d400a9344254803a2368533e4533a4200d21eb7b6b729c173bc38201a74db3f2") - version("3.6.1", sha256="c36dec260238e7464213dcd50d4b5ef63a507972f5780652e835d0228d0edace") - - # Don't use this with new versions of python (3.5+) - # python 3.7 and later will actively not import - # https://github.com/python/typing/issues/573 - # _abc_registry now private https://bugs.python.org/issue31333 - depends_on("python@2.7:2.8,3.4:3.6", type=("build", "run")) - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-unittest2/package.py b/var/spack/repos/builtin/packages/py-unittest2/package.py deleted file mode 100644 index e1083d3d31..0000000000 --- a/var/spack/repos/builtin/packages/py-unittest2/package.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyUnittest2(PythonPackage): - """unittest2 is a backport of the new features added to the unittest - testing framework in Python 2.7 and onwards.""" - - pypi = "unittest2/unittest2-1.1.0.tar.gz" - - version("1.1.0", sha256="22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579") - - depends_on("py-setuptools", type="build") - depends_on("py-traceback2", type=("build", "run")) - depends_on("py-six@1.4:", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", 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 28e8165bb5..3b505c4b6b 100644 --- a/var/spack/repos/builtin/packages/py-urllib3/package.py +++ b/var/spack/repos/builtin/packages/py-urllib3/package.py @@ -37,7 +37,6 @@ class PyUrllib3(PythonPackage): depends_on("py-cryptography@1.3.4:", when="+secure") depends_on("py-idna@2:", when="+secure") depends_on("py-certifi", when="+secure") - depends_on("py-ipaddress", when="+secure ^python@2.7:2.8") depends_on("py-urllib3-secure-extra", when="+secure @1.26.12:") depends_on("py-pysocks@1.5.6,1.5.8:1", when="+socks") diff --git a/var/spack/repos/builtin/packages/py-vcrpy/package.py b/var/spack/repos/builtin/packages/py-vcrpy/package.py index d1df1392e7..714632b587 100644 --- a/var/spack/repos/builtin/packages/py-vcrpy/package.py +++ b/var/spack/repos/builtin/packages/py-vcrpy/package.py @@ -19,5 +19,4 @@ class PyVcrpy(PythonPackage): depends_on("py-pyyaml", type=("build", "run")) depends_on("py-wrapt", type=("build", "run")) depends_on("py-six@1.5:", type=("build", "run")) - depends_on("py-yarl", when="^python@3.6:", type=("build", "run")) - depends_on("py-yarl@:1.3", when="^python@3.5", type=("build", "run")) + depends_on("py-yarl", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-vcstool/package.py b/var/spack/repos/builtin/packages/py-vcstool/package.py index eb92cbbd06..609bd1ca24 100644 --- a/var/spack/repos/builtin/packages/py-vcstool/package.py +++ b/var/spack/repos/builtin/packages/py-vcstool/package.py @@ -19,4 +19,3 @@ class PyVcstool(PythonPackage): depends_on("py-pyyaml", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py index 047280360e..0399b560d0 100644 --- a/var/spack/repos/builtin/packages/py-virtualenv/package.py +++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py @@ -44,9 +44,6 @@ class PyVirtualenv(PythonPackage): depends_on("py-platformdirs@2.4:2", when="@20.16.4:", type=("build", "run")) depends_on("py-six@1.9.0:1", when="@20.10.0", type=("build", "run")) depends_on("py-importlib-metadata@0.12:", when="@20.10.0: ^python@:3.7", type=("build", "run")) - depends_on("py-importlib-resources@1:", when="@20.10.0: ^python@:3.6", type=("build", "run")) depends_on( "py-importlib-metadata@4.8.3:", when="@20.16.4: ^python@:3.7", type=("build", "run") ) - depends_on("py-importlib-resources@5.4:", when="@20.16.4: ^python@:3.6", type=("build", "run")) - depends_on("py-pathlib2", when="@20.10.0 ^python@:3.3", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-wandb/package.py b/var/spack/repos/builtin/packages/py-wandb/package.py index dc1497421b..f033e36fc1 100644 --- a/var/spack/repos/builtin/packages/py-wandb/package.py +++ b/var/spack/repos/builtin/packages/py-wandb/package.py @@ -28,6 +28,5 @@ class PyWandb(PythonPackage): depends_on("py-pyyaml", type=("build", "run")) depends_on("py-psutil", type=("build", "run")) depends_on("py-sentry-sdk", type=("build", "run")) - depends_on("py-subprocess32", type=("build", "run")) depends_on("py-dockerpy-creds", type=("build", "run")) depends_on("py-configparser", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-watchdog/package.py b/var/spack/repos/builtin/packages/py-watchdog/package.py index 63b9e76066..1eb1b361f7 100644 --- a/var/spack/repos/builtin/packages/py-watchdog/package.py +++ b/var/spack/repos/builtin/packages/py-watchdog/package.py @@ -39,8 +39,7 @@ class PyWatchdog(PythonPackage): depends_on("py-pyyaml@3.9:", type=("build", "run"), when="@0.7.1") depends_on("py-pyyaml@3.10:", type=("build", "run"), when="@0.8.0:0.8.3") - depends_on("py-pyyaml@:3.12", type=("build", "run"), when="@0.9.0 ^python@3.2") - depends_on("py-pyyaml@3.10:", type=("build", "run"), when="@0.9.0 ^python@2.6:2,3.3:") + depends_on("py-pyyaml@3.10:", type=("build", "run"), when="@0.9.0") depends_on("py-pyyaml@3.10:", type=("build", "run"), when="@0.10.0: +watchmedo") depends_on("py-pyyaml@3.10:", type=("build", "run"), when="@2.1.6: +watchmedo") @@ -56,7 +55,3 @@ class PyWatchdog(PythonPackage): # when='@0.10.0:0.10.1 platform=darwin') # depends_on('py-pyobjc-framework-fsevents@4.2.2:', # when='@0.10.0:0.10.1 platform=darwin') - - # Missing dependencies - conflicts("platform=darwin", when="@:0.9.0 ^python@:2.6") - # depends_on('py-select-backport@0.2:', when='@:0.9.0 ^python@:2.6 platform=darwin') diff --git a/var/spack/repos/builtin/packages/py-wcwidth/package.py b/var/spack/repos/builtin/packages/py-wcwidth/package.py index e224278bef..ca401be694 100644 --- a/var/spack/repos/builtin/packages/py-wcwidth/package.py +++ b/var/spack/repos/builtin/packages/py-wcwidth/package.py @@ -15,4 +15,3 @@ class PyWcwidth(PythonPackage): version("0.1.7", sha256="3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e") depends_on("py-setuptools", type="build") - depends_on("py-backports-functools-lru-cache@1.2.1:", when="@0.2.5: ^python@:3.1") diff --git a/var/spack/repos/builtin/packages/py-weave/package.py b/var/spack/repos/builtin/packages/py-weave/package.py deleted file mode 100644 index 3674c0b37f..0000000000 --- a/var/spack/repos/builtin/packages/py-weave/package.py +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyWeave(PythonPackage): - """Weave provides tools for including C/C++ code within Python code. - - Weave is the stand-alone version of the now-removed SciPy submodule - ``scipy.weave``. It is Python 2.x only, and is provided for users that - need new versions of SciPy but have existing code that still depends on - ``scipy.weave``. For new code, users are recommended to use Cython.""" - - homepage = "https://www.github.com/scipy/weave" - pypi = "weave/weave-0.17.0.tar.gz" - - version("0.17.0", sha256="2703f3ae6d23ad47b5f09b6bcb7affd0fb587120a0c973e7be40ef24de709998") - - depends_on("python@2.6:2.8", 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-websocket-client/package.py b/var/spack/repos/builtin/packages/py-websocket-client/package.py index 04485f6c6a..67de769065 100644 --- a/var/spack/repos/builtin/packages/py-websocket-client/package.py +++ b/var/spack/repos/builtin/packages/py-websocket-client/package.py @@ -36,5 +36,3 @@ class PyWebsocketClient(PythonPackage): depends_on("python@3.7:", type=("build", "run"), when="@1.4.1:") depends_on("py-setuptools", type="build") depends_on("py-six", type=("build", "run"), when="@:1.2.0") - depends_on("py-backports-ssl-match-hostname", when="^python@2.6:2.7.9", type=("build", "run")) - depends_on("py-argparse", when="^python@:2.6,3.0:3.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-werkzeug/package.py b/var/spack/repos/builtin/packages/py-werkzeug/package.py index c9a393a6bf..443e6184c8 100644 --- a/var/spack/repos/builtin/packages/py-werkzeug/package.py +++ b/var/spack/repos/builtin/packages/py-werkzeug/package.py @@ -29,5 +29,4 @@ class PyWerkzeug(PythonPackage): depends_on("python@3.6:", when="@2:", type=("build", "run")) depends_on("python@2.7:2.8,3.4:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-dataclasses", when="@2: ^python@:3.6", type=("build", "run")) depends_on("py-markupsafe@2.1.1:", when="@2.2.2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-workload-automation/package.py b/var/spack/repos/builtin/packages/py-workload-automation/package.py index e3f3871f15..0f74b11a11 100644 --- a/var/spack/repos/builtin/packages/py-workload-automation/package.py +++ b/var/spack/repos/builtin/packages/py-workload-automation/package.py @@ -31,8 +31,7 @@ class PyWorkloadAutomation(PythonPackage): depends_on("py-pyyaml@5.1:", type=("build", "run")) depends_on("py-requests", type=("build", "run")) depends_on("py-wrapt", type=("build", "run")) - depends_on("py-pandas@0.23.0:", type=("build", "run"), when="^python@3.5.3:") - depends_on("py-pandas@0.23.0:0.24.2", type=("build", "run"), when="^python@:3.5.2") + depends_on("py-pandas@0.23.0:", type=("build", "run")) depends_on("py-future", type=("build", "run")) depends_on("py-louie", type=("build", "run")) depends_on("py-devlib", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-wsproto/package.py b/var/spack/repos/builtin/packages/py-wsproto/package.py index 7257931b6c..3c37b9731e 100644 --- a/var/spack/repos/builtin/packages/py-wsproto/package.py +++ b/var/spack/repos/builtin/packages/py-wsproto/package.py @@ -21,5 +21,4 @@ class PyWsproto(PythonPackage): depends_on("python@3.6.1:", type=("build", "run")) depends_on("py-setuptools", type="build") - depends_on("py-dataclasses", type=("build", "run"), when="^python@:3.6") depends_on("py-h11@0.9.0:0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-xmlrunner/package.py b/var/spack/repos/builtin/packages/py-xmlrunner/package.py index 6915735fb6..3fea9a9698 100644 --- a/var/spack/repos/builtin/packages/py-xmlrunner/package.py +++ b/var/spack/repos/builtin/packages/py-xmlrunner/package.py @@ -15,4 +15,3 @@ class PyXmlrunner(PythonPackage): version("1.7.7", sha256="5a6113d049eca7646111ee657266966e5bbfb0b5ceb2e83ee0772e16d7110f39") depends_on("py-setuptools", type="build") - depends_on("py-unittest2", type=("build", "run"), when="^python@:2.8") diff --git a/var/spack/repos/builtin/packages/py-xopen/package.py b/var/spack/repos/builtin/packages/py-xopen/package.py index 22ce0369e0..31fce76f4a 100644 --- a/var/spack/repos/builtin/packages/py-xopen/package.py +++ b/var/spack/repos/builtin/packages/py-xopen/package.py @@ -33,4 +33,3 @@ class PyXopen(PythonPackage): depends_on("py-setuptools-scm@6.2:", type="build", when="@1.2.0:") depends_on("py-setuptools-scm", type="build") depends_on("py-isal@1.0.0:", type=("build", "run"), when="@1.6.0: target=x86_64:") - depends_on("py-bz2file", type=("build", "run"), when="@0.5: ^python@:2.8") diff --git a/var/spack/repos/builtin/packages/py-yaspin/package.py b/var/spack/repos/builtin/packages/py-yaspin/package.py index 72f6384b65..59cc8a2359 100644 --- a/var/spack/repos/builtin/packages/py-yaspin/package.py +++ b/var/spack/repos/builtin/packages/py-yaspin/package.py @@ -17,4 +17,3 @@ class PyYaspin(PythonPackage): depends_on("python@3.6.2:3", type=("build", "run")) depends_on("py-poetry-core@1:", type="build") depends_on("py-termcolor@1.1.0:1", type=("build", "run")) - depends_on("py-dataclasses@0.8", type=("build", "run"), when="^python@3.6") diff --git a/var/spack/repos/builtin/packages/py-yt/package.py b/var/spack/repos/builtin/packages/py-yt/package.py index f36e483098..41cd073ce9 100644 --- a/var/spack/repos/builtin/packages/py-yt/package.py +++ b/var/spack/repos/builtin/packages/py-yt/package.py @@ -49,7 +49,6 @@ 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", 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")) diff --git a/var/spack/repos/builtin/packages/py-zarr/package.py b/var/spack/repos/builtin/packages/py-zarr/package.py index e47305bd8f..941cdfaa28 100644 --- a/var/spack/repos/builtin/packages/py-zarr/package.py +++ b/var/spack/repos/builtin/packages/py-zarr/package.py @@ -31,4 +31,3 @@ class PyZarr(PythonPackage): depends_on("py-numcodecs@0.6.2:", type=("build", "run")) depends_on("py-numcodecs@0.6.4:", type=("build", "run"), when="@2.4.0:") depends_on("py-numpy@1.7:", type=("build", "run")) - depends_on("py-scandir", type=("build", "run"), when="^python@:3.4") diff --git a/var/spack/repos/builtin/packages/python/cray-rpath-2.3.patch b/var/spack/repos/builtin/packages/python/cray-rpath-2.3.patch deleted file mode 100644 index 54a85cc64a..0000000000 --- a/var/spack/repos/builtin/packages/python/cray-rpath-2.3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Lib/distutils/unixccompiler.py 2003-06-02 05:27:40.000000000 +1000 -+++ b/Lib/distutils/unixccompiler.py 2017-05-13 13:52:45.554213616 +1000 -@@ -208,7 +208,8 @@ - elif compiler[:3] == "gcc" or compiler[:3] == "g++": - return "-Wl,-R" + dir - else: -- return "-R" + dir -+ # Patched by spack to use gcc syntax by default: -+ return "-Wl,-R" + dir - - def library_option(self, lib): - return "-l" + lib diff --git a/var/spack/repos/builtin/packages/python/fj-rpath-2.3.patch b/var/spack/repos/builtin/packages/python/fj-rpath-2.3.patch deleted file mode 100644 index 2ebda4cc12..0000000000 --- a/var/spack/repos/builtin/packages/python/fj-rpath-2.3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Lib/distutils/unixccompiler.py 2003-06-02 05:27:40.000000000 +1000 -+++ b/Lib/distutils/unixccompiler.py 2017-05-13 13:52:45.554213616 +1000 -@@ -208,7 +208,8 @@ - elif compiler[:3] == "gcc" or compiler[:3] == "g++": - return "-Wl,-R" + dir - else: -- return "-R" + dir -+ # Patched by spack to use GNU ld syntax by default: -+ return "-Wl,--enable-new-dtags,-R" + dir - - def library_option(self, lib): - return "-l" + lib diff --git a/var/spack/repos/builtin/packages/python/gcc-8-2.7.14.patch b/var/spack/repos/builtin/packages/python/gcc-8-2.7.14.patch deleted file mode 100644 index 72c879cdea..0000000000 --- a/var/spack/repos/builtin/packages/python/gcc-8-2.7.14.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/Include/objimpl.h b/Include/objimpl.h -index 5f2868332955..cbf6bc3f8763 100644 ---- a/Include/objimpl.h -+++ b/Include/objimpl.h -@@ -248,6 +248,20 @@ PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); - /* for source compatibility with 2.2 */ - #define _PyObject_GC_Del PyObject_GC_Del - -+/* -+ * Former over-aligned definition of PyGC_Head, used to compute the size of the -+ * padding for the new version below. -+ */ -+union _gc_head; -+union _gc_head_old { -+ struct { -+ union _gc_head_old *gc_next; -+ union _gc_head_old *gc_prev; -+ Py_ssize_t gc_refs; -+ } gc; -+ long double dummy; -+}; -+ - /* GC information is stored BEFORE the object structure. */ - typedef union _gc_head { - struct { -@@ -255,7 +269,8 @@ typedef union _gc_head { - union _gc_head *gc_prev; - Py_ssize_t gc_refs; - } gc; -- long double dummy; /* force worst-case alignment */ -+ double dummy; /* Force at least 8-byte alignment. */ -+ char dummy_padding[sizeof(union _gc_head_old)]; - } PyGC_Head; - - extern PyGC_Head *_PyGC_generation0; diff --git a/var/spack/repos/builtin/packages/python/intel-3.6.7.patch b/var/spack/repos/builtin/packages/python/intel-3.7.patch index f2277624af..f2277624af 100644 --- a/var/spack/repos/builtin/packages/python/intel-3.6.7.patch +++ b/var/spack/repos/builtin/packages/python/intel-3.7.patch diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index e81abd883f..513364e05e 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -106,221 +106,6 @@ class Python(Package): version("3.7.2", sha256="f09d83c773b9cc72421abba2c317e4e6e05d919f9bcf34468e192b6a6c8e328d") version("3.7.1", sha256="36c1b81ac29d0f8341f727ef40864d99d8206897be96be73dc34d4739c9c9f06") version("3.7.0", sha256="85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d") - version( - "3.6.15", - sha256="54570b7e339e2cfd72b29c7e2fdb47c0b7b18b7412e61de5b463fc087c13b043", - deprecated=True, - ) - version( - "3.6.14", - sha256="70064897bc434d6eae8bcc3e5678f282b5ea776d60e695da548a1219ccfd27a5", - deprecated=True, - ) - version( - "3.6.13", - sha256="614950d3d54f6e78dac651b49c64cfe2ceefea5af3aff3371a9e4b27a53b2669", - deprecated=True, - ) - version( - "3.6.12", - sha256="12dddbe52385a0f702fb8071e12dcc6b3cb2dde07cd8db3ed60e90d90ab78693", - deprecated=True, - ) - version( - "3.6.11", - sha256="96621902f89746fffc22f39749c07da7c2917b232e72352e6837d41850f7b90c", - deprecated=True, - ) - version( - "3.6.10", - sha256="7034dd7cba98d4f94c74f9edd7345bac71c8814c41672c64d9044fa2f96f334d", - deprecated=True, - ) - version( - "3.6.9", - sha256="47fc92a1dcb946b9ed0abc311d3767b7215c54e655b17fd1d3f9b538195525aa", - deprecated=True, - ) - version( - "3.6.8", - sha256="7f5b1f08b3b0a595387ef6c64c85b1b13b38abef0dd871835ee923262e4f32f0", - deprecated=True, - ) - version( - "3.6.7", - sha256="b7c36f7ed8f7143b2c46153b7332db2227669f583ea0cce753facf549d1a4239", - deprecated=True, - ) - version( - "3.6.6", - sha256="7d56dadf6c7d92a238702389e80cfe66fbfae73e584189ed6f89c75bbf3eda58", - deprecated=True, - ) - version( - "3.6.5", - sha256="53a3e17d77cd15c5230192b6a8c1e031c07cd9f34a2f089a731c6f6bd343d5c6", - deprecated=True, - ) - version( - "3.6.4", - sha256="7dc453e1a93c083388eb1a23a256862407f8234a96dc4fae0fc7682020227486", - deprecated=True, - ) - version( - "3.6.3", - sha256="ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91", - deprecated=True, - ) - version( - "3.6.2", - sha256="7919489310a5f17f7acbab64d731e46dca0702874840dadce8bd4b2b3b8e7a82", - deprecated=True, - ) - version( - "3.6.1", - sha256="aa50b0143df7c89ce91be020fe41382613a817354b33acdc6641b44f8ced3828", - deprecated=True, - ) - version( - "3.6.0", - sha256="aa472515800d25a3739833f76ca3735d9f4b2fe77c3cb21f69275e0cce30cb2b", - deprecated=True, - ) - version( - "3.5.10", - sha256="3496a0daf51913718a6f10e3eda51fa43634cb6151cb096f312d48bdbeff7d3a", - deprecated=True, - ) - version( - "3.5.9", - sha256="67a1d4fc6e4540d6a092cadc488e533afa961b3c9becc74dc3d6b55cb56e0cc1", - deprecated=True, - ) - version( - "3.5.8", - sha256="18c88dfd260147bc7247e6356010e5d4916dfbfc480f6434917f88e61228177a", - deprecated=True, - ) - version( - "3.5.7", - sha256="542d94920a2a06a471a73b51614805ad65366af98145b0369bc374cf248b521b", - deprecated=True, - ) - version( - "3.5.6", - sha256="30d2ff093988e74283e1abfee823292c6b59590796b9827e95ba4940b27d26f8", - deprecated=True, - ) - version( - "3.5.5", - sha256="2f988db33913dcef17552fd1447b41afb89dbc26e3cdfc068ea6c62013a3a2a5", - deprecated=True, - ) - version( - "3.5.4", - sha256="6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44", - deprecated=True, - ) - version( - "3.5.3", - sha256="d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a", - deprecated=True, - ) - version( - "3.5.2", - sha256="1524b840e42cf3b909e8f8df67c1724012c7dc7f9d076d4feef2d3eff031e8a0", - deprecated=True, - ) - version( - "3.5.1", - sha256="687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7", - deprecated=True, - ) - version( - "3.5.0", - sha256="584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0", - deprecated=True, - ) - version( - "3.4.10", - sha256="217757699249ab432571b381386d441e12b433100ab5f908051fcb7cced2539d", - deprecated=True, - ) - version( - "3.4.3", - sha256="8b743f56e9e50bf0923b9e9c45dd927c071d7aa56cd46569d8818add8cf01147", - deprecated=True, - ) - version( - "3.3.6", - sha256="0a58ad1f1def4ecc90b18b0c410a3a0e1a48cf7692c75d1f83d0af080e5d2034", - deprecated=True, - ) - version( - "3.2.6", - sha256="fc1e41296e29d476f696303acae293ae7a2310f0f9d0d637905e722a3f16163e", - deprecated=True, - ) - version( - "3.1.5", - sha256="d12dae6d06f52ef6bf1271db4d5b4d14b5dd39813e324314e72b648ef1bc0103", - deprecated=True, - ) - version( - "2.7.18", - sha256="da3080e3b488f648a3d7a4560ddee895284c3380b11d6de75edb986526b9a814", - deprecated=True, - ) - version( - "2.7.17", - sha256="f22059d09cdf9625e0a7284d24a13062044f5bf59d93a7f3382190dfa94cecde", - deprecated=True, - ) - version( - "2.7.16", - sha256="01da813a3600876f03f46db11cc5c408175e99f03af2ba942ef324389a83bad5", - deprecated=True, - ) - version( - "2.7.15", - sha256="18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db", - deprecated=True, - ) - version( - "2.7.14", - sha256="304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8", - deprecated=True, - ) - version( - "2.7.13", - sha256="a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1", - deprecated=True, - ) - version( - "2.7.12", - sha256="3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6", - deprecated=True, - ) - version( - "2.7.11", - sha256="82929b96fd6afc8da838b149107078c02fa1744b7e60999a8babbc0d3fa86fc6", - deprecated=True, - ) - version( - "2.7.10", - sha256="eda8ce6eec03e74991abb5384170e7c65fcd7522e409b8e83d7e6372add0f12a", - deprecated=True, - ) - version( - "2.7.9", - sha256="c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b", - deprecated=True, - ) - version( - "2.7.8", - sha256="74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557", - deprecated=True, - ) extendable = True @@ -331,18 +116,7 @@ class Python(Package): "debug", default=False, description="debug build with extra checks (this is high overhead)" ) - # --enable-shared is known to cause problems for some users on macOS - # This is a problem for Python 2.7 only, not Python3 - # See http://bugs.python.org/issue29846 variant("shared", default=True, description="Enable shared libraries") - # From https://docs.python.org/2/c-api/unicode.html: Python's default - # builds use a 16-bit type for Py_UNICODE and store Unicode values - # internally as UCS2. It is also possible to build a UCS4 version of Python - # (most recent Linux distributions come with UCS4 builds of Python). These - # builds then use a 32-bit type for Py_UNICODE and store Unicode data - # internally as UCS4. Note that UCS2 and UCS4 Python builds are not binary - # compatible. - variant("ucs4", default=False, description="Enable UCS4 (wide) unicode strings") variant("pic", default=True, description="Produce position-independent code (for shared libs)") variant( "optimizations", @@ -353,7 +127,7 @@ class Python(Package): variant( "pythoncmd", default=not is_windows, - description="Symlink 'python3' executable to 'python' " "(not PEP 394 compliant)", + description="Symlink 'python3' executable to 'python' (not PEP 394 compliant)", ) # Optional Python modules @@ -364,12 +138,12 @@ class Python(Package): variant("nis", default=False, description="Build nis module") variant("zlib", default=True, description="Build zlib module") variant("bz2", default=True, description="Build bz2 module") - variant("lzma", default=True, description="Build lzma module", when="@3.3:") + variant("lzma", default=True, description="Build lzma module") variant("pyexpat", default=True, description="Build pyexpat module") variant("ctypes", default=True, description="Build ctypes module") variant("tkinter", default=False, description="Build tkinter module") variant("uuid", default=True, description="Build uuid module") - variant("tix", default=False, description="Build Tix module") + variant("tix", default=False, description="Build Tix module", when="+tkinter") variant("crypt", default=True, description="Build crypt module", when="@:3.12 platform=linux") variant("crypt", default=True, description="Build crypt module", when="@:3.12 platform=darwin") variant("crypt", default=True, description="Build crypt module", when="@:3.12 platform=cray") @@ -384,24 +158,18 @@ class Python(Package): depends_on("readline", when="+readline") depends_on("ncurses", when="+readline") depends_on("openssl", when="+ssl") - # https://raw.githubusercontent.com/python/cpython/84471935ed2f62b8c5758fd544c7d37076fe0fa5/Misc/NEWS - # https://docs.python.org/3.5/whatsnew/changelog.html#python-3-5-4rc1 - depends_on("openssl@:1.0.2z", when="@:2.7.13,3.0.0:3.5.2+ssl") - depends_on( - "openssl@1.0.2:", when="@3.7:+ssl" - ) # https://docs.python.org/3/whatsnew/3.7.html#build-changes - depends_on( - "openssl@1.1.1:", when="@3.10:+ssl" - ) # https://docs.python.org/3.10/whatsnew/3.10.html#build-changes + # https://docs.python.org/3/whatsnew/3.7.html#build-changes + depends_on("openssl@1.0.2:", when="+ssl") + # https://docs.python.org/3.10/whatsnew/3.10.html#build-changes + depends_on("openssl@1.1.1:", when="@3.10:+ssl") depends_on("sqlite@3.0.8:", when="@:3.9+sqlite3") - depends_on( - "sqlite@3.7.15:", when="@3.10:+sqlite3" - ) # https://docs.python.org/3.10/whatsnew/3.10.html#build-changes + # https://docs.python.org/3.10/whatsnew/3.10.html#build-changes + depends_on("sqlite@3.7.15:", when="@3.10:+sqlite3") depends_on("gdbm", when="+dbm") # alternatively ndbm or berkeley-db depends_on("libnsl", when="+nis") depends_on("zlib@1.1.3:", when="+zlib") depends_on("bzip2", when="+bz2") - depends_on("xz", when="@3.3:+lzma") + depends_on("xz", when="+lzma") depends_on("expat", when="+pyexpat") depends_on("libffi", when="+ctypes") # https://docs.python.org/3/whatsnew/3.11.html#build-changes @@ -423,16 +191,13 @@ class Python(Package): # C/C++ modules, consider installing a Spack-managed Python with # this patch instead. For more information, see: # https://github.com/spack/spack/pull/16856 - patch("python-2.7.8-distutils-C++.patch", when="@2.7.8:2.7.16") - patch("python-2.7.17+-distutils-C++.patch", when="@2.7.17:2.7.18") - patch("python-2.7.17+-distutils-C++-fixup.patch", when="@2.7.17:2.7.18") - patch("python-3.6.8-distutils-C++.patch", when="@3.6.8,3.7.2") + patch("python-3.7.2-distutils-C++.patch", when="@3.7.2") patch("python-3.7.3-distutils-C++.patch", when="@3.7.3") patch("python-3.7.4+-distutils-C++.patch", when="@3.7.4:3.10") patch("python-3.7.4+-distutils-C++-testsuite.patch", when="@3.7.4:") patch("python-3.11-distutils-C++.patch", when="@3.11.0:3.11") patch("cpython-windows-externals.patch", when="@:3.9.6 platform=windows") - patch("tkinter.patch", when="@:2.8,3.3:3.7 platform=darwin") + patch("tkinter-3.7.patch", when="@3.7 platform=darwin") # Patch the setup script to deny that tcl/x11 exists rather than allowing # autodetection of (possibly broken) system components patch("tkinter-3.8.patch", when="@3.8:3.9 ~tkinter") @@ -440,21 +205,15 @@ class Python(Package): patch("tkinter-3.11.patch", when="@3.11.0:3.11 ~tkinter") # 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 platform=cray") + patch("cray-rpath-3.1.patch", when="@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.9.7,3.10.0 %fj") - patch("fj-rpath-3.9.patch", when="@3.9.8:3.9,3.10.1: %fj") - - # Fixes an alignment problem with more aggressive optimization in gcc8 - # https://github.com/python/cpython/commit/0b91f8a668201fc58fa732b8acc496caedfdbae0 - patch("gcc-8-2.7.14.patch", when="@2.7.14 %gcc@8:") + patch("fj-rpath-3.1.patch", when="@:3.9.7,3.10.0 %fj") + patch("fj-rpath-3.9.patch", when="@3.9.8:3.9,3.10.1: %fj") # Fixes build with the Intel compilers # https://github.com/python/cpython/pull/16717 - patch("intel-3.6.7.patch", when="@3.6.7:3.6.8,3.7.1:3.7.5 %intel") + patch("intel-3.7.patch", when="@3.7.1:3.7.5 %intel") # CPython tries to build an Objective-C file with GCC's C frontend # https://github.com/spack/spack/pull/16222 @@ -464,20 +223,7 @@ class Python(Package): msg="CPython does not compile with GCC on macOS yet, use clang. " "See: https://github.com/python/cpython/pull/13306", ) - # For more information refer to this bug report: - # https://bugs.python.org/issue29712 - conflicts( - "@:2.8 +shared", - when="+optimizations", - msg="+optimizations is incompatible with +shared in python@2.X", - ) - conflicts("+tix", when="~tkinter", msg="python+tix requires python+tix+tkinter") conflicts("%nvhpc") - conflicts( - "@:2.7", - when="platform=darwin target=aarch64:", - msg="Python 2.7 is too old for Apple Silicon", - ) # Used to cache various attributes that are expensive to compute _config_vars = {} # type: Dict[str, Dict[str, str]] @@ -491,7 +237,6 @@ class Python(Package): def determine_version(cls, exe): # Newer versions of Python support `--version`, # but older versions only support `-V` - # Python 2 sends to STDERR, while Python 3 sends to STDOUT # Output looks like: # Python 3.7.7 # On pre-production Ubuntu, this is also possible: @@ -512,7 +257,18 @@ class Python(Package): else: variants += "~pythoncmd" - for module in ["readline", "sqlite3", "dbm", "nis", "zlib", "bz2", "ctypes", "uuid"]: + for module in [ + "readline", + "sqlite3", + "dbm", + "nis", + "zlib", + "bz2", + "lzma", + "ctypes", + "tkinter", + "uuid", + ]: try: python("-c", "import " + module, error=os.devnull) variants += "+" + module @@ -534,38 +290,12 @@ class Python(Package): except ProcessError: variants += "~pyexpat" - # Some modules are version-dependent - if Version(version_str) >= Version("3.3"): - try: - python("-c", "import lzma", error=os.devnull) - variants += "+lzma" - except ProcessError: - variants += "~lzma" - - if Version(version_str) >= Version("3"): - try: - python("-c", "import tkinter", error=os.devnull) - variants += "+tkinter" - except ProcessError: - variants += "~tkinter" - - try: - python("-c", "import tkinter.tix", error=os.devnull) - variants += "+tix" - except ProcessError: - variants += "~tix" - else: - try: - python("-c", "import Tkinter", error=os.devnull) - variants += "+tkinter" - except ProcessError: - variants += "~tkinter" - - try: - python("-c", "import Tix", error=os.devnull) - variants += "+tix" - except ProcessError: - variants += "~tix" + # Some variant names do not match module names + try: + python("-c", "import tkinter.tix", error=os.devnull) + variants += "+tix" + except ProcessError: + variants += "~tix" # Some modules are platform-dependent if not is_windows: @@ -581,57 +311,24 @@ class Python(Package): url = "https://www.python.org/ftp/python/{0}/Python-{1}.tgz" return url.format(re.split("[a-z]", str(version))[0], version) - # TODO: Ideally, these patches would be applied as separate '@run_before' - # functions enabled via '@when', but these two decorators don't work - # when used together. See: https://github.com/spack/spack/issues/12736 def patch(self): # NOTE: Python's default installation procedure makes it possible for a # user's local configurations to change the Spack installation. In # order to prevent this behavior for a full installation, we must # modify the installation script so that it ignores user files. - if self.spec.satisfies("@2.7:2.8,3.4:"): - ff = FileFilter("Makefile.pre.in") - ff.filter( - r"^(.*)setup\.py(.*)((build)|(install))(.*)$", r"\1setup.py\2 --no-user-cfg \3\6" - ) - - # NOTE: Older versions of Python do not support the '--with-openssl' - # 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+ssl"): - ff = FileFilter(join_path("Modules", "Setup.dist")) - ff.filter(r"^#(((SSL=)|(_ssl))(.*))$", r"\1") - ff.filter(r"^#((.*)(\$\(SSL\))(.*))$", r"\1") - ff.filter(r"^SSL=(.*)$", r"SSL={0}".format(self.spec["openssl"].prefix)) - # 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~ssl"): - ff = FileFilter("setup.py") - ff.filter(r"^(\s+(ssl_((incs)|(libs)))\s+=\s+)(.*)$", r"\1 None and \6") - ff.filter(r"^(\s+(opensslv_h)\s+=\s+)(.*)$", r"\1 None and \3") + ff = FileFilter("Makefile.pre.in") + ff.filter( + r"^(.*)setup\.py(.*)((build)|(install))(.*)$", r"\1setup.py\2 --no-user-cfg \3\6" + ) def setup_build_environment(self, env): spec = self.spec - # TODO: The '--no-user-cfg' option for Python installation is only in - # Python v2.7 and v3.4+ (see https://bugs.python.org/issue1180) and - # adding support for ignoring user configuration will require - # significant changes to this package for other Python versions. - if not spec.satisfies("@2.7:2.8,3.4:"): - tty.warn( - ( - "Python v{0} may not install properly if Python " - "user configurations are present." - ).format(self.version) - ) - # TODO: Python has incomplete support for Python modules with mixed # C/C++ source, and patches are required to enable building for these # modules. All Python versions without a viable patch are installed # with a warning message about this potentially erroneous behavior. - if not spec.satisfies("@2.7.8:2.7.18,3.6.8,3.7.2:"): + if not spec.satisfies("@3.7.2:"): tty.warn( ( 'Python v{0} does not have the C++ "distutils" patch; ' @@ -769,21 +466,12 @@ class Python(Package): config_args.extend(["CPPFLAGS=" + cppflags, "LDFLAGS=" + ldflags]) - # https://docs.python.org/3/whatsnew/3.7.html#build-changes - if spec.satisfies("@:3.6"): - config_args.append("--with-threads") - - if spec.satisfies("@2.7.13:2.8,3.5.3:", strict=True) and "+optimizations" in spec: + if "+optimizations" in spec: config_args.append("--enable-optimizations") config_args.append("--with-lto") config_args.append("--with-computed-gotos") - if spec.satisfies("%gcc platform=darwin"): - config_args.append("--disable-toolbox-glue") - - if spec.satisfies("%intel", strict=True) and spec.satisfies( - "@2.7.12:2.8,3.5.2:3.7", strict=True - ): + if spec.satisfies("@3.7 %intel", strict=True): config_args.append("--with-icc={0}".format(spack_cc)) if "+debug" in spec: @@ -796,24 +484,13 @@ class Python(Package): else: config_args.append("--disable-shared") - if "+ucs4" in spec: - if spec.satisfies("@:2.7"): - config_args.append("--enable-unicode=ucs4") - elif spec.satisfies("@3.0:3.2"): - config_args.append("--with-wide-unicode") - elif spec.satisfies("@3.3:"): - # https://docs.python.org/3.3/whatsnew/3.3.html#functionality - raise ValueError("+ucs4 variant not compatible with Python 3.3 and beyond") - - if spec.satisfies("@2.7.9:2,3.4:"): - config_args.append("--without-ensurepip") + config_args.append("--without-ensurepip") if "+pic" in spec: cflags.append(self.compiler.cc_pic_flag) if "+ssl" in spec: - if spec.satisfies("@3.7:"): - config_args.append("--with-openssl={0}".format(spec["openssl"].prefix)) + config_args.append("--with-openssl={0}".format(spec["openssl"].prefix)) if "+dbm" in spec: # Default order is ndbm:gdbm:bdb @@ -844,7 +521,7 @@ class Python(Package): ) # https://docs.python.org/3.8/library/sqlite3.html#f1 - if spec.satisfies("@3.2: +sqlite3 ^sqlite+dynamic_extensions"): + if spec.satisfies("+sqlite3 ^sqlite+dynamic_extensions"): config_args.append("--enable-loadable-sqlite-extensions") if spec.satisfies("%oneapi"): @@ -929,19 +606,7 @@ class Python(Package): spec = self.spec prefix = self.prefix - # TODO: - # On OpenSuse 13, python uses <prefix>/lib64/python2.7/lib-dynload/*.so - # instead of <prefix>/lib/python2.7/lib-dynload/*.so. Oddly enough the - # result is that Python can not find modules like cPickle. A workaround - # for now is to symlink to `lib`: - src = os.path.join(prefix.lib64, "python{0}".format(self.version.up_to(2)), "lib-dynload") - dst = os.path.join(prefix.lib, "python{0}".format(self.version.up_to(2)), "lib-dynload") - if os.path.isdir(src) and not os.path.isdir(dst): - mkdirp(dst) - for f in os.listdir(src): - os.symlink(os.path.join(src, f), os.path.join(dst, f)) - - if spec.satisfies("@3:") and spec.satisfies("+pythoncmd"): + if spec.satisfies("+pythoncmd"): os.symlink(os.path.join(prefix.bin, "python3"), os.path.join(prefix.bin, "python")) os.symlink( os.path.join(prefix.bin, "python3-config"), @@ -993,9 +658,8 @@ class Python(Package): self.command("-c", "import bz2") # Ensure that lzma module works - if spec.satisfies("@3.3:"): - if "+lzma" in spec: - self.command("-c", "import lzma") + if "+lzma" in spec: + self.command("-c", "import lzma") # Ensure that pyexpat module works if "+pyexpat" in spec: @@ -1011,15 +675,9 @@ class Python(Package): if "+tkinter" in spec: # Only works if ForwardX11Trusted is enabled, i.e. `ssh -Y` if "DISPLAY" in env: - if spec.satisfies("@3:"): - self.command("-c", "import tkinter; tkinter._test()") - else: - self.command("-c", "import Tkinter; Tkinter._test()") + self.command("-c", "import tkinter; tkinter._test()") else: - if spec.satisfies("@3:"): - self.command("-c", "import tkinter") - else: - self.command("-c", "import Tkinter") + self.command("-c", "import tkinter") # Ensure that uuid module works if "+uuid" in spec: @@ -1027,10 +685,7 @@ class Python(Package): # Ensure that tix module works if "+tix" in spec: - if spec.satisfies("@3:"): - self.command("-c", "import tkinter.tix") - else: - self.command("-c", "import Tix") + self.command("-c", "import tkinter.tix") # Ensure that crypt module works if "+crypt" in spec: @@ -1045,10 +700,9 @@ class Python(Package): """Returns the Python command, which may vary depending on the version of Python and how it was installed. - In general, Python 2 comes with ``python`` and ``python2`` commands, - while Python 3 only comes with a ``python3`` command. However, some + In general, Python 3 only comes with a ``python3`` command. However, some package managers will symlink ``python`` to ``python3``, while others - may contain ``python3.6``, ``python3.5``, and ``python3.4`` in the + may contain ``python3.11``, ``python3.10``, and ``python3.9`` in the same directory. Returns: @@ -1058,11 +712,11 @@ class Python(Package): # installed python, several different commands could be located # in the same directory. Be as specific as possible. Search for: # - # * python3.6 + # * python3.11 # * python3 # * python # - # in that order if using python@3.6.5, for example. + # in that order if using python@3.11.0, for example. version = self.spec.version for ver in [version.up_to(2), version.up_to(1), ""]: if not is_windows: @@ -1076,31 +730,6 @@ class Python(Package): msg = "Unable to locate {0} command in {1}" raise RuntimeError(msg.format(self.name, self.prefix.bin)) - def print_string(self, string): - """Returns the appropriate print string depending on the - version of Python. - - Examples: - - * Python 2 - - .. code-block:: python - - >>> self.print_string('sys.prefix') - 'print sys.prefix' - - * Python 3 - - .. code-block:: python - - >>> self.print_string('sys.prefix') - 'print(sys.prefix)' - """ - if self.spec.satisfies("@:2"): - return "print {0}".format(string) - else: - return "print({0})".format(string) - @property def config_vars(self): """Return a set of variable definitions associated with a Python installation. @@ -1129,10 +758,8 @@ config['config_h_filename'] = get_config_h_filename() config['makefile_filename'] = get_makefile_filename() config.update(get_paths()) -%s -""" % self.print_string( - "json.dumps(config)" - ) +print(json.dumps(config)) +""" dag_hash = self.spec.dag_hash() lib_prefix = "lib" if not is_windows else "" @@ -1150,9 +777,6 @@ config.update(get_paths()) "INCLUDEPY": self.prefix.include.join("python{}").format(version), "LIBDEST": self.prefix.lib.join("python{}").format(version), "LIBDIR": self.prefix.lib, - "LIBPL": self.prefix.lib.join("python{0}") - .join("config-{0}-{1}") - .format(version, sys.platform), "LDLIBRARY": "{}python{}.{}".format(lib_prefix, version, dso_suffix), "LIBRARY": "{}python{}.{}".format(lib_prefix, version, stat_suffix), "LDSHARED": "cc", @@ -1196,13 +820,10 @@ config.update(get_paths()) libdest = self.config_vars["LIBDEST"] - filename = "_sysconfigdata.py" - if self.spec.satisfies("@3.6:"): - # Python 3.6.0 renamed the sys config file - cmd = "from sysconfig import _get_sysconfigdata_name; " - cmd += self.print_string("_get_sysconfigdata_name()") - filename = self.command("-c", cmd, output=str).strip() - filename += ".py" + cmd = "from sysconfig import _get_sysconfigdata_name; " + cmd += "print(_get_sysconfigdata_name())" + filename = self.command("-c", cmd, output=str).strip() + filename += ".py" return join_path(libdest, filename) @@ -1225,10 +846,6 @@ config.update(get_paths()) # in either lib or lib64, so we need to ask Python where its LIBDIR is. libdir = self.config_vars["LIBDIR"] - # In Ubuntu 16.04.6 and python 2.7.12 from the system, lib could be in LBPL - # https://mail.python.org/pipermail/python-dev/2013-April/125733.html - libpl = self.config_vars["LIBPL"] - # The system Python installation on macOS and Homebrew installations # install libraries into a Frameworks directory frameworkprefix = self.config_vars["PYTHONFRAMEWORKPREFIX"] @@ -1246,7 +863,6 @@ config.update(get_paths()) directories = [ libdir, - libpl, frameworkprefix, macos_developerdir, win_bin_dir, @@ -1586,8 +1202,7 @@ config.update(get_paths()) # checks import works and executable comes from the spec prefix reason = "test: checking import and executable" - print_str = self.print_string("sys.executable") - options = ["-c", "import sys; {0}".format(print_str)] + options = ["-c", "import sys; print(sys.executable)"] self.run_test( exe, options=options, expected=[self.spec.prefix], installed=True, purpose=reason ) diff --git a/var/spack/repos/builtin/packages/python/python-2.7.17+-distutils-C++-fixup.patch b/var/spack/repos/builtin/packages/python/python-2.7.17+-distutils-C++-fixup.patch deleted file mode 100644 index a3c179b6aa..0000000000 --- a/var/spack/repos/builtin/packages/python/python-2.7.17+-distutils-C++-fixup.patch +++ /dev/null @@ -1,120 +0,0 @@ -This patch fixes a regression intoduced by python-2.7.17+-distutils-C++.patch -and updates the distutils testsuite to pass with 2.7.16:2.7.18: - -This how the test suite would have to change when the bug is not fixed: - - self.assertEqual(comp.exes['compiler'], -- 'env_cc --sc-cflags --env-cflags --env-cppflags') -+ 'env_cc --env-cflags --env-cppflags') - self.assertEqual(comp.exes['compiler_so'], -- ('env_cc --sc-cflags ' -+ ('env_cc ' - '--env-cflags ''--env-cppflags --sc-ccshared')) - self.assertEqual(comp.exes['compiler'], -- 'sc_cc --sc-cflags') -+ 'sc_cc ') - self.assertEqual(comp.exes['compiler_so'], -- 'sc_cc --sc-cflags --sc-ccshared') -+ 'sc_cc --sc-ccshared') - self.assertEqual(comp.exes['compiler_cxx'], -- 'sc_cxx') -+ 'sc_cxx ') - -As shown, it removes the default, builtin cflags when calling the pure -C compiler CC, which is wrong, introducing a regression. - -The cause is that the patch removes reading the python distutils cflags -value and sets both empty. - -- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SO', 'AR', -- 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SO', 'AR', 'ARFLAGS') -+ cflags = '' -+ cxxflags = '' - -The fix is obvious when comparing it with python-3.7.4+-distutils-C++.patch - -- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ -+ cxxflags = cflags - -When handling CFLAGS the same as in python-3.7.4+-distutils-C++.patch, -the issue is fixed. - ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -181,12 +181,11 @@ - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', - 'SO', 'AR', 'ARFLAGS') - -- cflags = '' -- cxxflags = '' -+ cxxflags = cflags - - if 'CC' in os.environ: - newcc = os.environ['CC'] ---- a/Lib/distutils/tests/test_sysconfig.py -+++ b/Lib/distutils/tests/test_sysconfig.py -@@ -65,6 +65,7 @@ - 'CXX': 'sc_cxx', - 'ARFLAGS': '--sc-arflags', - 'CFLAGS': '--sc-cflags', -+ 'CPPFLAGS': '--sc-cppflags', - 'CCSHARED': '--sc-ccshared', - 'LDSHARED': 'sc_ldshared', - 'SO': 'sc_shutil_suffix', -@@ -94,11 +95,12 @@ - os.environ['AR'] = 'env_ar' - os.environ['CC'] = 'env_cc' - os.environ['CPP'] = 'env_cpp' -- os.environ['CXX'] = 'env_cxx --env-cxx-flags' -+ os.environ['CXX'] = 'env_cxx' - os.environ['LDSHARED'] = 'env_ldshared' - os.environ['LDFLAGS'] = '--env-ldflags' - os.environ['ARFLAGS'] = '--env-arflags' - os.environ['CFLAGS'] = '--env-cflags' -+ os.environ['CXXFLAGS'] = '--env-cxxflags' - os.environ['CPPFLAGS'] = '--env-cppflags' - - comp = self.customize_compiler() -@@ -112,7 +114,7 @@ - ('env_cc --sc-cflags ' - '--env-cflags ''--env-cppflags --sc-ccshared')) - self.assertEqual(comp.exes['compiler_cxx'], -- 'env_cxx --env-cxx-flags') -+ 'env_cxx --sc-cflags --env-cxxflags --env-cppflags') - self.assertEqual(comp.exes['linker_exe'], - 'env_cc') - self.assertEqual(comp.exes['linker_so'], -@@ -128,6 +130,7 @@ - del os.environ['LDFLAGS'] - del os.environ['ARFLAGS'] - del os.environ['CFLAGS'] -+ del os.environ['CXXFLAGS'] - del os.environ['CPPFLAGS'] - - comp = self.customize_compiler() -@@ -140,7 +143,7 @@ - self.assertEqual(comp.exes['compiler_so'], - 'sc_cc --sc-cflags --sc-ccshared') - self.assertEqual(comp.exes['compiler_cxx'], -- 'sc_cxx') -+ 'sc_cxx --sc-cflags') - self.assertEqual(comp.exes['linker_exe'], - 'sc_cc') - self.assertEqual(comp.exes['linker_so'], diff --git a/var/spack/repos/builtin/packages/python/python-2.7.17+-distutils-C++.patch b/var/spack/repos/builtin/packages/python/python-2.7.17+-distutils-C++.patch deleted file mode 100644 index 1d2249fcfc..0000000000 --- a/var/spack/repos/builtin/packages/python/python-2.7.17+-distutils-C++.patch +++ /dev/null @@ -1,269 +0,0 @@ -diff --git a/Lib/_osx_support.py b/Lib/_osx_support.py -index d2aaae7..8bcdb05 100644 ---- a/Lib/_osx_support.py -+++ b/Lib/_osx_support.py -@@ -14,13 +14,13 @@ __all__ = [ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' -diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index 258e138..13b7d0c 100644 ---- a/Lib/distutils/cygwinccompiler.py -+++ b/Lib/distutils/cygwinccompiler.py -@@ -117,8 +117,10 @@ class CygwinCCompiler (UnixCCompiler): - # dllwrap 2.10.90 is buggy - if self.ld_version >= "2.10.90": - self.linker_dll = "gcc" -+ self.linker_dll_cxx = "g++" - else: - self.linker_dll = "dllwrap" -+ self.linker_dll_cxx = "dllwrap" - - # ld_version >= "2.13" support -shared so use it instead of - # -mdll -static -@@ -132,9 +134,13 @@ class CygwinCCompiler (UnixCCompiler): - self.set_executables(compiler='gcc -mcygwin -O -Wall', - compiler_so='gcc -mcygwin -mdll -O -Wall', - compiler_cxx='g++ -mcygwin -O -Wall', -+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', - linker_exe='gcc -mcygwin', - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='g++ -mcygwin', -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -160,8 +166,12 @@ class CygwinCCompiler (UnixCCompiler): - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -327,9 +337,14 @@ class Mingw32CCompiler (CygwinCCompiler): - self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, - compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, - compiler_cxx='g++%s -O -Wall' % no_cygwin, -+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, - linker_exe='gcc%s' % no_cygwin, - linker_so='%s%s %s %s' - % (self.linker_dll, no_cygwin, -+ shared_option, entry_point), -+ linker_exe_cxx='g++%s' % no_cygwin, -+ linker_so_cxx='%s%s %s %s' -+ % (self.linker_dll_cxx, no_cygwin, - shared_option, entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) -diff --git a/Lib/distutils/emxccompiler.py b/Lib/distutils/emxccompiler.py -index a017205..bdc532c 100644 ---- a/Lib/distutils/emxccompiler.py -+++ b/Lib/distutils/emxccompiler.py -@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler): - # XXX optimization, warnings etc. should be customizable. - self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - linker_exe='gcc -Zomf -Zmt -Zcrtdll', -- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') -+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', -+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', -+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') - - # want the gcc library statically linked (so that we don't have - # to distribute a version dependent on the compiler we have) -@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler): - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 1a4b792..9d724b2 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -181,10 +181,12 @@ def customize_compiler(compiler): - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SO', 'AR', -- 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SO', 'AR', 'ARFLAGS') -+ -+ cflags = '' -+ cxxflags = '' - - if 'CC' in os.environ: - newcc = os.environ['CC'] -@@ -199,19 +201,27 @@ def customize_compiler(compiler): - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: - cflags = cflags + ' ' + os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = cxxflags + ' ' + os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -220,13 +230,17 @@ def customize_compiler(compiler): - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = so_ext -diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index 3af540e..f8f7efe 100644 ---- a/Lib/distutils/unixccompiler.py -+++ b/Lib/distutils/unixccompiler.py -@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler): - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["cc"], -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } - - if sys.platform[:6] == "darwin": -@@ -114,12 +117,19 @@ class UnixCCompiler(CCompiler): - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -176,23 +186,16 @@ class UnixCCompiler(CCompiler): - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i = i + 1 -- -- linker[i] = self.compiler_cxx[i] -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] -+ else: -+ linker = self.linker_so[:] - - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) diff --git a/var/spack/repos/builtin/packages/python/python-2.7.8-distutils-C++.patch b/var/spack/repos/builtin/packages/python/python-2.7.8-distutils-C++.patch deleted file mode 100644 index d6710066d5..0000000000 --- a/var/spack/repos/builtin/packages/python/python-2.7.8-distutils-C++.patch +++ /dev/null @@ -1,260 +0,0 @@ ---- a/Lib/distutils/cygwinccompiler.py -+++ b/Lib/distutils/cygwinccompiler.py -@@ -117,8 +117,10 @@ - # dllwrap 2.10.90 is buggy - if self.ld_version >= "2.10.90": - self.linker_dll = "gcc" -+ self.linker_dll_cxx = "g++" - else: - self.linker_dll = "dllwrap" -+ self.linker_dll_cxx = "dllwrap" - - # ld_version >= "2.13" support -shared so use it instead of - # -mdll -static -@@ -132,9 +134,13 @@ - self.set_executables(compiler='gcc -mcygwin -O -Wall', - compiler_so='gcc -mcygwin -mdll -O -Wall', - compiler_cxx='g++ -mcygwin -O -Wall', -+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', - linker_exe='gcc -mcygwin', - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='g++ -mcygwin', -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -160,8 +166,12 @@ - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -327,9 +337,14 @@ - self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, - compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, - compiler_cxx='g++%s -O -Wall' % no_cygwin, -+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, - linker_exe='gcc%s' % no_cygwin, - linker_so='%s%s %s %s' - % (self.linker_dll, no_cygwin, -+ shared_option, entry_point), -+ linker_exe_cxx='g++%s' % no_cygwin, -+ linker_so_cxx='%s%s %s %s' -+ % (self.linker_dll_cxx, no_cygwin, - shared_option, entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) ---- a/Lib/distutils/emxccompiler.py -+++ b/Lib/distutils/emxccompiler.py -@@ -65,8 +65,12 @@ - # XXX optimization, warnings etc. should be customizable. - self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - linker_exe='gcc -Zomf -Zmt -Zcrtdll', -- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') -+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', -+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', -+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') - - # want the gcc library statically linked (so that we don't have - # to distribute a version dependent on the compiler we have) -@@ -83,8 +87,12 @@ - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -170,10 +170,12 @@ - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SO', 'AR', -- 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SO', 'AR', 'ARFLAGS') -+ -+ cflags = '' -+ cxxflags = '' - - if 'CC' in os.environ: - newcc = os.environ['CC'] -@@ -188,19 +190,27 @@ - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -209,13 +219,17 @@ - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = so_ext ---- a/Lib/distutils/unixccompiler.py -+++ b/Lib/distutils/unixccompiler.py -@@ -55,14 +55,17 @@ - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["cc"], -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } - - if sys.platform[:6] == "darwin": -@@ -112,12 +115,19 @@ - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -174,23 +184,16 @@ - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i = i + 1 -- -- linker[i] = self.compiler_cxx[i] -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] -+ else: -+ linker = self.linker_so[:] - - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) ---- a/Lib/_osx_support.py -+++ b/Lib/_osx_support.py -@@ -14,13 +14,13 @@ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' diff --git a/var/spack/repos/builtin/packages/python/python-3.6.8-distutils-C++.patch b/var/spack/repos/builtin/packages/python/python-3.7.2-distutils-C++.patch index 5728fad6f7..5728fad6f7 100644 --- a/var/spack/repos/builtin/packages/python/python-3.6.8-distutils-C++.patch +++ b/var/spack/repos/builtin/packages/python/python-3.7.2-distutils-C++.patch diff --git a/var/spack/repos/builtin/packages/python/tkinter.patch b/var/spack/repos/builtin/packages/python/tkinter-3.7.patch index 87e1901807..87e1901807 100644 --- a/var/spack/repos/builtin/packages/python/tkinter.patch +++ b/var/spack/repos/builtin/packages/python/tkinter-3.7.patch diff --git a/var/spack/repos/builtin/packages/qbox/package.py b/var/spack/repos/builtin/packages/qbox/package.py deleted file mode 100644 index c24d725f81..0000000000 --- a/var/spack/repos/builtin/packages/qbox/package.py +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Qbox(MakefilePackage): - """Qbox is a C++/MPI scalable parallel implementation of first-principles - molecular dynamics (FPMD) based on the plane-wave, pseudopotential - formalism. Qbox is designed for operation on large parallel computers.""" - - homepage = "http://qboxcode.org/" - url = "http://qboxcode.org/download/qbox-1.63.7.tgz" - - version("1.63.7", sha256="40acf4535c4dcab16066c218b1c2a083c238a1f54c43a1d2d4afcefb578086ed") - version("1.63.5", sha256="fa6d0e41622690f14b7cd0c2735d3d8d703152eb2c51042cdd77a055926cd90a") - version("1.63.4", sha256="829ae57e43ecb79f7dca8fb02aa70c85b0bbb68684a087d3cd1048b50fbc8e96") - version("1.63.2", sha256="17873414fed5298b6a4b66ae659ea8348119238b36b532df8a7c8fca0ed4eada") - version("1.63.0", sha256="8ad0727e4ebe709b2647a281756675e4840b3f29799f7169f79a9100c6538d31") - version("1.62.3", sha256="e82df8307d038af75471f22d9449a5f5e2ad00bb34a89b1b2c25cc65da83c9b5") - version("1.60.9", sha256="d82434031ab8214879274eb6f8674c6004b65ad5f9a07635101b82300af6d43c") - version("1.60.4", sha256="7707a3bbecb05864e651d4f8885685299edd8f95fcd300dc401ff6652e85a351") - version("1.60.0", sha256="802b531c7fe67d8fad27618911b2e158f7c69099677c0e08202dca24f81e10fd") - version("1.58.0", sha256="662f55adedfe1154f8affd060b4f846cd37751f020fe854ef560aeb435fd0312") - version("1.56.2", sha256="63df818e071cfc826645ee266a239a0cc00cea874d266f572fc20b1e2db7b351") - version("1.54.4", sha256="8f556fde5307b96ed03612b339f793fc2933841f91555b6e7000cbb003709b7a") - version("1.54.2", sha256="45ef811c05c9224baee87626d5a5bae91008a8b117df7e964c5976f27e54e9e9") - version("1.52.3", sha256="9424eaf56dbf33394674f0be76aecf76637702d060e45c5edc95d872a165cd42") - version("1.52.2", sha256="39d892f1bacd355d6ab4dbdd0ee4303ac6916fa9decf0e828f16003e61d59798") - version("1.50.4", sha256="2babf332132005dc93f280b274c68e8e44ecd8e2d1cf21cc91e212f17f8644a8") - version("1.50.2", sha256="0defe312319ac460b5b667eca982e4cd6a23750e5bdaa214d1c127ce2aba0a21") - version("1.50.1", sha256="114363654d7059662b0f3269615d0af1514298f4f488889d8e7ef8f1c4b8898d") - version("1.47.0", sha256="5c45aa8f6b2f774c04423c50b4e340dc35ca1deb2826ead8f1a508cd027974a9") - version("1.45.3", sha256="986e82a69f90a96cccd1a192921024ffdcefb3b86df361946d88b12669156a80") - version("1.45.1", sha256="3cea45743c0cd24cd02865c39a360c55030dab0f4b9b7b46e615af9b3b65c1da") - version("1.45.0", sha256="cc722641bf3c3a172bdb396216a945f2830cc64de60d716b7054145ba52ab431") - version("1.44.0", sha256="f29cf2a727235d4fa6bded7725a1a667888ab103278e995c46dd754654f112f1") - - depends_on("mpi") - depends_on("blas") - depends_on("scalapack") - depends_on("fftw") - depends_on("xerces-c") - depends_on("python@:2", type="run") - depends_on("gnuplot", type="run") - - # Change /usr/bin/python shebangs to /usr/bin/env python - patch("qbox-python-shebang-path.patch") - - build_directory = "src" - - def edit(self, spec, prefix): - with open("src/spack.mk", "w") as mkfile: - mkfile.write("CXX = {0}\n".format(spec["mpi"].mpicxx)) - mkfile.write("LD = $(CXX)\n") - qbox_libs = ( - spec["fftw"].libs - + spec["xerces-c"].libs - + spec["scalapack"].libs - + spec["blas"].libs - ) - mkfile.write("LDFLAGS = {0}\n".format(qbox_libs.ld_flags)) - mkfile.write( - "DFLAGS = {0}\n".format( - " -D".join( - ( - "", - "_LARGEFILE_SOURCE", - "USE_MPI", - "USE_XERCES", - "XERCESC_3", - "MPICH_IGNORE_CXX_SEEK", - "SCALAPACK", - "USE_FFTW3", - "FFTWMEASURE", - "FFTW3_2D", - "ADD_", - ) - ) - ) - ) - mkfile.write( - "CXXFLAGS = {0}\n".format( - " ".join( - ( - "-g", - "-O3", - "$(DFLAGS)", - ) - ) - ) - ) - filter_file("$(TARGET)", "spack", "src/Makefile", string=True) - - def setup_run_environment(self, env): - env.prepend_path("PATH", self.prefix.util) - - def install(self, spec, prefix): - mkdir(prefix.bin) - install("src/qb", prefix.bin) - install_tree("test", prefix.test) - install_tree("xml", prefix.xml) - install_tree("util", prefix.util) diff --git a/var/spack/repos/builtin/packages/qbox/qbox-python-shebang-path.patch b/var/spack/repos/builtin/packages/qbox/qbox-python-shebang-path.patch deleted file mode 100644 index 338a990680..0000000000 --- a/var/spack/repos/builtin/packages/qbox/qbox-python-shebang-path.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -Nuar spack-src/util/qbox_angle.py spack-src.patched/util/qbox_angle.py ---- spack-src/util/qbox_angle.py 2016-07-05 00:43:50.000000000 -0400 -+++ spack-src.patched/util/qbox_angle.py 2020-09-11 17:48:34.381997541 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # qbox_angle.py - # extract angle defined by three atoms from Qbox output - # use: qbox_angle.py name1 name2 name3 file.r -diff -Nuar spack-src/util/qbox_distance.py spack-src.patched/util/qbox_distance.py ---- spack-src/util/qbox_distance.py 2016-07-05 00:43:50.000000000 -0400 -+++ spack-src.patched/util/qbox_distance.py 2020-09-11 17:48:40.733188691 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # qbox_distance.py - # extract distance between two atoms from Qbox output - # use: qbox_distance.py name1 name2 file.r -diff -Nuar spack-src/util/qbox_dos.py spack-src.patched/util/qbox_dos.py ---- spack-src/util/qbox_dos.py 2014-01-10 15:39:02.000000000 -0500 -+++ spack-src.patched/util/qbox_dos.py 2020-09-11 17:48:46.141351461 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # qbox_dos.py: extract electronic DOS from Qbox output - # generate DOS plot in gnuplot format - # use: qbox_dos.py [-last] emin emax width file.r -diff -Nuar spack-src/util/qbox_eig.py spack-src.patched/util/qbox_eig.py ---- spack-src/util/qbox_eig.py 2016-09-06 19:47:51.000000000 -0400 -+++ spack-src.patched/util/qbox_eig.py 2020-09-11 17:49:00.811792982 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # qbox_eig.py: extract eigenvalues from Qbox output - # use: qbox_eig.py kpoint n ispin file.r - # extracts eigenvalue n at (ispin,kpoint) -diff -Nuar spack-src/util/qbox_maxforce.py spack-src.patched/util/qbox_maxforce.py ---- spack-src/util/qbox_maxforce.py 2016-09-06 19:47:51.000000000 -0400 -+++ spack-src.patched/util/qbox_maxforce.py 2020-09-11 17:49:05.763942033 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # Copyright 2016 The Regents of the University of California - # This file is part of Qbox - # -diff -Nuar spack-src/util/qbox_msd.py spack-src.patched/util/qbox_msd.py ---- spack-src/util/qbox_msd.py 2014-04-24 16:30:49.000000000 -0400 -+++ spack-src.patched/util/qbox_msd.py 2020-09-11 17:49:11.751122219 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # qbox_msd.py: compute mean-square displacement in an MD simulation - # generate plot of <r^2>(t) in gnuplot format - # use: qbox_msd.py species file.r [file.r ...] -diff -Nuar spack-src/util/qbox_repair_h2o.py spack-src.patched/util/qbox_repair_h2o.py ---- spack-src/util/qbox_repair_h2o.py 2013-12-05 15:28:06.000000000 -0500 -+++ spack-src.patched/util/qbox_repair_h2o.py 2020-09-11 17:49:16.467264160 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # qbox_repair_h2o.py: repair broken h2o molecules in a Qbox sys file - # move hydrogen atoms across periodic boundaries to repair molecules - # use: qbox_repair_h2o.py file.sys -diff -Nuar spack-src/util/qbox_torsion.py spack-src.patched/util/qbox_torsion.py ---- spack-src/util/qbox_torsion.py 2017-03-10 14:46:12.000000000 -0500 -+++ spack-src.patched/util/qbox_torsion.py 2020-09-11 17:49:21.469414705 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # qbox_torsion.py - # extract torsion angle defined by four atoms from Qbox output - # use: qbox_torsion.py name1 name2 name3 name4 file.r -diff -Nuar spack-src/util/qbox_xyz.py spack-src.patched/util/qbox_xyz.py ---- spack-src/util/qbox_xyz.py 2016-05-31 13:23:45.000000000 -0400 -+++ spack-src.patched/util/qbox_xyz.py 2020-09-11 17:49:26.550567625 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # Copyright 2016 The Regents of the University of California - # This file is part of Qbox - # -diff -Nuar spack-src/util/qso2qbox.py spack-src.patched/util/qso2qbox.py ---- spack-src/util/qso2qbox.py 2016-05-31 13:23:45.000000000 -0400 -+++ spack-src.patched/util/qso2qbox.py 2020-09-11 17:49:31.049703037 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # Convert <atomset> elements from quantum-simulation.org (QSO) format - # to Qbox input file - # use: qso2qbox.py [-last] {file|URL} -diff -Nuar spack-src/util/qso2qe.py spack-src.patched/util/qso2qe.py ---- spack-src/util/qso2qe.py 2016-05-31 13:23:45.000000000 -0400 -+++ spack-src.patched/util/qso2qe.py 2020-09-11 17:49:36.099855027 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - # Convert from quantum-simulation.org format to QuantumEspresso input format - # use: env ECUT=ecut qso2qe.py [-last] {file|URL} - -diff -Nuar spack-src/util/qso.py spack-src.patched/util/qso.py ---- spack-src/util/qso.py 2016-05-31 13:23:45.000000000 -0400 -+++ spack-src.patched/util/qso.py 2020-09-11 17:49:42.412045000 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/env python - import xml.sax - # quantum-simulation.org (QSO) definitions - class Atom: diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py index 158a2a021f..4896fdcc8a 100644 --- a/var/spack/repos/builtin/packages/qgis/package.py +++ b/var/spack/repos/builtin/packages/qgis/package.py @@ -110,7 +110,6 @@ class Qgis(CMakePackage): depends_on("py-pyqt4", when="@2") depends_on("py-pyqt5@5.3:", when="@3") depends_on("py-requests", type=("build", "run")) # TODO: is build dependency necessary? - depends_on("python@2.7:2.8", type=("build", "run"), when="@2") depends_on("python@3.0.0:", type=("build", "run"), when="@3") depends_on("python@3.6:", type=("build", "run"), when="@3.18:") depends_on("python@3.7:", type=("build", "run"), when="@3.20:") @@ -157,7 +156,6 @@ class Qgis(CMakePackage): depends_on("qt@:4", when="@2") # Help concretizer # +qsci_api is implied by qscintilla+python dependency - depends_on("py-pyqt4 +qsci_api", when="@2") depends_on("py-pyqt5@5.3: +qsci_api", when="@3") patch("pyqt5.patch", when="@:3.14 ^qt@5") diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 3e8c59d589..e55d0109ac 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -38,94 +38,9 @@ class Qt(Package): version("5.15.3", sha256="b7412734698a87f4a0ae20751bab32b1b07fdc351476ad8e35328dbe10efdedb") version("5.15.2", sha256="3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240") version("5.14.2", sha256="c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa") - version( - "5.14.1", - sha256="6f17f488f512b39c2feb57d83a5e0a13dcef32999bea2e2a8f832f54a29badb8", - deprecated=True, - ) - version( - "5.14.0", - sha256="be9a77cd4e1f9d70b58621d0753be19ea498e6b0da0398753e5038426f76a8ba", - deprecated=True, - ) - version( - "5.13.1", - sha256="adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e", - deprecated=True, - ) version("5.12.10", sha256="3e0ee1e57f5cf3eeb038d0b4b22c7eb442285c62639290756b39dc93a1d0e14f") - version( - "5.12.7", - sha256="873783a0302129d98a8f63de9afe4520fb5f8d5316be8ad7b760c59875cd8a8d", - deprecated=True, - ) - version( - "5.12.5", - sha256="a2299e21db7767caf98242767bffb18a2a88a42fee2d6a393bedd234f8c91298", - deprecated=True, - ) - version( - "5.12.2", - sha256="59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5", - deprecated=True, - ) - version( - "5.11.3", - sha256="859417642713cee2493ee3646a7fee782c9f1db39e41d7bb1322bba0c5f0ff4d", - deprecated=True, - ) - version( - "5.11.2", - sha256="c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81", - deprecated=True, - ) - version( - "5.10.0", - sha256="936d4cf5d577298f4f9fdb220e85b008ae321554a5fcd38072dc327a7296230e", - deprecated=True, - ) version("5.9.9", sha256="5ce285209290a157d7f42ec8eb22bf3f1d76f2e03a95fc0b99b553391be01642") - version( - "5.9.1", - sha256="7b41a37d4fe5e120cdb7114862c0153f86c07abbec8db71500443d2ce0c89795", - deprecated=True, - ) - version( - "5.9.0", - sha256="f70b5c66161191489fc13c7b7eb69bf9df3881596b183e7f6d94305a39837517", - deprecated=True, - ) - version( - "5.8.0", - sha256="0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6", - deprecated=True, - ) - version( - "5.7.1", - sha256="46ebca977deb629c5e69c2545bc5fe13f7e40012e5e2e451695c583bd33502fa", - deprecated=True, - ) - version( - "5.7.0", - sha256="a6a2632de7e44bbb790bc3b563f143702c610464a7f537d02036749041fd1800", - deprecated=True, - ) version("5.6.3", sha256="2fa0cf2e5e8841b29a4be62062c1a65c4f6f2cf1beaf61a5fd661f520cd776d0") - version( - "5.5.1", - sha256="c7fad41a009af1996b62ec494e438aedcb072b3234b2ad3eeea6e6b1f64be3b3", - deprecated=True, - ) - version( - "5.4.2", - sha256="cfc768c55f0a0cd232bed914a9022528f8f2e50cb010bf0e4f3f62db3dfa17bd", - deprecated=True, - ) - version( - "5.4.0", - sha256="1739633424bde3d89164ae6ff1c5c913be38b9997e451558ef873aac4bbc408a", - deprecated=True, - ) version("5.3.2", sha256="c8d3fd2ead30705c6673c5e4af6c6f3973346b4fb2bd6079c7be0943a5b0282d") version("5.2.1", sha256="84e924181d4ad6db00239d87250cc89868484a14841f77fb85ab1f1dbdcd7da1") version("4.8.7", sha256="e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0") @@ -281,15 +196,6 @@ class Qt(Package): depends_on("bison", type="build") depends_on("gperf") - # qtwebengine@5.7:5.15 are based on Google Chromium versions which depend on Py2 - with when("@5.7:5.15"): - depends_on("python@2.7.5:2", type="build") - # mesa inherits MesonPackage (since October 2020) which depends on Py@3. - # The conflicts('mesa') enables a regular build of `qt@5.7:5.15+webkit` - # without having to specify the exact version by causing the concretizer - # to select mesa18 which does not depend on python@3. - conflicts("mesa") - with when("@5.10:"): depends_on("nss@3.62:") @@ -308,6 +214,12 @@ class Qt(Package): depends_on("libxdamage") depends_on("gettext") + conflicts( + "+webkit", + when="@5.7:5.15", + msg="qtwebengine@5.7:5.15 are based on Google Chromium versions which depend on Py2", + ) + # gcc@4 is not supported as of Qt@5.14 # https://doc.qt.io/qt-5.14/supported-platforms.html conflicts("%gcc@:4", when="@5.14:") diff --git a/var/spack/repos/builtin/packages/quinoa/package.py b/var/spack/repos/builtin/packages/quinoa/package.py deleted file mode 100644 index b34578df8c..0000000000 --- a/var/spack/repos/builtin/packages/quinoa/package.py +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * -from spack.pkg.builtin.boost import Boost - - -class Quinoa(CMakePackage): - """Quinoa is a set of computational tools that enables research and - numerical analysis in fluid dynamics. At this time it is a test-bed - to experiment with various algorithms using fully asynchronous runtime - systems. - """ - - homepage = "https://quinoacomputing.org" - git = "https://github.com/quinoacomputing/quinoa.git" - - version("develop", branch="master") - - depends_on("hdf5+mpi") - depends_on("charmpp backend=mpi") - depends_on("trilinos+exodus+mpi") - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) - depends_on("hypre~internal-superlu") - depends_on("random123") - depends_on("netlib-lapack+lapacke") - depends_on("mad-numdiff") - depends_on("h5part") - depends_on("boostmplcartesianproduct") - depends_on("tut") - depends_on("pugixml") - depends_on("pstreams") - depends_on("pegtl") - - root_cmakelists_dir = "src" diff --git a/var/spack/repos/builtin/packages/reditools/package.py b/var/spack/repos/builtin/packages/reditools/package.py index 1033e2bdea..6e62ac12d0 100644 --- a/var/spack/repos/builtin/packages/reditools/package.py +++ b/var/spack/repos/builtin/packages/reditools/package.py @@ -32,7 +32,7 @@ class Reditools(PythonPackage): # pip silently replaces distutils with setuptools depends_on("py-setuptools", type="build") - depends_on("py-reindent", type="build", when="^python@3:") + depends_on("py-reindent", type="build") depends_on("blat", type="run") depends_on("py-fisher", type="run") depends_on("py-numpy", type="run") diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index ed8e94185a..4fed9f4e37 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -30,56 +30,6 @@ class RoctracerDev(CMakePackage): version("5.0.0", sha256="a21f4fb093cee4a806d53cbc0645d615d89db12fbde305e9eceee7e4150acdf2") version("4.5.2", sha256="7012d18b79736dbe119161aab86f4976b78553ce0b2f4753a9386752d75d5074") version("4.5.0", sha256="83dcd8987e129b14da0fe74e24ce8d027333f8fedc9247a402d3683765983296") - version( - "4.3.1", - sha256="88ada5f256a570792d1326a305663e94cf2c3b0cbd99f7e745326923882dafd2", - deprecated=True, - ) - version( - "4.3.0", - sha256="c3d9f408df8d4dc0e9c0026217b8c684f68e775da80b215fecb3cd24419ee6d3", - deprecated=True, - ) - version( - "4.2.0", - sha256="62a9c0cb1ba50b1c39a0636c886ac86e75a1a71cbf5fec05801517ceb0e67a37", - deprecated=True, - ) - version( - "4.1.0", - sha256="5d93de4e92895b6eb5f9d098f5dbd182d33923bd9b2ab69cf5a1abbf91d70695", - deprecated=True, - ) - version( - "4.0.0", - sha256="f47859a46173228b597c463eda850b870e810534af5efd5f2a746067ef04edee", - deprecated=True, - ) - version( - "3.10.0", - sha256="ac4a1d059fc34377e906071fd0e56f5434a7e0e4ded9db8faf9217a115239dec", - deprecated=True, - ) - version( - "3.9.0", - sha256="0678f9faf45058b16923948c66d77ba2c072283c975d167899caef969169b292", - deprecated=True, - ) - version( - "3.8.0", - sha256="5154a84ce7568cd5dba756e9508c34ae9fc62f4b0b5731f93c2ad68b21537ed1", - deprecated=True, - ) - version( - "3.7.0", - sha256="6fa5b771e990f09c242237ab334b9f01039ec7d54ccde993e719c5d6577d1518", - deprecated=True, - ) - version( - "3.5.0", - sha256="7af5326c9ca695642b4265232ec12864a61fd6b6056aa7c4ecd9e19c817f209e", - deprecated=True, - ) variant( "build_type", @@ -89,21 +39,10 @@ class RoctracerDev(CMakePackage): ) depends_on("cmake@3:", type="build") - depends_on("python@:2", type="build", when="@:4.1.0") - depends_on("python@3:", type="build", when="@4.2.0:") + depends_on("python@3:", type="build") depends_on("py-cppheaderparser", type="build") for ver in [ - "3.5.0", - "3.7.0", - "3.8.0", - "3.9.0", - "3.10.0", - "4.0.0", - "4.1.0", - "4.2.0", - "4.3.0", - "4.3.1", "4.5.0", "4.5.2", "5.0.0", @@ -118,21 +57,6 @@ class RoctracerDev(CMakePackage): depends_on("hsa-rocr-dev@" + ver, when="@" + ver) depends_on("rocminfo@" + ver, when="@" + ver) depends_on("hip@" + ver, when="@" + ver) - - for ver in [ - "4.2.0", - "4.3.0", - "4.3.1", - "4.5.0", - "4.5.2", - "5.0.0", - "5.0.2", - "5.1.0", - "5.1.3", - "5.2.0", - "5.2.1", - "5.2.3", - ]: depends_on("rocprofiler-dev@" + ver, when="@" + ver) @classmethod @@ -162,10 +86,7 @@ class RoctracerDev(CMakePackage): match = "^#!/usr/bin/python[23]" python = self.spec["python"].command.path substitute = "#!{python}".format(python=python) - if self.spec.satisfies("@:4.3.2"): - files = ["check_trace.py", "gen_ostream_ops.py", "hsaap.py", "kfdap.py"] - else: - files = ["check_trace.py", "gen_ostream_ops.py", "hsaap.py"] + files = ["check_trace.py", "gen_ostream_ops.py", "hsaap.py"] filter_file(match, substitute, *files, **kwargs) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/rust/package.py b/var/spack/repos/builtin/packages/rust/package.py index 2ffdf495cf..768e8946ad 100644 --- a/var/spack/repos/builtin/packages/rust/package.py +++ b/var/spack/repos/builtin/packages/rust/package.py @@ -54,7 +54,6 @@ class Rust(Package): ) depends_on("python@2.7:", type="build") - depends_on("python@2.7:2.8", when="@0:1.43", type="build") depends_on("gmake@3.81:", type="build") depends_on("cmake@3.4.3:", type="build") depends_on("ninja", when="@1.48.0:", type="build") @@ -95,171 +94,6 @@ class Rust(Package): version("1.45.1", sha256="ea53e6424e3d1fe56c6d77a00e72c5d594b509ec920c5a779a7b8e1dbd74219b") version("1.44.1", sha256="7e2e64cb298dd5d5aea52eafe943ba0458fa82f2987fdcda1ff6f537b6f88473") version("1.44.0", sha256="bf2df62317e533e84167c5bc7d4351a99fdab1f9cd6e6ba09f51996ad8561100") - version( - "1.43.1", - sha256="cde177b4a8c687da96f20de27630a1eb55c9d146a15e4c900d5c31cd3c3ac41d", - deprecated=True, - ) - version( - "1.43.0", - sha256="75f6ac6c9da9f897f4634d5a07be4084692f7ccc2d2bb89337be86cfc18453a1", - deprecated=True, - ) - version( - "1.42.0", - sha256="d2e8f931d16a0539faaaacd801e0d92c58df190269014b2360c6ab2a90ee3475", - deprecated=True, - ) - version( - "1.41.1", - sha256="38c93d016e6d3e083aa15e8f65511d3b4983072c0218a529f5ee94dd1de84573", - deprecated=True, - ) - version( - "1.41.0", - sha256="5546822c09944c4d847968e9b7b3d0e299f143f307c00fa40e84a99fabf8d74b", - deprecated=True, - ) - version( - "1.40.0", - sha256="dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad", - deprecated=True, - ) - version( - "1.39.0", - sha256="b4a1f6b6a93931f270691aba4fc85eee032fecda973e6b9c774cd06857609357", - deprecated=True, - ) - version( - "1.38.0", - sha256="644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80", - deprecated=True, - ) - version( - "1.37.0", - sha256="120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3", - deprecated=True, - ) - version( - "1.36.0", - sha256="04c4e4d7213d036d6aaed392841496d272146312c0290f728b7400fccd15bb1b", - deprecated=True, - ) - version( - "1.35.0", - sha256="5a4d637a716bac18d085f44dd87ef48b32195f71b967d872d80280b38cff712d", - deprecated=True, - ) - version( - "1.34.2", - sha256="c69a4a85a1c464368597df8878cb9e1121aae93e215616d45ad7d23af3052f56", - deprecated=True, - ) - version( - "1.34.1", - sha256="b0c785264d17e1dac4598627c248a2d5e07dd39b6666d1881fcfc8e2cf4c40a7", - deprecated=True, - ) - version( - "1.34.0", - sha256="7ac85acffd79dd3a7c44305d9eaabd1f1e7116e2e6e11e770e4bf5f92c0f1f59", - deprecated=True, - ) - version( - "1.33.0", - sha256="5a01a8d7e65126f6079042831385e77485fa5c014bf217e9f3e4aff36a485d94", - deprecated=True, - ) - version( - "1.32.0", - sha256="4c594c7712a0e7e8eae6526c464bf6ea1d82f77b4f61717c3fc28fb27ba2224a", - deprecated=True, - ) - version( - "1.31.1", - sha256="91d2fc22f08d986adab7a54eb3a6a9b99e490f677d2d092e5b9e4e069c23686a", - deprecated=True, - ) - version( - "1.30.1", - sha256="36a38902dbd9a3e1240d46ab0f2ca40d2fd07c2ab6508ed7970c6c4c036b5b29", - deprecated=True, - ) - version( - "1.30.0", - sha256="cd0ba83fcca55b64c0c9f23130fe731dfc1882b73ae21bef96be8f2362c108ee", - deprecated=True, - ) - version( - "1.29.2", - sha256="5088e796aa2e47478cdf41e7243fc5443fafab0a7c70a11423e57c80c04167c9", - deprecated=True, - ) - version( - "1.29.1", - sha256="f1b0728b66ce6bce6d72bbe5ea9e3a24ea22a045665da2ed8fcdfad14f61a349", - deprecated=True, - ) - version( - "1.29.0", - sha256="a4eb34ffd47f76afe2abd813f398512d5a19ef00989d37306217c9c9ec2f61e9", - deprecated=True, - ) - version( - "1.28.0", - sha256="1d5a81729c6f23a0a23b584dd249e35abe9c6f7569cee967cc42b1758ecd6486", - deprecated=True, - ) - version( - "1.27.2", - sha256="9a818c50cdb7880abeaa68b3d97792711e6c64c1cdfb6efdc23f75b8ced0e15d", - deprecated=True, - ) - version( - "1.27.1", - sha256="2133beb01ddc3aa09eebc769dd884533c6cfb08ce684f042497e097068d733d1", - deprecated=True, - ) - version( - "1.27.0", - sha256="2cb9803f690349c9fd429564d909ddd4676c68dc48b670b8ddf797c2613e2d21", - deprecated=True, - ) - version( - "1.26.2", - sha256="fb9ecf304488c9b56600ab20cfd1937482057f7e5db7899fddb86e0774548700", - deprecated=True, - ) - version( - "1.26.1", - sha256="70a7961bd8ec43b2c01e9896e90b0a06804a7fbe0a5c05acc7fd6fed19500df0", - deprecated=True, - ) - version( - "1.26.0", - sha256="4fb09bc4e233b71dcbe08a37a3f38cabc32219745ec6a628b18a55a1232281dd", - deprecated=True, - ) - version( - "1.25.0", - sha256="eef63a0aeea5147930a366aee78cbde248bb6e5c6868801bdf34849152965d2d", - deprecated=True, - ) - version( - "1.24.1", - sha256="3ea53d45e8d2e9a41afb3340cf54b9745f845b552d802d607707cf04450761ef", - deprecated=True, - ) - version( - "1.24.0", - sha256="bb8276f6044e877e447f29f566e4bbf820fa51fea2f912d59b73233ffd95639f", - deprecated=True, - ) - version( - "1.23.0", - sha256="7464953871dcfdfa8afcc536916a686dd156a83339d8ec4d5cb4eb2fe146cb91", - deprecated=True, - ) # The Rust bootstrapping process requires a bootstrapping compiler. The # easiest way to do this is to download the binary distribution of the @@ -323,204 +157,6 @@ class Rust(Package): "aarch64-unknown-linux-gnu": "bcc916003cb9c7ff44f5f9af348020b422dbc5bd4fe49bdbda2de6ce0a1bb745", "x86_64-apple-darwin": "f20388b80b2b0a8b122d89058f785a2cf3b14e93bcac53471d60fdb4106ffa35", }, - "1.43.1": { - "x86_64-unknown-linux-gnu": "25cd71b95bba0daef56bad8c943a87368c4185b90983f4412f46e3e2418c0505", - "powerpc64le-unknown-linux-gnu": "1670f00b00cc1bed38d523a25dba7420de3c06986c15a0248e06299f80ce6124", - "aarch64-unknown-linux-gnu": "fbb612387a64c9da2869725afffc1f66a72d6e7ba6667ba717cd52c33080b7fb", - "x86_64-apple-darwin": "e1c3e1426a9e615079159d6b619319235e3ca7b395e7603330375bfffcbb7003", - }, - "1.43.0": { - "x86_64-unknown-linux-gnu": "069f34fa5cef92551724c83c36360df1ac66fe3942bc1d0e4d341ce79611a029", - "powerpc64le-unknown-linux-gnu": "c75c7ae4c94715fd6cc43d1d6fdd0952bc151f7cbe3054f66d99a529d5bb996f", - "aarch64-unknown-linux-gnu": "e5fa55f333c10cdae43d147438a80ffb435d6c7b9681cd2e2f0857c024556856", - "x86_64-apple-darwin": "504e8efb2cbb36f5a3db7bb36f339a1e5216082c910ad19039c370505cfbde99", - }, - "1.42.0": { - "x86_64-unknown-linux-gnu": "7d1e07ad9c8a33d8d039def7c0a131c5917aa3ea0af3d0cc399c6faf7b789052", - "powerpc64le-unknown-linux-gnu": "805b08fa1e0aad4d706301ca1f13e2d80810d385cece2c15070360b3c4bd6e4a", - "aarch64-unknown-linux-gnu": "fdd39f856a062af265012861949ff6654e2b7103be034d046bec84ebe46e8d2d", - "x86_64-apple-darwin": "db1055c46e0d54b99da05e88c71fea21b3897e74a4f5ff9390e934f3f050c0a8", - }, - "1.41.1": { - "x86_64-unknown-linux-gnu": "a6d5a3b3f574aafc8f787fea37aad9fb8a7946b383ae5348146927192ff0bef0", - "powerpc64le-unknown-linux-gnu": "f9b53ca636625b3a2dd87600b6274223c11f866c9b5a34b638ea0013186659d3", - "aarch64-unknown-linux-gnu": "d54c0f9165b86216b6f1b499f451141407939c5dc6b36c89a3772895a1370242", - "x86_64-apple-darwin": "16615288cf74239783de1b435d329f3d56ed13803c7c10cd4b207d7c8ffa8f67", - }, - "1.41.0": { - "x86_64-unknown-linux-gnu": "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b", - "powerpc64le-unknown-linux-gnu": "ba231b0d8273d6928f61e2be3456e816a1de8050135e20c0623dc7a6ea03ba68", - "aarch64-unknown-linux-gnu": "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27", - "x86_64-apple-darwin": "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a", - }, - "1.40.0": { - "x86_64-unknown-linux-gnu": "fc91f8b4bd18314e83a617f2389189fc7959146b7177b773370d62592d4b07d0", - "powerpc64le-unknown-linux-gnu": "b1a23e35c383f99e647df6a9239b1dc9313e293deb70a76ba58e8ebe55ef623b", - "aarch64-unknown-linux-gnu": "639271f59766d291ebdade6050e7d05d61cb5c822a3ef9a1e2ab185fed68d729", - "x86_64-apple-darwin": "749ca5e0b94550369cc998416b8854c13157f5d11d35e9b3276064b6766bcb83", - }, - "1.39.0": { - "x86_64-unknown-linux-gnu": "b10a73e5ba90034fe51f0f02cb78f297ed3880deb7d3738aa09dc5a4d9704a25", - "powerpc64le-unknown-linux-gnu": "53b3fd942c52709f7e6fe11ea572d086e315a57a40b84b9b3290ac0ec8c7c84a", - "aarch64-unknown-linux-gnu": "e27dc8112fe577012bd88f30e7c92dffd8c796478ce386c49465c03b6db8209f", - "x86_64-apple-darwin": "3736d49c5e9592844e1a5d5452883aeaf8f1e25d671c1bc8f01e81c1766603b5", - }, - "1.38.0": { - "x86_64-unknown-linux-gnu": "adda26b3f0609dbfbdc2019da4a20101879b9db2134fae322a4e863a069ec221", - "powerpc64le-unknown-linux-gnu": "f9ed1bb6525abdd4dd6ef10782ad45d2f71496e0c3c88e806b510c81a91c4ff7", - "aarch64-unknown-linux-gnu": "06afd6d525326cea95c3aa658aaa8542eab26f44235565bb16913ac9d12b7bda", - "x86_64-apple-darwin": "bd301b78ddcd5d4553962b115e1dca5436dd3755ed323f86f4485769286a8a5a", - }, - "1.37.0": { - "x86_64-unknown-linux-gnu": "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb", - "powerpc64le-unknown-linux-gnu": "27c59ec40e9e9f71490dc00bf165156ae3ea77c20ffa4b5e5fd712e67527b477", - "aarch64-unknown-linux-gnu": "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba", - "x86_64-apple-darwin": "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d", - }, - "1.36.0": { - "x86_64-unknown-linux-gnu": "15e592ec52f14a0586dcebc87a957e472c4544e07359314f6354e2b8bd284c55", - "powerpc64le-unknown-linux-gnu": "654a7a18d881811c09f630b0c917825b586e94a6142eceaede6b8046718e4054", - "aarch64-unknown-linux-gnu": "db78c24d93756f9fe232f081dbc4a46d38f8eec98353a9e78b9b164f9628042d", - "x86_64-apple-darwin": "91f151ec7e24f5b0645948d439fc25172ec4012f0584dd16c3fb1acb709aa325", - }, - "1.35.0": { - "x86_64-unknown-linux-gnu": "cf600e2273644d8629ed57559c70ca8db4023fd0156346facca9ab3ad3e8f86c", - "powerpc64le-unknown-linux-gnu": "a933955adec386d75d126e78df5b9941936e156acb3353fc44b85995a81c7bb2", - "aarch64-unknown-linux-gnu": "31e6da56e67838fd2874211ae896a433badf67c13a7b68481f1d5f7dedcc5952", - "x86_64-apple-darwin": "ac14b1c7dc330dcb53d8641d74ebf9b32aa8b03b9d650bcb9258030d8b10dbd6", - }, - "1.34.2": { - "x86_64-unknown-linux-gnu": "2bf6622d980a52832bae141304e96f317c8a1ccd2dfd69a134a14033e6e43c0f", - "powerpc64le-unknown-linux-gnu": "4ddd55014bbd954b3499859bfa3146bff471de21c1d73fc6e7cccde290fc1918", - "aarch64-unknown-linux-gnu": "15fc6b7ec121df9d4e42483dd12c677203680bec8c69b6f4f62e5a35a07341a8", - "x86_64-apple-darwin": "6fdd4bf7fe26dded0cd57b41ab5f0500a5a99b7bc770523a425e9e34f63d0fd8", - }, - "1.34.1": { - "x86_64-unknown-linux-gnu": "8e2eead11bd5bf61409e29018d007c6fc874bcda2ff54db3d04d1691e779c14e", - "powerpc64le-unknown-linux-gnu": "94ac92d08afcfa2d77ae207e91b57c00cb48ff7ba08a27ed3deb2493f33e8fb1", - "aarch64-unknown-linux-gnu": "0565e50dae58759a3a5287abd61b1a49dfc086c4d6acf2ce604fe1053f704e53", - "x86_64-apple-darwin": "f4e46b9994ccfab4a84059298d1dc8fd446b1bbb7449462e0459948f7debea0e", - }, - "1.34.0": { - "x86_64-unknown-linux-gnu": "170647ed41b497dc937a6b2556700210bc4be187b1735029ef9ccf52e2cb5ab8", - "powerpc64le-unknown-linux-gnu": "3027e87802e161cce6f3a23d961f6d73b9ed6e829b2cd7af5dfccf6e1207e552", - "aarch64-unknown-linux-gnu": "370c3a8fb9a69df36d645a95e622fb59ac5b513baecddde706cedaf20defa269", - "x86_64-apple-darwin": "e6bea8d865cc7341c17fa3b8f25f7989e6b04f53e9da24878addc524f3a32664", - }, - "1.33.0": { - "x86_64-unknown-linux-gnu": "6623168b9ee9de79deb0d9274c577d741ea92003768660aca184e04fe774393f", - "powerpc64le-unknown-linux-gnu": "db885aa4c2c6896c85257be2ade5c9edea660ca6878970683e8d5796618329b5", - "aarch64-unknown-linux-gnu": "a308044e4076b62f637313ea803fa0a8f340b0f1b53136856f2c43afcabe5387", - "x86_64-apple-darwin": "864e7c074a0b88e38883c87c169513d072300bb52e1d320a067bd34cf14f66bd", - }, - "1.32.0": { - "x86_64-unknown-linux-gnu": "e024698320d76b74daf0e6e71be3681a1e7923122e3ebd03673fcac3ecc23810", - "powerpc64le-unknown-linux-gnu": "d6d5c9154f4459465d68ebd4fa1e17bad4b6cfe219667dddd9123c3bfb5dd839", - "aarch64-unknown-linux-gnu": "60def40961728212da4b3a9767d5a2ddb748400e150a5f8a6d5aa0e1b8ba1cee", - "x86_64-apple-darwin": "f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304", - }, - "1.31.1": { - "x86_64-unknown-linux-gnu": "a64685535d0c457f49a8712a096a5c21564cd66fd2f7da739487f028192ebe3c", - "powerpc64le-unknown-linux-gnu": "a6f61b7a8a06a2b0a785391cc3e6bb8004aa72095eea80db1561039f5bb3e975", - "aarch64-unknown-linux-gnu": "29a7c6eb536fefd0ca459e48dfaea006aa8bff8a87aa82a9b7d483487033632a", - "x86_64-apple-darwin": "8398b1b303bdf0e7605d08b87070a514a4f588797c6fb3593718cb9cec233ad6", - }, - "1.30.1": { - "x86_64-unknown-linux-gnu": "a01a493ed8946fc1c15f63e74fc53299b26ebf705938b4d04a388a746dfdbf9e", - "powerpc64le-unknown-linux-gnu": "a7d4806e6702bdbad5017eeddc62f7ff7eb2438b1b9c39cbc90c2b1207f8e65f", - "aarch64-unknown-linux-gnu": "6d87d81561285abd6c1987e07b60b2d723936f037c4b46eedcc12e8566fd3874", - "x86_64-apple-darwin": "3ba1704a7defe3d9a6f0c1f68792c084da83bcba85e936d597bac0c019914b94", - }, - "1.30.0": { - "x86_64-unknown-linux-gnu": "f620e3125cc505c842150bd873c0603432b6cee984cdae8b226cf92c8aa1a80f", - "powerpc64le-unknown-linux-gnu": "0b53e257dc3d9f3d75cd97be569d3bf456d2c0af57ed0bd5e7a437227d8f465a", - "aarch64-unknown-linux-gnu": "9690c7c50eba5a8461184ee4138b4c284bad31ccc4aa1f2ddeec58b253e6363e", - "x86_64-apple-darwin": "07008d90932712282bc599f1e9a226e97879c758dc1f935e6e2675e45694cc1b", - }, - "1.29.2": { - "x86_64-unknown-linux-gnu": "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8", - "powerpc64le-unknown-linux-gnu": "344003b808c20424c4699c9452bd37cdee23857dd4aa125e67d1d6e4bc992091", - "aarch64-unknown-linux-gnu": "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f", - "x86_64-apple-darwin": "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2", - }, - "1.29.1": { - "x86_64-unknown-linux-gnu": "b36998aea6d58525f25d89f1813b6bfd4cad6ff467e27bd11e761a20dde43745", - "powerpc64le-unknown-linux-gnu": "26a6d652ade6b6a96e6af18e846701ee28f912233372dfe15432139252f88958", - "aarch64-unknown-linux-gnu": "2685224f67b2ef951e0e8b48829f786cbfed95e19448ba292ac33af719843dbe", - "x86_64-apple-darwin": "07b07fbd6fab2390e19550beb8008745a8626cc5e97b72dc659061c1c3b3d008", - }, - "1.29.0": { - "x86_64-unknown-linux-gnu": "09f99986c17b1b6b1bfbc9dd8785e0e4693007c5feb67915395d115c1a3aea9d", - "powerpc64le-unknown-linux-gnu": "d6954f1da53f7b3618fba3284330d99b6142bb25d9febba6dbfedad59ca53329", - "aarch64-unknown-linux-gnu": "0ed3be0fd9f847afeb4e587fff61f6769ea61b53719d3ea999326284e8975b36", - "x86_64-apple-darwin": "28a0473637585742f6d80ccd8afd88b6b400e65d623c33cb892412759444da93", - }, - "1.28.0": { - "x86_64-unknown-linux-gnu": "2a1390340db1d24a9498036884e6b2748e9b4b057fc5219694e298bdaa37b810", - "powerpc64le-unknown-linux-gnu": "255818156ec1f795ed808a44b4fdb8019187d5ebb7f837ae8f55a1ca40862bb6", - "aarch64-unknown-linux-gnu": "9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1", - "x86_64-apple-darwin": "5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393", - }, - "1.27.2": { - "x86_64-unknown-linux-gnu": "5028a18e913ef3eb53e8d8119d2cc0594442725e055a9361012f8e26f754f2bf", - "powerpc64le-unknown-linux-gnu": "11034d150e811d4903b09fd42f0cb76d467a6365a158101493405fff1054572f", - "aarch64-unknown-linux-gnu": "cf84da70269c0e50bb3cc3d248bae1ffcd70ee69dc5a4e3513b54fefc6685fb4", - "x86_64-apple-darwin": "30c5cc58759caa4efdf2ea7d8438633139c98bee3408beb29ceb26985f3f5f70", - }, - "1.27.1": { - "x86_64-unknown-linux-gnu": "435778a837af764da2a7a7fb4d386b7b78516c7dfc732d892858e9a8a539989b", - "powerpc64le-unknown-linux-gnu": "a08e6b6fed3329fcd1220b2ee4cd7a311d99121cf780fb6e1c6353bfeddfb176", - "aarch64-unknown-linux-gnu": "d1146b240e6f628224c3a67e3aae2a57e6c25d544115e5ece9ce91861ec92b3a", - "x86_64-apple-darwin": "475be237962d6aef1038a2faada26fda1e0eaea5d71d6950229a027a9c2bfe08", - }, - "1.27.0": { - "x86_64-unknown-linux-gnu": "235ad78e220b10a2d0267aea1e2c0f19ef5eaaff53ad6ff8b12c1d4370dec9a3", - "powerpc64le-unknown-linux-gnu": "847774a751e848568215739d384e3baf4d6ec37d27fb3add7a8789208c213aff", - "aarch64-unknown-linux-gnu": "e74ebc33dc3fc19e501a677a87b619746efdba2901949a0319176352f556673a", - "x86_64-apple-darwin": "a1d48190992e01aac1a181bce490c80cb2c1421724b4ff0e2fb7e224a958ce0f", - }, - "1.26.2": { - "x86_64-unknown-linux-gnu": "d2b4fb0c544874a73c463993bde122f031c34897bb1eeb653d2ba2b336db83e6", - "powerpc64le-unknown-linux-gnu": "ea045869074ae3617eeb51207ce183e6915784b9ed615ecb92ce082ddb86ec1f", - "aarch64-unknown-linux-gnu": "3dfad0dc9c795f7ee54c2099c9b7edf06b942adbbf02e9ed9e5d4b5e3f1f3759", - "x86_64-apple-darwin": "f193705d4c0572a358670dbacbf0ffadcd04b3989728b442f4680fa1e065fa72", - }, - "1.26.1": { - "x86_64-unknown-linux-gnu": "b7e964bace1286696d511c287b945f3ece476ba77a231f0c31f1867dfa5080e0", - "powerpc64le-unknown-linux-gnu": "ad8b2f6dd8c5cca1251d65b75ed2120aae3c5375d2c8ed690259cf4a652d7d3c", - "aarch64-unknown-linux-gnu": "d4a369053c2dfd5f457de6853557dab563944579fa4bb55bc919bacf259bff6d", - "x86_64-apple-darwin": "ebf898b9fa7e2aafc53682a41f18af5ca6660ebe82dd78f28cd9799fe4dc189a", - }, - "1.26.0": { - "x86_64-unknown-linux-gnu": "13691d7782577fc9f110924b26603ade1990de0b691a3ce2dc324b4a72a64a68", - "powerpc64le-unknown-linux-gnu": "3ba3a4905730ec01007ca1096d9fc3780f4e81f71139a619e1f526244301b7f4", - "aarch64-unknown-linux-gnu": "e12dc84bdb569cdb382268a5fe6ae6a8e2e53810cb890ec3a7133c20ba8451ac", - "x86_64-apple-darwin": "38708803c3096b8f101d1919ee2d7e723b0adf1bc1bb986b060973b57d8c7c28", - }, - "1.25.0": { - "x86_64-unknown-linux-gnu": "06fb45fb871330a2d1b32a27badfe9085847fe824c189ddc5204acbe27664f5e", - "powerpc64le-unknown-linux-gnu": "79eeb2a7fafa2e0f65f29a1dc360df69daa725347e4b6a533684f1c07308cc6e", - "aarch64-unknown-linux-gnu": "19a43451439e515a216d0a885d14203f9a92502ee958abf86bf7000a7d73d73d", - "x86_64-apple-darwin": "fcd0302b15e857ba4a80873360cf5453275973c64fa82e33bfbed02d88d0ad17", - }, - "1.24.1": { - "x86_64-unknown-linux-gnu": "4567e7f6e5e0be96e9a5a7f5149b5452828ab6a386099caca7931544f45d5327", - "powerpc64le-unknown-linux-gnu": "6f6c4bebbd7d6dc9989bf372c512dea55af8f56a1a0cfe97784667f0ac5430ee", - "aarch64-unknown-linux-gnu": "64bb25a9689b18ddadf025b90d9bdb150b809ebfb74432dc69cc2e46120adbb2", - "x86_64-apple-darwin": "9d4aacdb5849977ea619d399903c9378163bd9c76ea11dac5ef6eca27849f501", - }, - "1.24.0": { - "x86_64-unknown-linux-gnu": "336cf7af6c857cdaa110e1425719fa3a1652351098dc73f156e5bf02ed86443c", - "powerpc64le-unknown-linux-gnu": "25d9b965a63ad2f345897028094d4c7eafa432237b478754ccbcc299f80629c8", - "aarch64-unknown-linux-gnu": "a981de306164b47f3d433c1d53936185260642849c79963af7e07d36b063a557", - "x86_64-apple-darwin": "1aecba7cab4bc1a9e0e931c04aa00849e930b567d243da7b676ede8f527a2992", - }, - "1.23.0": { - "x86_64-unknown-linux-gnu": "9a34b23a82d7f3c91637e10ceefb424539dcfa327c2dcd292ff10c047b1fdc7e", - "powerpc64le-unknown-linux-gnu": "60f1a1cc182c516de08c1f42ada01604a3d94383e9dded6b237ae2233999437b", - "aarch64-unknown-linux-gnu": "38379fbd976d2286cb73f21466db40a636a583b9f8a80af5eea73617c7912bc7", - "x86_64-apple-darwin": "9274e977322bb4b153f092255ac9bd85041142c73eaabf900cb2ef3d3abb2eba", - }, } # This dictionary maps Rust target architectures to Spack constraints that diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index 4e662275a2..c64cdee839 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -27,11 +27,8 @@ class Scons(PythonPackage): version("3.0.5", sha256="e95eaae17d9e490cf12cd37f091a6cbee8a628b5c8dbd3cab1f348f602f46462") version("3.0.4", sha256="72c0b56db84f40d3558f351918a0ab98cb4345e8696e879d3e271f4df4a5913c") version("3.0.1", sha256="24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173") - version("2.5.1", sha256="c8de85fc02ed1a687b1f2ac791eaa0c1707b4382a204f17d782b5b111b9fdf07") - version("2.5.0", sha256="01f1b3d6023516a8e1b5e77799e5a82a23b32953b1102d339059ffeca8600493") - # Python 3 support was added in SCons 3.0.0 - depends_on("python@:2", when="@:2", type=("build", "run")) + depends_on("python") # Python 2 support was dropped in SCons 4.0.0 depends_on("python@3.5:", when="@4:4.2.0") # Python 3.5 support was dropped in SCons 4.3.0 diff --git a/var/spack/repos/builtin/packages/sensei/package.py b/var/spack/repos/builtin/packages/sensei/package.py index ff88d767dd..2e1ee5309c 100644 --- a/var/spack/repos/builtin/packages/sensei/package.py +++ b/var/spack/repos/builtin/packages/sensei/package.py @@ -44,7 +44,7 @@ class Sensei(CMakePackage): description="Enable VTKm adaptors and endpoints", when="@4: +catalyst", ) - variant("python", default=False, description="Enable Python bindings") + variant("python", default=False, description="Enable Python bindings", when="@3:") variant( "miniapps", default=False, description="Enable the parallel 3D and oscillators miniapps" ) @@ -54,8 +54,7 @@ class Sensei(CMakePackage): # version 3, SENSEI supports Python 3. depends_on("paraview+mpi", when="+catalyst") depends_on("paraview+hdf5", when="+catalyst+hdf5") - depends_on("paraview+python", when="@:2 +catalyst+python") - depends_on("paraview+python3", when="@3: +catalyst+python") + depends_on("paraview+python", when="+catalyst+python") depends_on("paraview@5.5.0:5.5.2", when="@:2.1.1 +catalyst") depends_on("paraview@5.6:5.7", when="@3:3.2.1 +catalyst") @@ -82,9 +81,7 @@ class Sensei(CMakePackage): # HDF5 depends_on("hdf5", when="+hdf5") - # SENSEI 3 supports Python 3, earlier versions upport only Python 2 - depends_on("python@:2.7.16", when="@:2.1.1 +python", type=("build", "run")) - depends_on("python@3:", when="@3: +python", type=("build", "run")) + depends_on("python@3:", when="+python", type=("build", "run")) extends("python", when="+python") depends_on("py-numpy", when="+python", type=("build", "run")) depends_on("py-mpi4py", when="+python", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/sgpp/package.py b/var/spack/repos/builtin/packages/sgpp/package.py index e5e7dbc505..b6bc654505 100644 --- a/var/spack/repos/builtin/packages/sgpp/package.py +++ b/var/spack/repos/builtin/packages/sgpp/package.py @@ -18,14 +18,10 @@ class Sgpp(SConsPackage): maintainers = ["G-071", "leiterrl", "pfluegdk"] - # Versions with Python 3 bindings: version("master", branch="master") version("3.4.0", sha256="450d4002850b0a48c561abe221b634261ca44eee111ca605c3e80797182f40b3") version("3.3.0", sha256="ca4d5b79f315b425ce69b04940c141451a76848bf1bd7b96067217304c68e2d4") version("3.2.0", sha256="dab83587fd447f92ed8546eacaac6b8cbe65b8db5e860218c0fa2e42f776962d") - # Versions with Python 2 bindings: - version("3.1.0", sha256="6b46bc5b3966e92567d6754130666bdffb7be1d1d2c1b427d7ce964b8eaab526") - version("3.0.0", sha256="4dd9049e664abd7db78c355fea5e192167812f443115d4bf686a51bb1e9bda9c") # Patches with bugfixes that are necessary to build old SGpp versions # with spack. Patches are submitted upstream, but need to applied @@ -47,7 +43,7 @@ class Sgpp(SConsPackage): # Fixed in SGpp in PR https://github.com/SGpp/SGpp/pull/229 patch("avx512_datadriven_compilation.patch", when="@:3.3.0+datadriven") - variant("python", default=True, description="Provide Python bindings for SGpp") + variant("python", default=True, description="Provide Python bindings for SGpp", when="@3.2:") variant("optimization", default=True, description="Builds the optimization module of SGpp") variant("pde", default=True, description="Builds the datadriven module of SGpp") variant("quadrature", default=True, description="Builds the datadriven module of SGpp") @@ -68,7 +64,6 @@ class Sgpp(SConsPackage): # Mandatory dependencies depends_on("scons", type=("build")) - depends_on("scons@2.5.1", when="@1.0.0:3.1.0", type=("build")) depends_on("scons@3:", when="@3.2.0:", type=("build")) depends_on("zlib", type=("link")) # Python dependencies @@ -76,17 +71,10 @@ class Sgpp(SConsPackage): depends_on("py-pip", when="+python", type="build") depends_on("py-wheel", when="+python", type="build") depends_on("py-setuptools", when="+python", type=("build")) - # Python 3 support was added in version 3.2.0 - depends_on("python@2.7:2.8", when="@1.0.0:3.1.0+python", type=("build", "run")) - depends_on("python@3.7:", when="@3.2.0:+python", type=("build", "run")) + depends_on("python@3.7:", when="+python", type=("build", "run")) depends_on("swig@3:", when="+python", type=("build")) - # Python libraries (version depends on whether we use Python 2 or 3) - depends_on("py-numpy", when="+python", type=("build", "run")) - depends_on("py-numpy@:1.16", when="@1.0.0:3.1.0+python", type=("build", "run")) - depends_on("py-numpy@1.17:", when="@3.2.0:+python", type=("build", "run")) - depends_on("py-scipy", when="+python", type=("build", "run")) - depends_on("py-scipy@:1.2.3", when="@1.0.0:3.1.0+python", type=("build", "run")) - depends_on("py-scipy@1.3.0:", when="@3.2.0:+python", type=("build", "run")) + depends_on("py-numpy@1.17:", when="+python", type=("build", "run")) + depends_on("py-scipy@1.3:", when="+python", type=("build", "run")) # OpenCL dependency depends_on("opencl@1.1:", when="+opencl", type=("build", "run")) # MPI dependency diff --git a/var/spack/repos/builtin/packages/shiny-server/package.py b/var/spack/repos/builtin/packages/shiny-server/package.py deleted file mode 100644 index 05fe93b3f7..0000000000 --- a/var/spack/repos/builtin/packages/shiny-server/package.py +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class ShinyServer(CMakePackage): - """Shiny server lets you put shiny web applications and interactive - documents online. Take your shiny apps and share them with your - organization or the world.""" - - # - # HEADS UP: - # 1. The shiny server installation step will download various node - # and npm bits from the net. They seem to have them well - # constrained ("npm shrinkwrap"?), but this package is not - # "air gappable". - # 2. Docs say that it requires 'gcc'. depends_on() won't do the - # right thing, it's Up To You. - # - homepage = "https://www.rstudio.com/products/shiny/shiny-server/" - url = "https://github.com/rstudio/shiny-server/archive/v1.5.3.838.tar.gz" - - version("1.5.3.838", sha256="6fd1b12cd1cbe5c64cacbec4accefe955353f9c675e5feff809c0e911a382141") - - depends_on("python@:2.8") # docs say: "Really. 3.x will not work" - depends_on("cmake@2.8.10:", type="build") - depends_on("git") - depends_on("r+X") - depends_on("openssl") - - def cmake_args(self): - spec = self.spec - options = [] - - options.append("-DPYTHON=%s" % spec["python"].command.path) - - return options - - # Recompile the npm modules included in the project - @run_after("build") - def build_node(self): - bash = which("bash") - mkdirp("build") - bash("-c", 'bin/npm --python="$PYTHON" install') - bash( - "-c", - "bin/node ./ext/node/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js " - '--python="$PYTHON" rebuild', - ) - - def setup_run_environment(self, env): - env.prepend_path("PATH", join_path(self.prefix, "shiny-server", "bin")) - # shiny comes with its own pandoc; hook it up... - env.prepend_path("PATH", join_path(self.prefix, "shiny-server", "ext", "pandoc", "static")) diff --git a/var/spack/repos/builtin/packages/simulationio/package.py b/var/spack/repos/builtin/packages/simulationio/package.py index 12299f7334..115a2baa5e 100644 --- a/var/spack/repos/builtin/packages/simulationio/package.py +++ b/var/spack/repos/builtin/packages/simulationio/package.py @@ -22,21 +22,21 @@ class Simulationio(CMakePackage): variant("asdf", default=True, description="Enable ASDF bindings") variant("julia", default=False, description="Enable Julia bindings") - variant("python", default=True, description="Enable Python bindings") + variant("python", default=True, description="Enable Python bindings", when="@9:") variant("hdf5", default=True, description="Enable HDF5 bindings") variant("rnpl", default=False, description="Enable RNPL bindings") variant("silo", default=False, description="Enable Silo bindings") variant("pic", default=True, description="Produce position-independent code") + depends_on("asdf-cxx ~python", when="+asdf") depends_on("asdf-cxx ~python", when="+asdf ~python") depends_on("asdf-cxx +python", when="+asdf +python") depends_on("hdf5 +cxx @1.10.1:", when="+hdf5") depends_on("julia", when="+julia", type=("build", "run")) depends_on("py-h5py", when="+python", type=("build", "run")) depends_on("py-numpy", when="+python", type=("build", "run")) - depends_on("python@3:", when="@9: +python", type=("build", "run")) - depends_on("python@2.7:2.8", when="@:8 +python", type=("build", "run")) + depends_on("python@3:", when="+python", type=("build", "run")) depends_on("rnpletal", when="+rnpl") depends_on("silo", when="+silo") depends_on("swig", type="build") diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 48590e36c6..bcbafe4f73 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -48,26 +48,12 @@ class Slepc(Package, CudaPackage, ROCmPackage): version("3.11.2", sha256="cd6a73ac0c9f689c12f2987000a7a28fa7df53fdc069fb59a2bb148699e741dd") version("3.11.1", sha256="4816070d4ecfeea6212c6944cee22dc7b4763df1eaf6ab7847cc5ac5132608fb") version("3.11.0", sha256="bf29043c311fe2c549a25e2b0835095723a3eebc1dff288a233b32913b5762a2") - version("3.10.2", sha256="0594972293f6586458a54b7c1e1121b311a9c9449060355d52bb3bf09ad6812b") - version("3.10.1", sha256="f64787c8c2ab3d2f6db3c67d2bfe6ee84f741ce3dfde1d2f8221e131820a12a1") - version("3.10.0", sha256="069d7a579995e0be1567c5bc869251e29c00044369a786933ca3040149d0412a") - version("3.9.2", sha256="247585b3f8c10bf50b9464cb8ef7b5f22bead6f96524384897a37ec4146eb03e") - version("3.9.1", sha256="e174ea7c127d9161eef976b0288f0c56d443a58d6ab2dc8af1e8bd66f156ce17") - version("3.9.0", sha256="1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b") - version("3.8.2", sha256="1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13") - version("3.8.0", sha256="c58ccc4e852d1da01112466c48efa41f0839649f3a265925788237d76cd3d963") - version("3.7.4", sha256="2fb782844e3bc265a8d181c3c3e2632a4ca073111c874c654f1365d33ca2eb8a") - version("3.7.3", sha256="3ef9bcc645a10c1779d56b3500472ceb66df692e389d635087d30e7c46424df9") - version("3.7.1", sha256="670216f263e3074b21e0623c01bc0f562fdc0bffcd7bd42dd5d8edbe73a532c2") - version("3.6.3", sha256="384939d009546db37bc05ed81260c8b5ba451093bf891391d32eb7109ccff876") - version("3.6.2", sha256="2ab4311bed26ccf7771818665991b2ea3a9b15f97e29fd13911ab1293e8e65df") variant("arpack", default=True, description="Enables Arpack wrappers") 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") - depends_on("python@2.6:2.8,3.4:", type="build", when="@3.11:") + depends_on("python@2.6:2.8,3.4:", type="build") # Cannot mix release and development versions of SLEPc and PETSc: depends_on("petsc@main", when="@main") @@ -79,11 +65,6 @@ class Slepc(Package, CudaPackage, ROCmPackage): 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") depends_on("arpack-ng~mpi", when="+arpack^petsc~mpi~int64") depends_on("arpack-ng+mpi", when="+arpack^petsc+mpi~int64") diff --git a/var/spack/repos/builtin/packages/slider/package.py b/var/spack/repos/builtin/packages/slider/package.py deleted file mode 100644 index bf20bff475..0000000000 --- a/var/spack/repos/builtin/packages/slider/package.py +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - - -from spack.package import * - - -class Slider(MavenPackage): - """Slider is a framework for deployment and management of these - long-running data access applications in Hadoop.""" - - homepage = "https://www.cloudera.com/products/open-source/apache-hadoop/apache-slider.html" - url = "https://archive.apache.org/dist/incubator/slider/0.92.0-incubating/apache-slider-0.92.0-incubating-source-release.tar.gz" - list_url = "http://archive.apache.org/dist/incubator/slider" - list_depth = 1 - - version("0.92.0", sha256="485f02f4f9f0b270017717c9471b83b0d77d005d25261b741fb381791ce838b9") - version("0.91.0", sha256="212a5cde6de60060c9a081f553d66940b70af4bccb469072febb554c4005bcef") - version("0.90.2", sha256="410941f772d29f564c4bb90ca0631f29dc895f509048cb6052f8695302e3f944") - - depends_on("java@8", type=("build", "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 - ) - - def install(self, spec, prefix): - slider_path = join_path( - self.stage.source_path, - "slider-assembly", - "target", - "slider-{0}-incubating-all".format(spec.version), - "slider-{0}-incubating".format(spec.version), - ) - with working_dir(slider_path): - install_tree(".", prefix) diff --git a/var/spack/repos/builtin/packages/snakemake/package.py b/var/spack/repos/builtin/packages/snakemake/package.py index 6cebab00d5..8b84f02499 100644 --- a/var/spack/repos/builtin/packages/snakemake/package.py +++ b/var/spack/repos/builtin/packages/snakemake/package.py @@ -16,48 +16,40 @@ class Snakemake(PythonPackage): version("6.15.1", sha256="a219601d57037f565ead9963e6bd8d04d3bdd985d172371e54197dcbdba79865") version("6.13.1", sha256="22f57dcd8b1ca8a30aaa45c5d2c0f56d381d4731abd0988f24f9de46b7d9827c") version("6.12.3", sha256="af86af9a540da3dceb05dad1040f1d3d733e6a695f8b3f8c30f8cf3bc6570a88") - version( - "3.11.2", - sha256="f7a3b586bc2195f2dce4a4817b7ec828b6d2a0cff74a04e0f7566dcd923f9761", - deprecated=True, - ) depends_on("py-requests", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) depends_on("py-wrapt", type=("build", "run")) - depends_on("python@3.3:3.6", when="@:5") - - with when("@6:"): - depends_on("python@3.5:") - depends_on("py-pyyaml", type=("build", "run")) - depends_on("py-configargparse", type=("build", "run")) - depends_on("py-appdirs", type=("build", "run")) - depends_on("py-datrie", type=("build", "run")) - depends_on("py-jsonschema", type=("build", "run")) - depends_on("py-docutils", type=("build", "run")) - depends_on("py-gitpython", type=("build", "run")) - depends_on("py-psutil", type=("build", "run")) - depends_on("py-nbformat", type=("build", "run")) - depends_on("py-toposort", type=("build", "run")) - depends_on("py-connectionpool@0.0.3:", type=("build", "run")) - depends_on("py-pulp@2.0:", type=("build", "run")) - depends_on("py-smart-open@3.0:", type=("build", "run")) - depends_on("py-filelock", type=("build", "run")) - depends_on("py-stopit", type=("build", "run")) - depends_on("py-tabulate", type=("build", "run")) - depends_on("py-ratelimiter", type=("build", "run")) - - variant("reports", default=False, description="Generate self-contained HTML reports") - with when("+reports"): - depends_on("py-jinja2", type=("build", "run")) - depends_on("py-networkx", type=("build", "run")) - depends_on("py-pygments", type=("build", "run")) - depends_on("py-pygraphviz", type=("build", "run")) - - variant("google-cloud", default=False, description="Enable Google Cloud execution") - with when("+google-cloud"): - depends_on("py-oauth2client", type=("build", "run")) - depends_on("py-google-crc32c", type=("build", "run")) - depends_on("py-google-api-python-client", type=("build", "run")) - depends_on("py-google-cloud-storage", type=("build", "run")) + depends_on("python@3.5:") + depends_on("py-pyyaml", type=("build", "run")) + depends_on("py-configargparse", type=("build", "run")) + depends_on("py-appdirs", type=("build", "run")) + depends_on("py-datrie", type=("build", "run")) + depends_on("py-jsonschema", type=("build", "run")) + depends_on("py-docutils", type=("build", "run")) + depends_on("py-gitpython", type=("build", "run")) + depends_on("py-psutil", type=("build", "run")) + depends_on("py-nbformat", type=("build", "run")) + depends_on("py-toposort", type=("build", "run")) + depends_on("py-connectionpool@0.0.3:", type=("build", "run")) + depends_on("py-pulp@2.0:", type=("build", "run")) + depends_on("py-smart-open@3.0:", type=("build", "run")) + depends_on("py-filelock", type=("build", "run")) + depends_on("py-stopit", type=("build", "run")) + depends_on("py-tabulate", type=("build", "run")) + depends_on("py-ratelimiter", type=("build", "run")) + + variant("reports", default=False, description="Generate self-contained HTML reports") + with when("+reports"): + depends_on("py-jinja2", type=("build", "run")) + depends_on("py-networkx", type=("build", "run")) + depends_on("py-pygments", type=("build", "run")) + depends_on("py-pygraphviz", type=("build", "run")) + + variant("google-cloud", default=False, description="Enable Google Cloud execution") + with when("+google-cloud"): + depends_on("py-oauth2client", type=("build", "run")) + depends_on("py-google-crc32c", type=("build", "run")) + depends_on("py-google-api-python-client", type=("build", "run")) + depends_on("py-google-cloud-storage", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/stat/configure_mpicxx.patch b/var/spack/repos/builtin/packages/stat/configure_mpicxx.patch deleted file mode 100644 index e09056d95c..0000000000 --- a/var/spack/repos/builtin/packages/stat/configure_mpicxx.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 07ab6e565f939c54fff6580fc8463ea61662871a -Author: Gregory L. Lee <lee218@llnl.gov> -Date: Tue May 20 14:53:35 2014 -0700 - - re-boostrap to update configure - -diff --git a/configure b/configure -index 6c4af7d..30901ea 100755 ---- a/configure -+++ b/configure -@@ -15529,7 +15529,7 @@ fi - done - test -n "$MPICC" || MPICC="$CC" - -- for ac_prog in mpig++ mpiicpc mpxlC mpixlC -+ for ac_prog in mpig++ mpiCC mpicxx mpiicpc mpxlC mpixlC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index 91a5f095a6..d711ae1fb7 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -41,38 +41,6 @@ class Stat(AutotoolsPackage): sha256="ae3fbd6946003fb16233d82d40285780a9a802da5fe30d09adb8a8b2a2cc4ad6", url="https://github.com/LLNL/STAT/files/2489327/stat-4.0.1.tar.gz", ) - version( - "4.0.0", - sha256="1c4f62686645f6dc1d9ef890acc9c2839c150789dc220718775878feb41bdabf", - url="https://github.com/LLNL/STAT/releases/download/v4.0.0/stat-4.0.0.tar.gz", - ) - version( - "3.0.1", - sha256="540916ffb92026ca7aa825a2320095a89b9b4fd3426ee7657b44ac710618947e", - url="https://github.com/LLNL/STAT/files/911503/stat-3.0.1.zip", - deprecated=True, - ) - version( - "3.0.0", - sha256="b95cac82989e273e566f16ba17a75526374ee8e0ef066a411977e1935967df57", - url="https://github.com/LLNL/STAT/releases/download/v3.0.0/STAT-3.0.0.tar.gz", - deprecated=True, - ) - version( - "2.2.0", - sha256="ed4732bfbe942ca8e29342f24f48e0c295989b0639a548febe7a1c1390ae1993", - deprecated=True, - ) - version( - "2.1.0", - sha256="497ed2bd1127cb2e97b32a30a4f62b6b298d18f3313c0278dd908c6ecba64f43", - deprecated=True, - ) - version( - "2.0.0", - sha256="b19587c2166b5d4d3a89a0ec5433ac61335aa7ad5cfa5a3b4406f5ea6c0bf0ac", - deprecated=True, - ) # TODO: dysect requires Dyninst patch for version 3.0.0b variant("dysect", default=False, description="enable DySectAPI") @@ -89,17 +57,13 @@ class Stat(AutotoolsPackage): 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@1.1.1:", when="+fgfs") - depends_on("graphlib@2.0.0", when="@2.0.0:2.2.0") - depends_on("graphlib@3.0.0", when="@3:") + depends_on("graphlib@3.0.0") depends_on("graphviz", type=("build", "link", "run")) # we depend on mpa@master for bug fixes since launchmon 1.0.2 depends_on("launchmon@1.2.0:") depends_on("mrnet") depends_on("python") - depends_on("python@:2.8", when="@:4.0.0") - depends_on("py-pygtk", type=("build", "run"), when="@:4.0.0 +gui") - depends_on("py-enum34", type=("run"), when="@:4.0.0") - depends_on("py-xdot@1.0", when="@4.0.1: +gui") + depends_on("py-xdot@1.0", when="+gui") depends_on("swig") depends_on("mpi", when="+examples") @@ -108,8 +72,6 @@ class Stat(AutotoolsPackage): # See https://github.com/spack/spack/pull/22303 for reference depends_on(Boost.with_default_variants) - patch("configure_mpicxx.patch", when="@2.1.0") - # No Mac support due to dependencies like dyninst, elf etc. conflicts("platform=darwin", msg="macOS is not supported") diff --git a/var/spack/repos/builtin/packages/strelka/package.py b/var/spack/repos/builtin/packages/strelka/package.py deleted file mode 100644 index 7508c0ad5a..0000000000 --- a/var/spack/repos/builtin/packages/strelka/package.py +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Strelka(CMakePackage): - """Somatic and germline small variant caller for mapped sequencing - data.""" - - homepage = "https://github.com/Illumina/strelka" - url = "https://github.com/Illumina/strelka/releases/download/v2.8.2/strelka-2.8.2.release_src.tar.bz2" - - version("2.9.10", sha256="45e78efec6e5272697f1d0a95851c7ae0d623dc8f93846e11fe37f15da9f1e30") - version("2.9.9", sha256="547b42ab983ba38a6459d47e8546daa6d571f370933542f02f3f3bd9abd13c16") - version("2.9.8", sha256="dc12b894e1267a63f7049bc01402b284db1681c82fb2cac313324a6530cbc4ad") - version("2.9.7", sha256="9b0db7cc32662488ea53931e1afccff3e7967cd3b492cc93e66a8115a1f4d016") - version("2.9.6", sha256="db6fe97add75309954bb46f9c53e1c722d8a8d66adc976ff7e2e9788b7ff97fa") - version("2.9.5", sha256="b3d70129508226280f4de9c328f3cd751e4cedba4383b0264a16ac37f73b1412") - version("2.9.4", sha256="d06088bb2b033cfcda7263fe8fcf915cba10c77df963f116f64a57cd2682803f") - version("2.9.3", sha256="9f2cd17b5326f09c499fb01d32d1bb61dec9a97c70199f685824e89bfcad2dee") - version("2.9.2", sha256="47642c3138e126efaab485a40a9a954abfed34f8c88b107a46dbd64e3f1778a5") - version("2.9.1", sha256="963e1935389d8777bcdfe77f6126a34a0f8ea5cc27a280e41ba67e9df88cf990") - version("2.9.0", sha256="25b4dbd270f541bc6a172d12448c209586e9f00e86f56cfce98d1d5612bb4fb8") - version("2.8.4", sha256="523fb89e7ba7717a61548fcd45b0ccd5c850a8f2b034ab1cf34ec74efb7260c2") - version("2.8.3", sha256="4f6f8f433a3e1d7a59243bd75bc73dcfb309c1dacc79fe56fafd0ad96e856415") - version("2.8.2", sha256="27415f7c14f92e0a6b80416283a0707daed121b8a3854196872981d132f1496b") - - depends_on("python@2.4:2.7") - depends_on("zlib") - depends_on("bzip2") - depends_on("cmake@2.8.5:", type="build") - depends_on( - "boost@1.56.0:" - "+program_options+exception+filesystem+system+chrono+serialization+timer" - "+container+test+math" - ) diff --git a/var/spack/repos/builtin/packages/thrift/package.py b/var/spack/repos/builtin/packages/thrift/package.py index 6bccf7b4cf..950bc9cb2d 100644 --- a/var/spack/repos/builtin/packages/thrift/package.py +++ b/var/spack/repos/builtin/packages/thrift/package.py @@ -56,10 +56,6 @@ class Thrift(Package): depends_on("py-tornado", type=("build", "run"), when="+python") depends_on("py-twisted", type=("build", "run"), when="+python") depends_on("py-zope-interface", type=("build", "run"), when="+python") - depends_on("py-ipaddress", type=("build", "run"), when="+python ^python@2") - depends_on( - "py-backports-ssl-match-hostname@3.5:", when="+python ^python@:3.4", type=("build", "run") - ) depends_on("py-pure-sasl", type=("build", "run"), when="+python") depends_on("scons", type=("build", "run"), when="+python") diff --git a/var/spack/repos/builtin/packages/tppred/package.py b/var/spack/repos/builtin/packages/tppred/package.py deleted file mode 100644 index 2de59d3bbc..0000000000 --- a/var/spack/repos/builtin/packages/tppred/package.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Tppred(Package): - """TPPRED is a software package for the prediction of mitochondrial - targeting peptides from protein primary sequence.""" - - homepage = "https://tppred2.biocomp.unibo.it/tppred2/default/software" - url = "http://biocomp.unibo.it/savojard/tppred2.tar.gz" - - version("2.0", sha256="0e180d5ce1f0bccfdbc3dbf9981b3fbe2101c85491c58c58c88856861688a4f5") - - depends_on("python@2.7:2", type="run") - depends_on("py-scikit-learn@0.13.1", type="run") - depends_on("emboss") - - def url_for_version(self, version): - url = "http://biocomp.unibo.it/savojard/tppred{0}.tar.gz" - return url.format(version.up_to(1)) - - def install(self, spec, prefix): - mkdirp(prefix.bin) - with working_dir("bin"): - install("tppred2.py", prefix.bin) - install_tree("data", prefix.data) - install_tree("example", prefix.example) - install_tree("tppred2modules", prefix.modules) - - def setup_run_environment(self, env): - env.set("TPPRED_ROOT", self.prefix) diff --git a/var/spack/repos/builtin/packages/tut/package.py b/var/spack/repos/builtin/packages/tut/package.py deleted file mode 100644 index 9bbac19164..0000000000 --- a/var/spack/repos/builtin/packages/tut/package.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Tut(WafPackage): - """TUT is a small and portable unit test framework for C++.""" - - homepage = "https://mrzechonek.github.io/tut-framework/" - url = "https://github.com/mrzechonek/tut-framework/tarball/2016-12-19" - - version( - "2016-12-19", sha256="9fc0325d6db9709cc5213773bf4fd84f2a95154f18f7f8a553e1e52392e15691" - ) - - patch("python3-octal.patch", when="@2016-12-19") - - # Python 3.7 support is currently broken - # https://github.com/mrzechonek/tut-framework/issues/18 - depends_on("python@:3.6", type="build") - - # Tut is used for smoke build tests in CI, and started failing as - # soon as gcc@11 was introduced in the environment - conflicts("%gcc@11:") - - def build_args(self): - args = [] - - if self.run_tests: - # Run unit tests - args.append("--test") - - return args diff --git a/var/spack/repos/builtin/packages/tut/python3-octal.patch b/var/spack/repos/builtin/packages/tut/python3-octal.patch deleted file mode 100644 index d6d9b14273..0000000000 --- a/var/spack/repos/builtin/packages/tut/python3-octal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/waftools/gcov.py 2016-12-19 04:55:44.000000000 -0600 -+++ b/waftools/gcov.py 2018-03-28 10:42:53.000000000 -0500 -@@ -13,7 +13,7 @@ - wrapper = NamedTemporaryFile(delete=False) - wrapper.write(script) - wrapper.close() -- os.chmod(wrapper.name, 0777) -+ os.chmod(wrapper.name, 0o777) - - yield wrapper.name - diff --git a/var/spack/repos/builtin/packages/vapor/package.py b/var/spack/repos/builtin/packages/vapor/package.py deleted file mode 100644 index f0f3f31548..0000000000 --- a/var/spack/repos/builtin/packages/vapor/package.py +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Vapor(CMakePackage): - """VAPOR is the Visualization and Analysis Platform for Ocean, Atmosphere, - and Solar Researchers. - - VAPOR provides an interactive 3D visualization environment that can also - produce animations and still frame images.""" - - homepage = "https://www.vapor.ucar.edu/" - url = "https://github.com/NCAR/VAPOR/archive/3.3.0.tar.gz" - - maintainers = ["RemiLacroix-IDRIS"] - - version("3.5.0", sha256="f055d488c6f5bda5174a63990b6b6600037f7ce73ac68d39ad0f371d67f2d685") - version("3.3.0", sha256="41c13d206cfcfa4146155d524106de2eb74e7b59af1e2f8c1c3056c15d508a93") - - depends_on("glu") # GUI - depends_on("qt@5.13.2:+opengl+dbus") # GUI - depends_on("netcdf-c@4.7.0:") - depends_on("udunits@2.2.26:") - depends_on("freetype@2.10.1:") - depends_on("libgeotiff@1.5.1:") - depends_on("hdf5@1.10.5:") - depends_on("jpeg@9c:") - depends_on("glew@2.1.0:") # GUI - depends_on("assimp@4.1.0:") - depends_on("libtiff@4.0.10:") - depends_on("proj@6.1.1:7") - depends_on("glm@0.9.9.1:") - depends_on("python@3.6.9:3.6") - depends_on("py-numpy") - - def cmake_args(self): - with open("site.local", "w") as f: - python = self.spec["python"] - f.write("set (PYTHONVERSION {0})\n".format(python.version.up_to(2))) - f.write("set (PYTHONDIR {0})\n".format(python.home)) - f.write("set (PYTHONPATH {0})\n".format(python.package.platlib)) - # install expects the share/images directory to install below this path - f.write("set (THIRD_PARTY_DIR {0})\n".format(self.stage.source_path)) - numpy_include = join_path( - self.spec["py-numpy"].prefix, - self.spec["python"].package.platlib, - "numpy", - "core", - "include", - ) - f.write('set (THIRD_PARTY_INC_DIR "{0}")\n'.format(numpy_include)) - - args = ["-DBUILD_OSP=OFF"] - return args - - def setup_run_environment(self, env): - # set VAPOR_HOME in the module file - env.set("VAPOR_HOME", self.prefix) diff --git a/var/spack/repos/builtin/packages/verrou/package.py b/var/spack/repos/builtin/packages/verrou/package.py index 2b3af58510..fcdfd346c7 100644 --- a/var/spack/repos/builtin/packages/verrou/package.py +++ b/var/spack/repos/builtin/packages/verrou/package.py @@ -30,8 +30,6 @@ class Verrou(AutotoolsPackage): version("develop", branch="master") version("2.2.0", sha256="d4ea3d19f0c61329723907b5b145d85776bb702643c1605a31f584484d2c5efc") version("2.1.0", sha256="b1ba49f84aebab15b8ab5649946c9c31b53ad1499f6ffb681c98db41ed28566d") - version("2.0.0", sha256="798df6e426ec57646a2a626d756b72f0171647ae5b07c982952dae2d71e26045") - version("1.1.0", sha256="b5105f61c65680f31551199cd143b2e15f412c34c821537998a7165e315dde2d") # The server is sometimes a bit slow to respond timeout = {"timeout": 60} @@ -65,8 +63,7 @@ class Verrou(AutotoolsPackage): depends_on("libtool", type="build") depends_on("m4", type="build") - 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")) + depends_on("python@3.0:", type=("build", "run")) extends("python") def patch(self): diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index 8d55406242..1c5c0df2f0 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -43,7 +43,7 @@ class Vtk(CMakePackage): # VTK7 defaults to OpenGL2 rendering backend variant("opengl2", default=True, description="Enable OpenGL2 backend") variant("osmesa", default=False, description="Enable OSMesa support") - variant("python", default=False, description="Enable Python support") + variant("python", default=False, description="Enable Python support", when="@8:") variant("qt", default=False, description="Build with support for Qt") variant("xdmf", default=False, description="Build XDMF file support") variant("ffmpeg", default=False, description="Build with FFMPEG support") @@ -65,8 +65,6 @@ class Vtk(CMakePackage): with when("+python"): # Depend on any Python, add bounds below. extends("python@2.7:", type=("build", "run")) - # Python 3 support from vtk 8 - depends_on("python@:2", when="@:7", type=("build", "run")) # Python 3.8 support from vtk 9 depends_on("python@:3.7", when="@:8", type=("build", "run")) # Python 3.10 support from vtk 9.2 diff --git a/var/spack/repos/builtin/packages/workrave/add_time_header.patch b/var/spack/repos/builtin/packages/workrave/add_time_header.patch deleted file mode 100644 index 535b7356fe..0000000000 --- a/var/spack/repos/builtin/packages/workrave/add_time_header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/backend/src/TimePred.hh b/backend/src/TimePred.hh -index 187f0fc..99bf48c 100644 ---- a/backend/src/TimePred.hh -+++ b/backend/src/TimePred.hh -@@ -26,6 +26,7 @@ - #else - # if HAVE_SYS_TIME_H - # include <sys/time.h> -+# include <time.h> - # else - # include <time.h> - # endif diff --git a/var/spack/repos/builtin/packages/workrave/dont_get_widget.patch b/var/spack/repos/builtin/packages/workrave/dont_get_widget.patch deleted file mode 100644 index de8076748c..0000000000 --- a/var/spack/repos/builtin/packages/workrave/dont_get_widget.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc b/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc -index ee7d56f..608fddb 100644 ---- a/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc -+++ b/frontend/plugin/statistics/gtkmm/src/StatisticsDialog.cc -@@ -604,7 +604,7 @@ StatisticsDialog::on_history_delete_all() - ); - Gtk::MessageDialog mb_ask( *this, msg, true, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_YES_NO, false ); - mb_ask.set_title( _("Warning") ); -- mb_ask.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); -+ //mb_ask.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); - if( mb_ask.run() == Gtk::RESPONSE_YES ) - { - mb_ask.hide(); -@@ -630,7 +630,7 @@ StatisticsDialog::on_history_delete_all() - ); - Gtk::MessageDialog mb_error( *this, msg, true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_YES_NO, false ); - mb_error.set_title( _("Error") ); -- mb_error.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); -+ //mb_error.get_widget_for_response( Gtk::RESPONSE_NO )->grab_default(); - if( mb_error.run() != Gtk::RESPONSE_YES ) - break; - } diff --git a/var/spack/repos/builtin/packages/workrave/no_gettext.patch b/var/spack/repos/builtin/packages/workrave/no_gettext.patch deleted file mode 100644 index ab440c0e11..0000000000 --- a/var/spack/repos/builtin/packages/workrave/no_gettext.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a8a437f..6128cd2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -949,8 +949,8 @@ dnl - dnl Internationalization - dnl - --AM_GNU_GETTEXT_VERSION([0.17]) --AM_GNU_GETTEXT([external]) -+dnl AM_GNU_GETTEXT_VERSION([0.17]) -+dnl AM_GNU_GETTEXT([external]) - - dnl Hack because windows gettext package is SEVERELY broken... - if test "x$platform_os_win32" = "xyes" -@@ -963,9 +963,10 @@ then - BUILD_INCLUDED_LIBINTL=no - fi - --GETTEXT_PACKAGE=workrave --AC_SUBST(GETTEXT_PACKAGE) --AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext domain name.]) -+dnl GETTEXT_PACKAGE=workrave -+dnl AC_SUBST(GETTEXT_PACKAGE) -+dnl AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext domain name.]) -+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) - IT_PROG_INTLTOOL([0.40.0]) - - diff --git a/var/spack/repos/builtin/packages/workrave/package.py b/var/spack/repos/builtin/packages/workrave/package.py deleted file mode 100644 index 2a2ee1ca92..0000000000 --- a/var/spack/repos/builtin/packages/workrave/package.py +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class Workrave(AutotoolsPackage): - """Workrave is a program that assists in the recovery and prevention of - Repetitive Strain Injury (RSI). The program frequently alerts you to - take micro-pauses, rest breaks and restricts you to your daily limit. - The program runs on GNU/Linux and Microsoft Windows. - """ - - homepage = "https://www.workrave.org/" - url = "https://github.com/rcaelers/workrave/archive/v1_10_20.tar.gz" - - version("1_10_20", sha256="a89c6e82d5bbbaae5e171100b87c4efd8316ab8a18d82b83714035e1116983ec") - version("1_10_19", sha256="3a24d87e22fc9f463b6a9319843751038cbf6acfab9cd67893221a0071cf5405") - version("1_10_18", sha256="f0de5abd2c3a29106b915f1c051808f6083e1052b46c5143ff96e2334757e91b") - version("1_10_17", sha256="d911fd4738b6b4737cc2fc54c1683eb5d290f2764398c432fcc3b61bb326e71a") - version("1_10_16", sha256="4368306db0d06e76a3a90fc8e81b3648c1218259833b01cdc6899b1e98e5895c") - version("1_10_15", sha256="fa05bedbb32baae9d22ef2b1ac25e90bc9f1363ce588b396190b0240559f471c") - version("1_10_14", sha256="de342be4ff131645ff29fe003b476816965a65a44f4ddc85109960502d9e7310") - version("1_10_13", sha256="cbb5dab1073d2715e5b9cb8ccf8b3362ab6fa8ab05aa44629ecc78d6b93769e3") - version("1_10_12", sha256="eb7a4b7ba137e6997d7b44ed38b705daf391e9c646a5a068c9b002830f35be47") - version("1_10_10", sha256="84f9dca7634e291631017053a63ac20cd23c4da8c8f09ca4beef6f1419d904e3") - - depends_on("autoconf", type="build") - depends_on("automake", type="build") - depends_on("libtool", type="build") - depends_on("m4", type="build") - - depends_on("libx11") - depends_on("py-cheetah") - depends_on("glib") - depends_on("glibmm") - depends_on("gtkplus") - depends_on("gtkmm@2.17.1") - depends_on("libsigcpp") - - # adds #include <time.h> to a workrave test - patch("add_time_header.patch") - - # removes call to missing gtkmm api function - patch("dont_get_widget.patch") - - # removes gettext which canot be use with intltool - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724555 - # https://bugzilla.gnome.org/show_bug.cgi?id=708673#c4 - patch("no_gettext.patch") - - # add a couple m4 macros used during autoreconf - # https://github.com/rcaelers/workrave/issues/95 - m4files = ["ax_cxx_compile_stdcxx_11", "ax_cxx_compile_stdcxx"] - resource( - name=m4files[0], - url="https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_cxx_compile_stdcxx_11.m4", - sha256="d75fc9fe4502eea02e8c5bfb61b88a04cd08aa6d5bd757fe66e9a9a1e4781b46", - expand=False, - destination="", - placement=m4files[0], - ) - resource( - name=m4files[1], - url="https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_cxx_compile_stdcxx.m4", - sha256="0c08d2f64147f65eb7e255019102c1042ab695c60fd49add19793951a1279a1a", - expand=False, - destination="", - placement=m4files[1], - ) - - def setup_build_environment(self, env): - # unset PYTHONHOME to let system python script with explict - # system python sbangs like glib-mkenums work, see #6968 - # Without this, we will get - # ImportError: No module named site - # during build phase when make runs glib-mkenums - env.unset("PYTHONHOME") - - @run_before("autoreconf") - def extra_m4(self): - # move m4 macros, which we added with the resource() directive, - # to the m4 directory, where aclocal will pick them up - for fname in self.m4files: - src = "%s/%s/%s.m4" % (self.stage.source_path, fname, fname) - dest = "%s/m4/%s.m4" % (self.stage.source_path, fname) - copy(src, dest) |