py-poetry: Add version 1.6.1 (#41291)

* py-poetry: Add version 1.6.1

* py-poetry-core: Add version 1.7.0

* py-dulwich: Add version 0.21.6

* py-installer: Add version 0.7.0

* py-keyring: Add version 24.3.0

* py-poetry-plugin-export: Add version 1.6.0

* py-cachecontrol: Add version 0.13.0

* py-xattr: Add version 0.10.1, py-poetry dependence on darwin platform

* py-cachecontrol: fix typo

* py-cachecontrol: add version 0.13.1

* py-dulwich: remove version constraint on python, sort dependences, add py-typing-extensions dependence

* py-poetry-core: add version constraint on python

* py-poetry-plugin-export: fix python dependence, sort dependences

* py-poetry: sort dependences, fix dependences with respect to reviewing

* py-cachecontrol: fix typo

* py-poetry-plugin-export: comment py-poetry dependence; py-poetry: fix py-build dependence

---------

Co-authored-by: LydDeb <lyderic.debusschere@eolen.com>

8 files changed, 90 insertions, 35 deletions

diff --git a/var/spack/repos/builtin/packages/py-cachecontrol/package.py b/var/spack/repos/builtin/packages/py-cachecontrol/package.py
index 04a510f192..e43ead2cdd 100644
--- a/var/spack/repos/builtin/packages/py-cachecontrol/package.py
+++ b/var/spack/repos/builtin/packages/py-cachecontrol/package.py
@@ -13,13 +13,27 @@ class PyCachecontrol(PythonPackage):
     homepage = "https://github.com/ionrock/cachecontrol"
     pypi = "CacheControl/CacheControl-0.12.10.tar.gz"
 
+    version("0.13.1", sha256="f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b")
+    version("0.13.0", sha256="fd3fd2cb0ca66b9a6c1d56cc9709e7e49c63dbd19b1b1bcbd8d3f94cedfe8ce5")
     version("0.12.11", sha256="a5b9fcc986b184db101aa280b42ecdcdfc524892596f606858e0b7a8b4d9e144")
     version("0.12.10", sha256="d8aca75b82eec92d84b5d6eb8c8f66ea16f09d2adb09dbca27fe2d5fc8d3732d")
 
     variant("filecache", default=False, description="Add lockfile dependency")
+    variant("redis", default=False, description="Add redis dependency")
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    depends_on("py-flit-core@3.2:3", when="@0.13.1", type="build")
+    depends_on("py-setuptools", when="@:0.13.0", type="build")
+    depends_on("py-requests@2.16.0:", when="@0.13", type=("build", "run"))
     depends_on("py-requests", type=("build", "run"))
     depends_on("py-msgpack@0.5.2:", type=("build", "run"))
-    depends_on("py-lockfile@0.9:", when="+filecache", type="run")
+    depends_on("py-filelock@3.8.0:", when="@0.13+filecache", type=("build", "run"))
+    depends_on("py-lockfile@0.9:", when="@0.12+filecache", type=("build", "run"))
+    depends_on("py-redis@2.10.5:", when="+redis", type=("build", "run"))
+
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/c/cachecontrol/{0}-{1}.tar.gz"
+        if version <= Version("0.13.0"):
+            letter = "CacheControl"
+        else:
+            letter = "cachecontrol"
+        return url.format(letter, version)
diff --git a/var/spack/repos/builtin/packages/py-dulwich/package.py b/var/spack/repos/builtin/packages/py-dulwich/package.py
index 73f32c5875..3134cfef6b 100644
--- a/var/spack/repos/builtin/packages/py-dulwich/package.py
+++ b/var/spack/repos/builtin/packages/py-dulwich/package.py
@@ -15,15 +15,16 @@ class PyDulwich(PythonPackage):
     homepage = "https://www.dulwich.io"
     pypi = "dulwich/dulwich-0.20.15.tar.gz"
 
+    version("0.21.6", sha256="30fbe87e8b51f3813c131e2841c86d007434d160bd16db586b40d47f31dd05b0")
     version("0.20.46", sha256="4f0e88ffff5db1523d93d92f1525fe5fa161318ffbaad502c1b9b3be7a067172")
     version("0.20.44", sha256="10e8d73763dd30c86a99a15ade8bfcf3ab8fe96532cdf497e8cb1d11832352b8")
     version("0.20.21", sha256="ac764c9a9b80fa61afe3404d5270c5060aa57f7f087b11a95395d3b76f3b71fd")
     version("0.20.15", sha256="fb1773373ec2af896031f8312af6962a1b8b0176a2de3fb3d84a84ec04498888")
     version("0.20.14", sha256="21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d")
 
-    depends_on("python@3.5.0:", type=("build", "run"))
-    depends_on("python@3.6.0:", when="@0.20.44:", type=("build", "run"))
+    depends_on("py-setuptools@61.2:", when="@0.21.6", type="build")
     depends_on("py-setuptools", type="build")
     depends_on("py-certifi", when="@:0.20.44", type=("build", "run"))
-    depends_on("py-urllib3@1.24.1:", type=("build", "run"))
     depends_on("py-urllib3@1.25:", when="@0.20.46:", type=("build", "run"))
+    depends_on("py-urllib3@1.24.1:", type=("build", "run"))
+    depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-installer/package.py b/var/spack/repos/builtin/packages/py-installer/package.py
index 1bedecf074..6cdcd30cb7 100644
--- a/var/spack/repos/builtin/packages/py-installer/package.py
+++ b/var/spack/repos/builtin/packages/py-installer/package.py
@@ -18,6 +18,11 @@ class PyInstaller(Package, PythonExtension):
     list_url = "https://pypi.org/simple/installer/"
 
     version(
+        "0.7.0",
+        sha256="05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53",
+        expand=False,
+    )
+    version(
         "0.6.0",
         sha256="ae7c62d1d6158b5c096419102ad0d01fdccebf857e784cee57f94165635fe038",
         expand=False,
diff --git a/var/spack/repos/builtin/packages/py-keyring/package.py b/var/spack/repos/builtin/packages/py-keyring/package.py
index c2e0337ffe..f9f014035d 100644
--- a/var/spack/repos/builtin/packages/py-keyring/package.py
+++ b/var/spack/repos/builtin/packages/py-keyring/package.py
@@ -14,6 +14,7 @@ class PyKeyring(PythonPackage):
     homepage = "https://github.com/jaraco/keyring"
     pypi = "keyring/keyring-23.0.1.tar.gz"
 
+    version("24.3.0", sha256="e730ecffd309658a08ee82535a3b5ec4b4c8669a9be11efb66249d8e0aeb9a25")
     version("23.13.1", sha256="ba2e15a9b35e21908d0aaf4e0a47acc52d6ae33444df0da2b49d41a46ef6d678")
     version("23.9.1", sha256="39e4f6572238d2615a82fcaa485e608b84b503cf080dc924c43bbbacb11c1c18")
     version("23.5.0", sha256="9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9")
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 b49a291be9..e8196ce0a4 100644
--- a/var/spack/repos/builtin/packages/py-poetry-core/package.py
+++ b/var/spack/repos/builtin/packages/py-poetry-core/package.py
@@ -12,15 +12,17 @@ class PyPoetryCore(PythonPackage):
     homepage = "https://github.com/python-poetry/poetry-core"
     pypi = "poetry-core/poetry_core-1.6.1.tar.gz"
 
+    version("1.7.0", sha256="8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74")
     version("1.6.1", sha256="0f9b0de39665f36d6594657e7d57b6f463cc10f30c28e6d1c3b9ff54c26c9ac3")
     version("1.2.0", sha256="ceccec95487e46c63a41761fbac5211b809bca22658e25a049f4c7da96269f71")
     version("1.1.0", sha256="d145ae121cf79118a8901b60f2c951c4edcc16f55eb8aaefc156aa33aa921f07")
     version("1.0.8", sha256="951fc7c1f8d710a94cb49019ee3742125039fc659675912ea614ac2aa405b118")
     version("1.0.7", sha256="98c11c755a16ef6c5673c22ca94a3802a7df4746a0853a70b6fae8b9f5cac206")
 
+    depends_on("python@3.8:3", when="@1.7.0:", type=("build", "run"))
     depends_on("python@3.7:3", when="@1.1.0:", type=("build", "run"))
     depends_on("python@:3", type=("build", "run"))
-    depends_on("py-importlib-metadata@1.7:", when="@1.1: ^python@:3.7", type=("build", "run"))
+    depends_on("py-importlib-metadata@1.7:", when="@1.1:1.6 ^python@:3.7", type=("build", "run"))
     depends_on("py-importlib-metadata@1.7:1", when="@:1.0 ^python@:3.7", type=("build", "run"))
 
     def url_for_version(self, version):
diff --git a/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py b/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py
index 1f4f74e476..c322cf7b44 100644
--- a/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py
+++ b/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py
@@ -10,11 +10,24 @@ class PyPoetryPluginExport(PythonPackage):
     """Poetry plugin to export the dependencies to various formats"""
 
     homepage = "https://python-poetry.org/"
-    pypi = "poetry-plugin-export/poetry-plugin-export-1.0.7.tar.gz"
+    pypi = "poetry-plugin-export/poetry_plugin_export-1.6.0.tar.gz"
 
+    version("1.6.0", sha256="091939434984267a91abf2f916a26b00cff4eee8da63ec2a24ba4b17cf969a59")
     version("1.0.7", sha256="f6ac707ae227b06b2481249ed2678ff6b810b3487cac0fbb66eb0dc2bfd6ecf1")
 
+    depends_on("python@3.8:3", when="@1.6:", type=("build", "run"))
     depends_on("python@3.7:3", type=("build", "run"))
-    depends_on("py-poetry-core@1.1:1", type=("build", "run"))
-
+    depends_on("py-poetry-core@1.7:1", when="@1.6", type=("build", "run"))
+    depends_on("py-poetry-core@1.1:1", when="@1.0", type=("build", "run"))
+    # depends_on("py-poetry@1.6:1", when="@1.6", type=("build", "run")) # circular dependency
     # depends_on("py-poetry@1.2:1", type="run") # circular dependency
+
+    def url_for_version(self, version):
+        url = (
+            "https://files.pythonhosted.org/packages/source/p/poetry-plugin-export/{0}-{1}.tar.gz"
+        )
+        if version >= Version("1.6"):
+            letter = "poetry_plugin_export"
+        else:
+            letter = "poetry-plugin-export"
+        return url.format(letter, version)
diff --git a/var/spack/repos/builtin/packages/py-poetry/package.py b/var/spack/repos/builtin/packages/py-poetry/package.py
index f8064f17c3..97d9d3786f 100644
--- a/var/spack/repos/builtin/packages/py-poetry/package.py
+++ b/var/spack/repos/builtin/packages/py-poetry/package.py
@@ -12,52 +12,70 @@ class PyPoetry(PythonPackage):
     homepage = "https://python-poetry.org/"
     pypi = "poetry/poetry-1.1.12.tar.gz"
 
+    version("1.6.1", sha256="0ab9b1a592731cc8b252b8d6aaeea19c72cc0a109d7468b829ad57e6c48039d2")
     version("1.2.1", sha256="2750bb2b636ef435d8beac51dde0b13d06199017a1d9b96cba899863d1e81024")
     version("1.2.0", sha256="17c527d5d5505a5a7c5c14348d87f077d643cf1f186321530cde68e530bba59f")
     version("1.1.13", sha256="b905ed610085f568aa61574e0e09260c02bff9eae12ff672af39e9f399357ac4")
     version("1.1.12", sha256="5c66e2357fe37b552462a88b7d31bfa2ed8e84172208becd666933c776252567")
 
-    depends_on("python@2.7,3.5:3", type=("build", "run"))
+    depends_on("python@3.8:3", when="@1.6.0:", type=("build", "run"))
     depends_on("python@3.7:3", when="@1.2.0:", type=("build", "run"))
-    depends_on("py-poetry-core@1.0.7:1.0", when="@:1.1", type=("build", "run"))
+    depends_on("python@2.7,3.5:3", type=("build", "run"))
+    depends_on("py-poetry-core@1.7.0", when="@1.6.1", type=("build", "run"))
+    depends_on("py-poetry-core@1.2.0", when="@1.2.1", type=("build", "run"))
     depends_on("py-poetry-core@1.1.0", when="@1.2.0", type=("build", "run"))
-    depends_on("py-poetry-core@1.2.0", when="@1.2.1:", type=("build", "run"))
-    depends_on("py-poetry-plugin-export@1.0.6:1", when="@1.2.0:", type=("build", "run"))
+    depends_on("py-poetry-core@1.0.7:1.0", when="@:1.1", type=("build", "run"))
+    depends_on("py-poetry-plugin-export@1.5.0:1", when="@1.6.1", type=("build", "run"))
     depends_on("py-poetry-plugin-export@1.0.7:1", when="@1.2.1:", type=("build", "run"))
+    depends_on("py-poetry-plugin-export@1.0.6:1", when="@1.2.0:", type=("build", "run"))
     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.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")
+        "py-backports-cached-property@1.0.2:1", when="@1.2.1:^python@:3.7", type=("build", "run")
     )
-    depends_on("py-cachy@0.3.0:0.3", type=("build", "run"))
+    depends_on("py-cachecontrol@0.13+filecache", when="@1.6.1", type=("build", "run"))
+    depends_on("py-cachecontrol@0.12.9:0.12+filecache", when="@1.2.1:1.2", type=("build", "run"))
+    depends_on("py-cachy@0.3.0:0.3", when="@:1.2", type=("build", "run"))
+    depends_on("py-cleo@2", when="@1.6.1", type=("build", "run"))
+    depends_on("py-cleo@1", when="@1.2", type=("build", "run"))
     depends_on("py-cleo@0.8.1:0.8", when="@:1.1", type=("build", "run"))
-    depends_on("py-cleo@1", type=("build", "run"), when="@1.2.0:")
     depends_on("py-clikit@0.6.2:0.6", when="@:1.1", type=("build", "run"))
-    depends_on("py-crashtest@0.3.0:0.3", when="^python@3.6:3", type=("build", "run"))
-    depends_on("py-html5lib@1.0:1", type=("build", "run"))
+    depends_on("py-crashtest@0.4.1:0.4", when="@1.6.1", type=("build", "run"))
+    depends_on("py-crashtest@0.3", when="@:1.2", type=("build", "run"))
+    depends_on("py-html5lib@1.0:1", when="@:1.2", type=("build", "run"))
+    depends_on("py-importlib-metadata@4.4:", when="@1.2: ^python@:3.9", type=("build", "run"))
     depends_on("py-importlib-metadata@1.6:1", when="@:1.1 ^python@:3.7", type=("build", "run"))
-    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.17", when="@1.6.1", type=("build", "run"))
     depends_on("py-jsonschema@4.10.0:4", when="@1.2:", 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@24", when="@1.6.1", 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"))
