py-edfio: add v0.4.3 and py-poetry-dynamic-versioning: add v1.4.0, fix url (#45369)

2 files changed, 34 insertions, 1 deletions

diff --git a/var/spack/repos/builtin/packages/py-edfio/package.py b/var/spack/repos/builtin/packages/py-edfio/package.py
new file mode 100644
index 0000000000..6fcf40459f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-edfio/package.py
@@ -0,0 +1,24 @@
+# Copyright 2013-2024 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 PyEdfio(PythonPackage):
+    """Read and write EDF/EDF+ files."""
+
+    homepage = "https://github.com/the-siesta-group/edfio"
+    pypi = "edfio/edfio-0.4.3.tar.gz"
+    git = "https://github.com/the-siesta-group/edfio"
+
+    license("Apache-2.0")
+
+    version("0.4.3", sha256="9250e67af190379bb3432356b23c441a99682e97159ea58d4507b0827175b487")
+
+    depends_on("python@3.9:3", type=("build", "run"))
+    depends_on("py-poetry-core@1:", type="build")
+    depends_on("py-poetry-dynamic-versioning@1", type="build")
+
+    depends_on("py-numpy@1.22.0:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py b/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py
index 1386413016..c2baa0b5cb 100644
--- a/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py
+++ b/var/spack/repos/builtin/packages/py-poetry-dynamic-versioning/package.py
@@ -10,10 +10,11 @@ class PyPoetryDynamicVersioning(PythonPackage):
     """Plugin for Poetry to enable dynamic versioning based on VCS tags."""
 
     homepage = "https://github.com/mtkennerly/poetry-dynamic-versioning"
-    pypi = "poetry-dynamic-versioning/poetry-dynamic-versioning-0.19.0.tar.gz"
+    pypi = "poetry_dynamic_versioning/poetry_dynamic_versioning-1.4.0.tar.gz"
 
     license("MIT")
 
+    version("1.4.0", sha256="725178bd50a22f2dd4035de7f965151e14ecf8f7f19996b9e536f4c5559669a7")
     version("0.19.0", sha256="a11a7eba6e7be167c55a1dddec78f52b61a1832275c95519ad119c7a89a7f821")
 
     depends_on("python@3.7:3", type=("build", "run"))
@@ -22,3 +23,11 @@ class PyPoetryDynamicVersioning(PythonPackage):
     depends_on("py-dunamai@1.12:1", type=("build", "run"))
     depends_on("py-tomlkit@0.4:", type=("build", "run"))
     depends_on("py-jinja2@2.11.1:3", type=("build", "run"))
+
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/p/{0}/{0}-{1}.tar.gz"
+        if version >= Version("1"):
+            letter = "poetry_dynamic_versioning"
+        else:
+            letter = "poetry-dynamic-versioning"
+        return url.format(letter, version)