From f5d710bc2347b5655cac76eb8a8b9e27899e1263 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn Date: Fri, 21 Jul 2023 13:04:39 +0200 Subject: [PATCH 1/4] py-isort: add 5.12.0 and fix build of 5.10.1 --- var/spack/repos/builtin/packages/py-isort/package.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index 9f81cd8a8b4b5..396d4992cd588 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -12,6 +12,7 @@ class PyIsort(PythonPackage): homepage = "https://github.com/timothycrosley/isort" pypi = "isort/isort-4.2.15.tar.gz" + version("5.12.0", sha256="8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504") version("5.10.1", sha256="e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951") version("5.9.3", sha256="9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899") version("5.9.1", sha256="83510593e07e433b77bd5bff0f6f607dbafa06d1a89022616f02d8b699cfcd56") @@ -20,8 +21,10 @@ class PyIsort(PythonPackage): variant("colors", default=False, description="Install colorama for --color support") - depends_on("python@3.6.1:3", type=("build", "run"), when="@5:") - depends_on("python@2.7:2.8,3.4:", type=("build", "run"), when="@4.3:") - depends_on("python@2.6:2.8,3.3:", type=("build", "run")) + depends_on("python@3.8:", when="@5.12:", type=("build", "run")) + depends_on("python@3.6.1:3", when="@5:5.10", type=("build", "run")) depends_on("py-poetry-core@1:", type="build") - depends_on("py-colorama@0.4.3:0.4", type=("build", "run"), when="+colors") + depends_on("py-colorama@0.4.3:", when="+colors @5.12:", type=("build", "run")) + depends_on("py-colorama@0.4.3:0.4", when="+colors @:5.11", type=("build", "run")) + + conflicts("^py-poetry-core@1.6.1:", when="@:5.11.3") From 8447e1d256f7f5759d549711a5039a9eb2bc5cbd Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Fri, 21 Jul 2023 18:53:24 +0200 Subject: [PATCH 2/4] Update var/spack/repos/builtin/packages/py-isort/package.py Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/py-isort/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index 396d4992cd588..ce37f46079cc8 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -27,4 +27,4 @@ class PyIsort(PythonPackage): depends_on("py-colorama@0.4.3:", when="+colors @5.12:", type=("build", "run")) depends_on("py-colorama@0.4.3:0.4", when="+colors @:5.11", type=("build", "run")) - conflicts("^py-poetry-core@1.6.1:", when="@:5.11.3") + conflicts("^py-poetry-core@1.5:", when="@:5.11") From ac9391f4d1ad1e182221047e31bab43dcc84b227 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Fri, 21 Jul 2023 19:32:18 +0200 Subject: [PATCH 3/4] Update var/spack/repos/builtin/packages/py-isort/package.py Co-authored-by: Adam J. Stewart --- var/spack/repos/builtin/packages/py-isort/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index ce37f46079cc8..3ab2df455996a 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -27,4 +27,4 @@ class PyIsort(PythonPackage): depends_on("py-colorama@0.4.3:", when="+colors @5.12:", type=("build", "run")) depends_on("py-colorama@0.4.3:0.4", when="+colors @:5.11", type=("build", "run")) - conflicts("^py-poetry-core@1.5:", when="@:5.11") + conflicts("^py-poetry-core@1.5:", when="@:5.11.4") From 668c9876d4a72cf7405e0e45d5da91a158fcc28d Mon Sep 17 00:00:00 2001 From: Manuela Kuhn Date: Fri, 21 Jul 2023 19:34:13 +0200 Subject: [PATCH 4/4] Add comment about the py-poetry-core issue --- var/spack/repos/builtin/packages/py-isort/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/py-isort/package.py b/var/spack/repos/builtin/packages/py-isort/package.py index 3ab2df455996a..ce49a3e1bc4ec 100644 --- a/var/spack/repos/builtin/packages/py-isort/package.py +++ b/var/spack/repos/builtin/packages/py-isort/package.py @@ -27,4 +27,5 @@ class PyIsort(PythonPackage): depends_on("py-colorama@0.4.3:", when="+colors @5.12:", type=("build", "run")) depends_on("py-colorama@0.4.3:0.4", when="+colors @:5.11", type=("build", "run")) + # https://github.com/PyCQA/isort/issues/2077 conflicts("^py-poetry-core@1.5:", when="@:5.11.4")