From ce4162e28b8d1b31534d6a4db03358e8bbcaf308 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Wed, 19 Jul 2023 00:10:14 +0200 Subject: [PATCH] py-poetry-core: add 1.6.1 and fix url (#38452) * py-poetry-core: add 1.6.1 and fix url * Update var/spack/repos/builtin/packages/py-poetry-core/package.py Co-authored-by: Adam J. Stewart * Re-add python upper bound for older versions * Update var/spack/repos/builtin/packages/py-poetry-core/package.py Co-authored-by: Adam J. Stewart --------- Co-authored-by: Adam J. Stewart --- .../builtin/packages/py-poetry-core/package.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 c7b46373ff..b49a291be9 100644 --- a/var/spack/repos/builtin/packages/py-poetry-core/package.py +++ b/var/spack/repos/builtin/packages/py-poetry-core/package.py @@ -10,17 +10,26 @@ class PyPoetryCore(PythonPackage): """Poetry PEP 517 Build Backend.""" homepage = "https://github.com/python-poetry/poetry-core" - pypi = "poetry-core/poetry-core-1.0.7.tar.gz" + pypi = "poetry-core/poetry_core-1.6.1.tar.gz" + 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@2.7,3.5:3", 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@:3.7", 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:1", when="@:1.0 ^python@:3.7", type=("build", "run")) + + def url_for_version(self, version): + url = "https://files.pythonhosted.org/packages/source/p/poetry-core/{0}-{1}.tar.gz" + if version >= Version("1.4"): + letter = "poetry_core" + else: + letter = "poetry-core" + return url.format(letter, version) # https://github.com/python-poetry/poetry/issues/5547 def setup_build_environment(self, env):