+    depends_on("py-keyring@21.2.0:21", when="@1.1.12 ^python@3.6:3", type=("build", "run"))
     depends_on("py-packaging@20.4:", when="@1.2:", type=("build", "run"))
+    depends_on("py-packaging@20.4:20", when="@:1.1", type=("build", "run"))
     depends_on("py-pexpect@4.7:4", type=("build", "run"))
-    depends_on("py-pkginfo@1.4:1", when="@:1.1", type=("build", "run"))
+    depends_on("py-pkginfo@1.9.4:1", when="@1.6.1", type=("build", "run"))
     depends_on("py-pkginfo@1.5:1", when="@1.2:", type=("build", "run"))
-    depends_on("py-platformdirs@2.5.2:2", when="@1.2:", type=("build", "run"))
+    depends_on("py-pkginfo@1.4:1", when="@:1.1", type=("build", "run"))
+    depends_on("py-platformdirs@3", when="@1.6.1", type=("build", "run"))
+    depends_on("py-platformdirs@2.5.2:2", when="@1.2", type=("build", "run"))
+    depends_on("py-requests@2.26:2", when="@1.6.1", type=("build", "run"))
     depends_on("py-requests@2.18:2", type=("build", "run"))
-    depends_on("py-requests-toolbelt@0.9.1:0.9", type=("build", "run"))
-    depends_on("py-shellingham@1.1:1", when="@:1.1", type=("build", "run"))
+    depends_on("py-requests-toolbelt@0.9.1:1", when="@1.6.1", type=("build", "run"))
+    depends_on("py-requests-toolbelt@0.9.1:0.9", when="@:1.2", type=("build", "run"))
     depends_on("py-shellingham@1.5:1", when="@1.2:", type=("build", "run"))
