diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py index 02f629f815..5b6c0321bc 100644 --- a/var/spack/repos/builtin/packages/py-black/package.py +++ b/var/spack/repos/builtin/packages/py-black/package.py @@ -17,6 +17,7 @@ class PyBlack(PythonPackage): maintainers("adamjstewart") + version("23.1.0", sha256="b0bd97bea8903f5a2ba7219257a44e3f1f9d00073d6cc1add68f0beec69692ac") version("22.12.0", sha256="229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f") version("22.10.0", sha256="f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1") version("22.8.0", sha256="792f7eb540ba9a17e8656538701d3eb1afcb134e3b45b71f20b25c77a8db7e6e") @@ -45,6 +46,7 @@ class PyBlack(PythonPackage): depends_on("python@3.7:", when="@22.10:", type=("build", "run")) depends_on("py-click@8:", type=("build", "run")) depends_on("py-mypy-extensions@0.4.3:", type=("build", "run")) + depends_on("py-packaging@22:", when="@23.1:", type=("build", "run")) depends_on("py-pathspec@0.9:", type=("build", "run")) depends_on("py-platformdirs@2:", type=("build", "run")) depends_on("py-tomli@1.1:", when="@22.8: ^python@:3.10", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-packaging/package.py b/var/spack/repos/builtin/packages/py-packaging/package.py index b0eba4f97e..5bfe28084b 100644 --- a/var/spack/repos/builtin/packages/py-packaging/package.py +++ b/var/spack/repos/builtin/packages/py-packaging/package.py @@ -12,6 +12,7 @@ class PyPackaging(PythonPackage): homepage = "https://github.com/pypa/packaging" pypi = "packaging/packaging-19.2.tar.gz" + version("23.0", sha256="b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97") version("21.3", sha256="dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb") version("21.0", sha256="7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7") version("20.9", sha256="5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5") @@ -21,13 +22,13 @@ class PyPackaging(PythonPackage): version("17.1", sha256="f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b") version("16.8", sha256="5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e") - depends_on("python@3.6:", when="@21:", type=("build", "run")) - depends_on("python@2.7:2,3.4:", type=("build", "run")) - depends_on("py-setuptools@40.8.0:", when="@20.8:", type="build") - depends_on("py-setuptools", type="build") + depends_on("py-flit-core@3.3:", when="@22:", type="build") - depends_on("py-pyparsing@2.0.2:3.0.4,3.0.6:", when="@21.3:", type=("build", "run")) + # Historical dependencies + depends_on("py-setuptools@40.8.0:", when="@20.8:21", type="build") + depends_on("py-setuptools", when="@:20.7", type="build") + depends_on("py-pyparsing@2.0.2:3.0.4,3.0.6:", when="@21.3:21", type=("build", "run")) depends_on("py-pyparsing@2.0.2:2", when="@21.1:21.2", type=("build", "run")) - depends_on("py-pyparsing@2.0.2:", type=("build", "run")) + depends_on("py-pyparsing@2.0.2:", when="@:21.0", type=("build", "run")) depends_on("py-six", when="@:20.7", type=("build", "run")) depends_on("py-attrs", when="@19.1", type=("build", "run"))