py-virtualenv: add 20.22.0 (#37259)

* py-virtualenv: add 20.22.0

* [@spackbot] updating style on behalf of manuelakuhn

* Fix dependency versions for release 20.22.0

* Remove python version restrictions

* [@spackbot] updating style on behalf of manuelakuhn

* py-platformdirs: add 3.5.0

* py-filelock: add 3.12.0

* Fix dependency bound for py-platformdirs

* py-importlib-metadata: add 6.6.0

4 files changed, 55 insertions, 29 deletions

diff --git a/var/spack/repos/builtin/packages/py-filelock/package.py b/var/spack/repos/builtin/packages/py-filelock/package.py
index e1f27dd20c..5feb61cb54 100644
--- a/var/spack/repos/builtin/packages/py-filelock/package.py
+++ b/var/spack/repos/builtin/packages/py-filelock/package.py
@@ -16,6 +16,7 @@ class PyFilelock(PythonPackage):
     homepage = "https://github.com/tox-dev/py-filelock"
     pypi = "filelock/filelock-3.0.4.tar.gz"
 
+    version("3.12.0", sha256="fc03ae43288c013d2ea83c8597001b1129db351aad9c57fe2409327916b8e718")
     version("3.8.0", sha256="55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc")
     version("3.5.0", sha256="137b661e657f7850eec9def2a001efadba3414be523b87cd3f9a037372d80a15")
     version("3.4.0", sha256="93d512b32a23baf4cac44ffd72ccf70732aeff7b8050fcaf6d3ec406d954baf4")
@@ -31,11 +32,15 @@ class PyFilelock(PythonPackage):
     version("2.0.8", sha256="7e48e4906de3c9a5d64d8f235eb3ae1050dfefa63fd65eaf318cc915c935212b")
 
     depends_on("python@3.7:", when="@3.4.2:", type=("build", "run"))
-    depends_on("python@3.6:", when="@3.3:", type=("build", "run"))
-    depends_on("python@2.7:2,3.5:", when="@3.1:", type=("build", "run"))
-    depends_on("py-setuptools@63.4:", when="@3.8:", type="build")
-    depends_on("py-setuptools@41:", when="@3.1:", type="build")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools-scm@7.0.5:", when="@3.8:", type="build")
-    depends_on("py-setuptools-scm@2:", when="@3.1:", type="build")
+
+    depends_on("py-hatch-vcs@0.3:", when="@3.8:", type="build")
+    depends_on("py-hatchling@1.14:", when="@3.8:", type="build")
+
+    with when("@:3.8.0"):
+        depends_on("py-setuptools@63.4:", when="@3.8:", type="build")
+        depends_on("py-setuptools@41:", when="@3.1:", type="build")
+        depends_on("py-setuptools", type="build")
+        depends_on("py-setuptools-scm@7.0.5:", when="@3.8:", type="build")
+        depends_on("py-setuptools-scm@2:", when="@3.1:", type="build")
+
     depends_on("py-wheel@0.30:", when="@3.1:3.7", type="build")
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 d3021be604..319f35b6c7 100644
--- a/var/spack/repos/builtin/packages/py-importlib-metadata/package.py
+++ b/var/spack/repos/builtin/packages/py-importlib-metadata/package.py
@@ -13,6 +13,7 @@ class PyImportlibMetadata(PythonPackage):
     pypi = "importlib_metadata/importlib_metadata-1.2.0.tar.gz"
     git = "https://github.com/python/importlib_metadata"
 
+    version("6.6.0", sha256="92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705")
     version("5.1.0", sha256="d5059f9f1e8e41f80e9c56c2ee58811450c31984dfa625329ffd7c0dad88a73b")
     version("4.12.0", sha256="637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670")
     version("4.11.1", sha256="175f4ee440a0317f6e8d81b7f8d4869f93316170a65ad2b007d2929186c8052c")
@@ -28,9 +29,6 @@ class PyImportlibMetadata(PythonPackage):
     version("0.19", sha256="23d3d873e008a513952355379d93cbcab874c58f4f034ff657c7a87422fa64e8")
     version("0.18", sha256="cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db")
 
-    depends_on("python@3.7:", when="@4.9:", type=("build", "run"))
-    depends_on("python@3.6:", when="@3:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
     depends_on("py-setuptools@56:", when="@4.6.4:", type="build")
     depends_on("py-setuptools", type="build")
     depends_on("py-setuptools-scm@3.4.1:+toml", when="@3:", type="build")
diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py
index 545c36b71d..2f597dd98f 100644
--- a/var/spack/repos/builtin/packages/py-platformdirs/package.py
+++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py
@@ -14,6 +14,7 @@ class PyPlatformdirs(PythonPackage):
     homepage = "https://github.com/platformdirs/platformdirs"
     pypi = "platformdirs/platformdirs-2.4.0.tar.gz"
 
+    version("3.5.0", sha256="7954a68d0ba23558d753f73437c55f89027cf8f5108c19844d4b82e5af396335")
     version("3.1.1", sha256="024996549ee88ec1a9aa99ff7f8fc819bb59e2c3477b410d90a16d32d6e707aa")
     version("2.5.2", sha256="58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19")
     version("2.4.1", sha256="440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda")
@@ -30,8 +31,11 @@ class PyPlatformdirs(PythonPackage):
     depends_on("python@3.7:", when="@2.4.1:", type=("build", "run"))
     depends_on("py-hatch-vcs@0.3:", when="@3:", type="build")
     depends_on("py-hatch-vcs", when="@2.5.2:", type="build")
+    depends_on("py-hatchling@1.14:", when="@3.3:", type="build")
     depends_on("py-hatchling@1.12.2:", when="@3:", type="build")
     depends_on("py-hatchling@0.22.0:", when="@2.5.2:", type="build")
+
+    depends_on("py-typing-extensions@4.5:", when="@3.2: ^python@:3.7", type=("build", "run"))
     depends_on("py-typing-extensions@4.4:", when="@3: ^python@:3.7", type=("build", "run"))
 
     # Historical dependencies
diff --git a/var/spack/repos/builtin/packages/py-virtualenv/package.py b/var/spack/repos/builtin/packages/py-virtualenv/package.py
index 1ae8a18f96..7b3790b82e 100644
--- a/var/spack/repos/builtin/packages/py-virtualenv/package.py
+++ b/var/spack/repos/builtin/packages/py-virtualenv/package.py
@@ -13,6 +13,7 @@ class PyVirtualenv(PythonPackage):
     pypi = "virtualenv/virtualenv-16.7.6.tar.gz"
     git = "https://github.com/pypa/virtualenv.git"
 
+    version("20.22.0", sha256="278753c47aaef1a0f14e6db8a4c5e1e040e90aea654d0fc1dc7e0d8a42616cc3")
     version("20.17.1", sha256="f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058")
     version("20.16.4", sha256="014f766e4134d0008dcaa1f95bafa0fb0f575795d07cae50b1bee514185d6782")
     version("20.10.0", sha256="576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218")
@@ -24,31 +25,49 @@ class PyVirtualenv(PythonPackage):
     version("13.0.1", sha256="36c2cfae0f9c6462264bb19c478fc6bab3478cf0575f1027452e975a1ed84dbd")
     version("1.11.6", sha256="3e7a4c151e2ee97f51db0215bfd2a073b04a91e9786df6cb67c916f16abe04f7")
 
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
-    depends_on("python@2.7:2.8,3.5:", when="@20.10.0:", type=("build", "run"))
-    depends_on("python@3.6:", when="@20.16.4:", type=("build", "run"))
+    depends_on("py-hatch-vcs@0.3:", when="@20.18:", type="build")
+    depends_on("py-hatchling@1.14:", when="@20.22:", type="build")
+    depends_on("py-hatchling@1.12.2:", when="@20.18:", type="build")
 
-    # not just build-time, requires pkg_resources
-    depends_on("py-setuptools@40.6.3:", type=("build", "run"))
-    depends_on("py-setuptools@41.00.03:", when="@20.10.0:", type=("build", "run"))
-    depends_on("py-setuptools@59.6:", when="@20.16.4:", type=("build", "run"))
-    depends_on("py-setuptools-scm@2:", when="@20.10.0:", type="build")
-    depends_on("py-setuptools-scm@6.4.2:", when="@20.16.4:", type="build")
+    with when("@:20.17"):
+        # not just build-time, requires pkg_resources
+        depends_on("py-setuptools@59.6:", when="@20.16.3:", type=("build", "run"))
+        depends_on("py-setuptools@41.0.0:", when="@20.0.0:20.16.2", type=("build", "run"))
+        depends_on("py-setuptools@40.6.3:", when="@16.1.2:16", type=("build", "run"))
+        depends_on("py-setuptools@40.0.4:", when="@16.1.0", type=("build", "run"))
+        depends_on("py-setuptools", type=("build", "run"))
+        depends_on("py-setuptools-scm@6.4.2:", when="@20.16.3:", type="build")
+        depends_on("py-setuptools-scm@2:", when="@20.0.5:20.16.2", type="build")
+        depends_on("py-setuptools-scm+toml@3.4:", when="@20.0.0:20.0.4", type="build")
+        depends_on("py-wheel@0.30:", when="@20.0.0:20.16.2", type="build")
+        depends_on("py-wheel@0.29:", when="@16.1:16", type="build")
 
-    depends_on("py-distlib@0.3.1:0", when="@20.10.0:", type=("build", "run"))
-    depends_on("py-distlib@0.3.5:0", when="@20.16.4:", type=("build", "run"))
     depends_on("py-distlib@0.3.6:0", when="@20.16.6:", type=("build", "run"))
-    depends_on("py-filelock@3.2:3", when="@20.10.0:", type=("build", "run"))
-    depends_on("py-filelock@3.4.1:3", when="@20.16.4:", type=("build", "run"))
-    depends_on("py-platformdirs@2:2", when="@20.10.0:", type=("build", "run"))
-    depends_on("py-platformdirs@2.4:2", when="@20.16.4:", type=("build", "run"))
-    depends_on("py-importlib-metadata@0.12:", when="@20.10.0: ^python@:3.7", type=("build", "run"))
+    depends_on("py-distlib@0.3.5:0", when="@20.16.3:20.16.5", type=("build", "run"))
+    depends_on("py-distlib@0.3.1:0", when="@20.0.26:20.16.2", type=("build", "run"))
+    depends_on("py-distlib@0.3.0:0", when="@20.0.0:20.0.25", type=("build", "run"))
+    depends_on("py-filelock@3.11:3", when="@20.22:", type=("build", "run"))
+    depends_on("py-filelock@3.4.1:3", when="@20.16.3:", type=("build", "run"))
+    depends_on("py-filelock@3.2:3", when="@20.9:20.16.2", type=("build", "run"))
+    depends_on("py-filelock@3.0.0:3", when="@20.0:20.8", type=("build", "run"))
+    depends_on("py-importlib-metadata@6.4.1:", when="@20.22: ^python@:3.7", type=("build", "run"))
     depends_on(
-        "py-importlib-metadata@4.8.3:", when="@20.16.4: ^python@:3.7", type=("build", "run")
+        "py-importlib-metadata@4.8.3:", when="@20.16.3: ^python@:3.7", type=("build", "run")
     )
+    depends_on("py-importlib-metadata@0.12:", when="@20.2.1: ^python@:3.7", type=("build", "run"))
+    depends_on(
+        "py-importlib-metadata@0.12:3", when="@20.0.0:20.2.0 ^python@:3.7", type=("build", "run")
+    )
+    depends_on("py-platformdirs@3.2:3", when="@20.22:", type=("build", "run"))
+    depends_on("py-platformdirs@2.4:2", when="@20.16.3:20.21", type=("build", "run"))
+    depends_on("py-platformdirs@2:2", when="@20.5:20.16.2", type=("build", "run"))
 
     # dependencies of old versions
     depends_on(
-        "py-backports-entry-points-selectable @1.0.4:", when="@20.10.0", type=("build", "run")
+        "py-backports-entry-points-selectable @1.0.4:", when="@20.5:20.10", type=("build", "run")
     )
-    depends_on("py-six@1.9.0:1", when="@20.10.0", type=("build", "run"))
+    depends_on("py-six@1.9.0:1", when="@20.0.4:20.15", type=("build", "run"))
+    depends_on("py-six@1.12.0:1", when="@20.0.0:20.0.3", type=("build", "run"))
+    depends_on("py-appdirs@1.4.3:1", when="@20.0.0:20.4", type=("build", "run"))
+
+    skip_modules = ["virtualenv.discovery.windows"]