+    depends_on("py-shellingham@1.1:1", when="@:1.1", type=("build", "run"))
+    depends_on("py-tomlkit@0.11.4:0", when="@1.6.1", type=("build", "run"))
+    depends_on("py-tomlkit@0.11.1,0.11.4:0", when="@1.2", type=("build", "run"))
     depends_on("py-tomlkit@0.7:0", when="@:1.1", type=("build", "run"))
-    depends_on("py-tomlkit@0.11.1,0.11.4:0", when="@1.2:", type=("build", "run"))
+    depends_on("py-virtualenv@20.22.0:20", when="@1.6.1", type=("build", "run"))
+    depends_on("py-virtualenv@20.4.3:20.4.4,20.4.7:", when="@1.2", type=("build", "run"))
     depends_on("py-virtualenv@20.0.26:20", when="@:1.1", type=("build", "run"))
-    depends_on("py-virtualenv@20.4.3:20.4.4,20.4.7:", when="@1.2:", type=("build", "run"))
+    depends_on("py-xattr@0.10", when="platform=darwin @1.6.1", type=("build", "run"))
     depends_on("py-xattr@0.9.7:0.9", when="platform=darwin @1.2:")
-    depends_on("py-urllib3@1.26.0:1", when="@1.2:")
+    depends_on("py-urllib3@1.26.0:1", when="@1.2")
+    depends_on("py-dulwich@0.21.2:0.21", when="@1.6.1", type=("build", "run"))
+    depends_on("py-dulwich@0.20.46:0.20", when="@1.2.1")
     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-build@0.10", when="@1.6.1", type=("build", "run"))
+    depends_on("py-installer@0.7.0:0.7", when="@1.6.1", type=("build", "run"))
+    depends_on("py-pyproject-hooks@1", when="@1.6.1", type=("build", "run"))
+    depends_on("py-tomli@2.0.1:2", when="@1.6.1^python@:3.10", type=("build", "run"))
+    depends_on("py-trove-classifiers@2022.5.19:", when="@1.6.1", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py
index e0759f6cb4..efb6e084ab 100644
--- a/var/spack/repos/builtin/packages/py-xattr/package.py
+++ b/var/spack/repos/builtin/packages/py-xattr/package.py
@@ -17,6 +17,7 @@ class PyXattr(PythonPackage):
     git = "https://github.com/xattr/xattr"
 
     version("master", branch="master")
+    version("0.10.1", sha256="c12e7d81ffaa0605b3ac8c22c2994a8e18a9cf1c59287a1b7722a2289c952ec5")
     version("0.9.9", sha256="09cb7e1efb3aa1b4991d6be4eb25b73dc518b4fe894f0915f5b0dcede972f346")
     version("0.9.8", sha256="bf11c8c857215e3ef60b031e7807264f30af4348d7565a7e9b8dca70593753c7")
     version("0.9.7", sha256="b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44")