diff --git a/var/spack/repos/builtin/packages/py-pint/package.py b/var/spack/repos/builtin/packages/py-pint/package.py
index 4379772184..85bb7a0f05 100644
--- a/var/spack/repos/builtin/packages/py-pint/package.py
+++ b/var/spack/repos/builtin/packages/py-pint/package.py
@@ -18,6 +18,8 @@ class PyPint(PythonPackage):
     # any import tests for this package.
     import_modules = []  # type: List[str]
 
+    version("0.20.1", sha256="387cf04078dc7dfe4a708033baad54ab61d82ab06c4ee3d4922b1e45d5626067")
+    version("0.18", sha256="8c4bce884c269051feb7abc69dbfd18403c0c764abc83da132e8a7222f8ba801")
     version("0.17", sha256="f4d0caa713239e6847a7c6eefe2427358566451fe56497d533f21fb590a3f313")
     version("0.11", sha256="308f1070500e102f83b6adfca6db53debfce2ffc5d3cbe3f6c367da359b5cf4d")
     version("0.10.1", sha256="d739c364b8326fe3d70773d5720fa8b005ea6158695cad042677a588480c86e6")
@@ -25,8 +27,11 @@ class PyPint(PythonPackage):
     version("0.9", sha256="32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2")
     version("0.8.1", sha256="afcf31443a478c32bbac4b00337ee9026a13d0e2ac83d30c79151462513bb0d4")
 
-    depends_on("python@3.6:", type=("build", "run"), when="@0.10:")
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-setuptools-scm", type=("build"))
-    depends_on("py-packaging", type=("build", "run"), when="@0.17:")
-    depends_on("py-importlib-metadata", type=("build", "run"), when="@0.17: ^python@:3.7")
+    depends_on("python@3.8:", type=("build", "run"), when="@0.19:")
+    depends_on("py-setuptools@41:", when="@0.16:", type="build")
+    depends_on("py-setuptools@41:", when="@0.11:0.15", type=("build", "run"))
+    depends_on("py-setuptools", when="@:0.10", type=("build", "run"))
+    depends_on("py-setuptools-scm@3.4.3:+toml", when="@0.11:", type="build")
+    depends_on("py-setuptools-scm", when="@0.10", type="build")
+    depends_on("py-packaging", type=("build", "run"), when="@0.13:18")
+    depends_on("py-importlib-metadata", type=("build", "run"), when="@0.13:18 ^python@:3.7")