Update py-poetry to 1.2.1 (including new packages) (#32776)

* Update py-poetry to 1.2.1

* Update py-xattr

* Apply style from review

* Apply suggestions from code review (part 1)

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Changes from review - 2

* Fix typo

* Fix style

* Add missing py-dulwich version

* Update var/spack/repos/builtin/packages/py-poetry-core/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Update var/spack/repos/builtin/packages/py-poetry/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Update var/spack/repos/builtin/packages/py-poetry/package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Apply changes from review

* Add py-backports-cached-property and fix style

* Apply suggestions from code review

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Update package.py

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

13 files changed, 164 insertions, 28 deletions

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
new file mode 100644
index 0000000000..e716cd5a2e
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-backports-cached-property/package.py
@@ -0,0 +1,21 @@
+# 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 PyBackportsCachedProperty(PythonPackage):
+    """cached_property() - computed once per instance, cached as attribute"""
+
+    homepage = "https://github.com/penguinolog/backports.cached_property"
+    pypi = "backports.cached-property/backports.cached-property-1.0.2.tar.gz"
+
+    version("1.0.2", sha256="9306f9eed6ec55fd156ace6bc1094e2c86fae5fb2bf07b6a9c00745c656e75dd")
+
+    depends_on("python@3.6:", type=("build", "run"))
+
+    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-cleo/package.py b/var/spack/repos/builtin/packages/py-cleo/package.py
index 6ce9aaa2b0..e47647f856 100644
--- a/var/spack/repos/builtin/packages/py-cleo/package.py
+++ b/var/spack/repos/builtin/packages/py-cleo/package.py
@@ -12,8 +12,17 @@ class PyCleo(PythonPackage):
     homepage = "https://github.com/sdispater/cleo"
     pypi = "cleo/cleo-0.8.1.tar.gz"
 
-    version("0.8.1", sha256="3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f")
+    version("1.0.0a5", sha256="097c9d0e0332fd53cc89fc11eb0a6ba0309e6a3933c08f7b38558555486925d3")
+    version(
+        "0.8.1",
+        sha256="3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f",
+        preferred=True,
+    )
 
     depends_on("python@2.7,3.4:3", type=("build", "run"))
+    depends_on("python@3.7:3", when="@1:", type=("build", "run"))
     depends_on("py-poetry-core@1:", type="build")
-    depends_on("py-clikit@0.6.0:0.6", type=("build", "run"))
+    depends_on("py-poetry-core@1", when="@1:", type="build")
+    depends_on("py-clikit@0.6.0:0.6", when="@0.8.1", type=("build", "run"))
+    depends_on("py-pylev@1.3:1", when="@1:", type=("build", "run"))
+    depends_on("py-crashtest@0.3.1:0.3", when="@1:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-dulwich/package.py b/var/spack/repos/builtin/packages/py-dulwich/package.py
index d1af3b63e8..9ac019c64c 100644
--- a/var/spack/repos/builtin/packages/py-dulwich/package.py
+++ b/var/spack/repos/builtin/packages/py-dulwich/package.py
@@ -15,11 +15,15 @@ class PyDulwich(PythonPackage):
     homepage = "https://www.dulwich.io"
     pypi = "dulwich/dulwich-0.20.15.tar.gz"
 
+    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", type="build")
-    depends_on("py-certifi", type=("build", "run"))
+    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"))
diff --git a/var/spack/repos/builtin/packages/py-hatch-vcs/package.py b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py
new file mode 100644
index 0000000000..2252c3d5d0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-hatch-vcs/package.py
@@ -0,0 +1,19 @@
+# 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 PyHatchVcs(PythonPackage):
+    """Hatch plugin for versioning with your preferred VCS"""
+
+    homepage = "https://github.com/ofek/hatch-vcs"
+    pypi = "hatch_vcs/hatch_vcs-0.2.0.tar.gz"
+
+    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"))
diff --git a/var/spack/repos/builtin/packages/py-jsonschema/package.py b/var/spack/repos/builtin/packages/py-jsonschema/package.py
index 5bea410e6d..26b887a256 100644
--- a/var/spack/repos/builtin/packages/py-jsonschema/package.py
+++ b/var/spack/repos/builtin/packages/py-jsonschema/package.py
@@ -12,6 +12,7 @@ class PyJsonschema(PythonPackage):
     homepage = "https://github.com/Julian/jsonschema"
     pypi = "jsonschema/jsonschema-3.2.0.tar.gz"
 
+    version("4.10.0", sha256="8ff7b44c6a99c6bfd55ca9ac45261c649cefd40aaba1124c29aaef1bcb378d84")
     version("4.4.0", sha256="636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83")
     version("3.2.0", sha256="c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a")
     version("3.1.1", sha256="2fa0684276b6333ff3c0b1b27081f4b2305f0a36cf702a23db50edb141893c3f")
@@ -24,11 +25,13 @@ class PyJsonschema(PythonPackage):
     depends_on("python@2.7:2.8,3.5:", when="@3:", type=("build", "run"))
     depends_on("python@2.6:2.8,3.4:", type=("build", "run"))
 
-    depends_on("py-setuptools@40.6.0:", when="@4:", type="build")
+    depends_on("py-hatchling", when="@4.10:", type="build")
+    depends_on("py-hatch-vcs", when="@4.10:", type="build")
+    depends_on("py-setuptools@40.6.0:", when="@4:4.4", type="build")
     depends_on("py-setuptools", when="@3", type=("build", "run"))
     depends_on("py-setuptools", when="@:2", type="build")
     depends_on("py-vcversioner", when="@:2", type="build")
-    depends_on("py-setuptools-scm+toml@3.4:", when="@4:", type="build")
+    depends_on("py-setuptools-scm+toml@3.4:", when="@4.4.0", type="build")
     depends_on("py-setuptools-scm", when="@3", type="build")
 
     depends_on("py-attrs@17.4:", when="@3:", type=("build", "run"))
@@ -38,6 +41,7 @@ class PyJsonschema(PythonPackage):
     depends_on("py-pyrsistent@0.14:0.16,0.17.3:", when="@4:", type=("build", "run"))
     depends_on("py-pyrsistent@0.14:", when="@3", type=("build", "run"))
     depends_on("py-typing-extensions", when="@4.3: ^python@:3.7", type=("build", "run"))
+    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-pkgutil-resolve-name/package.py b/var/spack/repos/builtin/packages/py-pkgutil-resolve-name/package.py
new file mode 100644
index 0000000000..274e98828c
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-pkgutil-resolve-name/package.py
@@ -0,0 +1,19 @@
+# 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 PyPkgutilResolveName(PythonPackage):
+    """Resolve a name to an object. A backport of Python 3.9’s `pkgutil.resolve_name`"""
+
+    homepage = "https://github.com/graingert/pkgutil-resolve-name"
+    pypi = "pkgutil_resolve_name/pkgutil_resolve_name-1.3.10.tar.gz"
+
+    version("1.3.10", sha256="357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174")
+
+    depends_on("python@3.6:", type=("build", "run"))
+
+    depends_on("py-flit-core@2", 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 8531128ab7..d962b22c7a 100644
--- a/var/spack/repos/builtin/packages/py-platformdirs/package.py
+++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py
@@ -13,14 +13,17 @@ class PyPlatformdirs(PythonPackage):
     homepage = "https://github.com/platformdirs/platformdirs"
     pypi = "platformdirs/platformdirs-2.4.0.tar.gz"
 
+    version("2.5.2", sha256="58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19")
     version("2.4.1", sha256="440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda")
     version("2.4.0", sha256="367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2")
     version("2.3.0", sha256="15b056538719b1c94bdaccb29e5f81879c7f7f0f4a153f46086d155dffcd4f0f")
 
     depends_on("python@3.7:", when="@2.4.1:", type=("build", "run"))
     depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-setuptools@44:", type="build")
-    depends_on("py-setuptools-scm@5:+toml", type="build")
+    depends_on("py-setuptools@44:", when="@:2.5.1", type="build")
+    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):
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 efffca087b..864427a005 100644
--- a/var/spack/repos/builtin/packages/py-poetry-core/package.py
+++ b/var/spack/repos/builtin/packages/py-poetry-core/package.py
@@ -12,11 +12,17 @@ class PyPoetryCore(PythonPackage):
     homepage = "https://github.com/python-poetry/poetry-core"
     pypi = "poetry-core/poetry-core-1.0.7.tar.gz"
 
+    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@2.7,3.5:3", type=("build", "run"))
-    depends_on("py-importlib-metadata@1.7:1", when="^python@2.7,3.5:3.7", 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:", 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"))
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
new file mode 100644
index 0000000000..ba202f5bda
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-poetry-plugin-export/package.py
@@ -0,0 +1,19 @@
+# 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 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"
+
+    version("1.0.7", sha256="f6ac707ae227b06b2481249ed2678ff6b810b3487cac0fbb66eb0dc2bfd6ecf1")
+
+    depends_on("python@3.7:3", type=("build", "run"))
+    depends_on("py-poetry@1.2:1", type=("build", "run"))
+    depends_on("py-poetry-core@1.1:1", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-poetry/package.py b/var/spack/repos/builtin/packages/py-poetry/package.py
index 3fd302db90..30b74ffcc1 100644
--- a/var/spack/repos/builtin/packages/py-poetry/package.py
+++ b/var/spack/repos/builtin/packages/py-poetry/package.py
@@ -12,36 +12,61 @@ class PyPoetry(PythonPackage):
     homepage = "https://python-poetry.org/"
     pypi = "poetry/poetry-1.1.12.tar.gz"
 
+    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("py-poetry-core@1.0.7:1.0", type=("build", "run"))
-    depends_on("py-cleo@0.8.1:0.8", type=("build", "run"))
-    depends_on("py-clikit@0.6.2:0.6", type=("build", "run"))
-    depends_on("py-crashtest@0.3.0:0.3", when="^python@3.6:3", type=("build", "run"))
-    depends_on("py-requests@2.18:2", type=("build", "run"))
-    depends_on("py-cachy@0.3.0:0.3", type=("build", "run"))
-    depends_on("py-requests-toolbelt@0.9.1:0.9", 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("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-plugin-export@1.0.7:1", when="@1.2.1:", 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.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")
     )
-    depends_on("py-pkginfo@1.4:1", type=("build", "run"))
+    depends_on("py-cachy@0.3.0:0.3", 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-shellingham@1.1:1", type=("build", "run"))
-    depends_on("py-tomlkit@0.7:0", 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", 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"))
+    depends_on("py-packaging@20.4:", when="@1.2:", type=("build", "run"))
     depends_on("py-pexpect@4.7:4", type=("build", "run"))
-    depends_on("py-packaging@20.4:20", type=("build", "run"))
-    depends_on("py-virtualenv@20.0.26:20", type=("build", "run"))
+    depends_on("py-pkginfo@1.4:1", when="@:1.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-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-shellingham@1.5:1", 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.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.9.7:0.9", when="platform=darwin @1.2:")
+    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-keyring@18.0.1:18", when="^python@2.7", type=("build", "run"))
-    depends_on("py-keyring@20.0.1:20", when="^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 ^python@3.6:3", type=("build", "run"))
     depends_on("py-subprocess32@3.5:3", when="^python@2.7", type=("build", "run"))
-    depends_on("py-importlib-metadata@1.6:1", when="^python@:3.7", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-shellingham/package.py b/var/spack/repos/builtin/packages/py-shellingham/package.py
index cf525aa89e..2fa8cc2784 100644
--- a/var/spack/repos/builtin/packages/py-shellingham/package.py
+++ b/var/spack/repos/builtin/packages/py-shellingham/package.py
@@ -12,7 +12,9 @@ class PyShellingham(PythonPackage):
     homepage = "https://github.com/sarugaku/shellingham"
     pypi = "shellingham/shellingham-1.4.0.tar.gz"
 
+    version("1.5.0", sha256="72fb7f5c63103ca2cb91b23dee0c71fe8ad6fbfd46418ef17dbe40db51592dad")
     version("1.4.0", sha256="4855c2458d6904829bd34c299f11fdeed7cfefbf8a2c522e4caea6cd76b3171e")
 
     depends_on("python@2.6:2.7,3.4:", type=("build", "run"))
+    depends_on("python@3.4:", when="@1.5.0:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-tomlkit/package.py b/var/spack/repos/builtin/packages/py-tomlkit/package.py
index ef8d3c2e90..d07fd91339 100644
--- a/var/spack/repos/builtin/packages/py-tomlkit/package.py
+++ b/var/spack/repos/builtin/packages/py-tomlkit/package.py
@@ -12,12 +12,13 @@ class PyTomlkit(PythonPackage):
     homepage = "https://github.com/sdispater/tomlkit"
     pypi = "tomlkit/tomlkit-0.7.0.tar.gz"
 
+    version("0.11.4", sha256="3235a9010fae54323e727c3ac06fb720752fe6635b3426e379daec60fbd44a83")
     version("0.11.0", sha256="71ceb10c0eefd8b8f11fe34e8a51ad07812cb1dc3de23247425fbc9ddc47b9dd")
     version("0.7.2", sha256="d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754")
     version("0.7.0", sha256="ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618")
 
     depends_on("python@2.7,3.5:", type=("build", "run"))
-    depends_on("python@3.6:", type=("build", "run"), when="@0.11.0:")
+    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"))
diff --git a/var/spack/repos/builtin/packages/py-xattr/package.py b/var/spack/repos/builtin/packages/py-xattr/package.py
index e7d9658ceb..dae761f778 100644
--- a/var/spack/repos/builtin/packages/py-xattr/package.py
+++ b/var/spack/repos/builtin/packages/py-xattr/package.py
@@ -14,10 +14,14 @@ class PyXattr(PythonPackage):
 
     homepage = "https://pyxattr.k1024.org/"
     pypi = "xattr/xattr-0.9.6.tar.gz"
-    git = "https://github.com/iustin/pyxattr.git"
+    git = "https://github.com/xattr/xattr"
 
     version("master", branch="master")
+    version("0.9.9", sha256="09cb7e1efb3aa1b4991d6be4eb25b73dc518b4fe894f0915f5b0dcede972f346")
+    version("0.9.8", sha256="bf11c8c857215e3ef60b031e7807264f30af4348d7565a7e9b8dca70593753c7")
+    version("0.9.7", sha256="b0bbca828e04ef2d484a6522ae7b3a7ccad5e43fa1c6f54d78e24bb870f49d44")
     version("0.9.6", sha256="7cb1b28eeab4fe99cc4350e831434142fce658f7d03f173ff7722144e6a47458")
 
-    depends_on("python@2.7:")
+    depends_on("python@2.7:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
+    depends_on("py-cffi@1.0.0:", type=("build", "run"))