py-transformers: add v4.35.2 (#41266)

4 files changed, 30 insertions, 17 deletions

diff --git a/var/spack/repos/builtin/packages/py-fsspec/package.py b/var/spack/repos/builtin/packages/py-fsspec/package.py
index e9a2d3f411..6413d84132 100644
--- a/var/spack/repos/builtin/packages/py-fsspec/package.py
+++ b/var/spack/repos/builtin/packages/py-fsspec/package.py
@@ -12,6 +12,7 @@ class PyFsspec(PythonPackage):
     homepage = "https://github.com/intake/filesystem_spec"
     pypi = "fsspec/fsspec-0.4.4.tar.gz"
 
+    version("2023.10.0", sha256="330c66757591df346ad3091a53bd907e15348c2ba17d63fd54f5c39c4457d2a5")
     version("2023.1.0", sha256="fbae7f20ff801eb5f7d0bedf81f25c787c0dfac5e982d98fa3884a9cde2b5411")
     version("2022.11.0", sha256="259d5fd5c8e756ff2ea72f42e7613c32667dc2049a4ac3d84364a7ca034acb8b")
     version("2021.7.0", sha256="792ebd3b54de0b30f1ce73f0ba0a8bcc864724f2d9f248cb8d0ece47db0cbde8")
diff --git a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py
index 6865a0d40e..d63a2de77f 100644
--- a/var/spack/repos/builtin/packages/py-huggingface-hub/package.py
+++ b/var/spack/repos/builtin/packages/py-huggingface-hub/package.py
@@ -14,6 +14,7 @@ class PyHuggingfaceHub(PythonPackage):
     homepage = "https://github.com/huggingface/huggingface_hub"
     pypi = "huggingface_hub/huggingface_hub-0.0.10.tar.gz"
 
+    version("0.19.4", sha256="176a4fc355a851c17550e7619488f383189727eab209534d7cef2114dae77b22")
     version("0.14.1", sha256="9ab899af8e10922eac65e290d60ab956882ab0bf643e3d990b1394b6b47b7fbc")
     version("0.10.1", sha256="5c188d5b16bec4b78449f8681f9975ff9d321c16046cc29bcf0d7e464ff29276")
     version("0.0.10", sha256="556765e4c7edd2d2c4c733809bae1069dca20e10ff043870ec40d53e498efae2")
@@ -28,14 +29,14 @@ class PyHuggingfaceHub(PythonPackage):
 
     depends_on("py-setuptools", type="build")
     depends_on("py-filelock", type=("build", "run"))
+    depends_on("py-fsspec@2023.5:", when="@0.18:", type=("build", "run"))
     depends_on("py-fsspec", when="@0.14:", type=("build", "run"))
     depends_on("py-requests", type=("build", "run"))
-    depends_on("py-tqdm@4.42.1:", type=("build", "run"))
+    depends_on("py-tqdm@4.42.1:", when="@0.12:", type=("build", "run"))
     depends_on("py-tqdm", type=("build", "run"))
     depends_on("py-pyyaml@5.1:", when="@0.10:", type=("build", "run"))
     depends_on("py-typing-extensions@3.7.4.3:", when="@0.10:", type=("build", "run"))
     depends_on("py-typing-extensions", when="@0.0.10:", type=("build", "run"))
-    depends_on("py-importlib-metadata", when="^python@:3.7", type=("build", "run"))
     depends_on("py-packaging@20.9:", when="@0.10:", type=("build", "run"))
 
     depends_on("py-inquirerpy@0.3.4", when="@0.14:+cli", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-tokenizers/package.py b/var/spack/repos/builtin/packages/py-tokenizers/package.py
index 5555fcdb08..117239fe9a 100644
--- a/var/spack/repos/builtin/packages/py-tokenizers/package.py
+++ b/var/spack/repos/builtin/packages/py-tokenizers/package.py
@@ -13,23 +13,35 @@ class PyTokenizers(PythonPackage):
     homepage = "https://github.com/huggingface/tokenizers"
     pypi = "tokenizers/tokenizers-0.6.0.tar.gz"
 
+    version("0.15.0", sha256="10c7e6e7b4cabd757da59e93f5f8d1126291d16f8b54f28510825ef56a3e5d0e")
     version("0.13.3", sha256="2e546dbb68b623008a5442353137fbb0123d311a6d7ba52f2667c8862a75af2e")
     version("0.13.1", sha256="3333d1cee5c8f47c96362ea0abc1f81c77c9b92c6c3d11cbf1d01985f0d5cf1d")
     version("0.10.3", sha256="1a5d3b596c6d3a237e1ad7f46c472d467b0246be7fd1a364f12576eb8db8f7e6")
-    version("0.6.0", sha256="1da11fbfb4f73be695bed0d655576097d09a137a16dceab2f66399716afaffac")
-    version("0.5.2", sha256="b5a235f9c71d04d4925df6c4fa13b13f1d03f9b7ac302b89f8120790c4f742bc")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools-rust", type="build")
-
-    # A nightly or dev version of rust is required to build older versions.
-    # https://github.com/huggingface/tokenizers/issues/176
-    # https://github.com/PyO3/pyo3/issues/5
-    depends_on("rust@nightly", when="@:0.10", type="build")
+    version(
+        "0.6.0",
+        sha256="1da11fbfb4f73be695bed0d655576097d09a137a16dceab2f66399716afaffac",
+        deprecated=True,
+    )
+    version(
+        "0.5.2",
+        sha256="b5a235f9c71d04d4925df6c4fa13b13f1d03f9b7ac302b89f8120790c4f742bc",
+        deprecated=True,
+    )
 
     # TODO: This package currently requires internet access to install.
+    depends_on("py-maturin@1", when="@0.14:", type="build")
+    depends_on("py-huggingface-hub@0.16.4:0", when="@0.15:", type=("build", "run"))
 
     # cargo resolves dependencies, which includes openssl-sys somewhere, which needs
     # system pkgconfig and openssl.
     depends_on("pkgconfig", type="build")
     depends_on("openssl")
+
+    # Historical dependencies
+    depends_on("py-setuptools", when="@:0.13", type="build")
+    depends_on("py-setuptools-rust", when="@:0.13", type="build")
+
+    # A nightly or dev version of rust is required to build older versions.
+    # https://github.com/huggingface/tokenizers/issues/176
+    # https://github.com/PyO3/pyo3/issues/5
+    depends_on("rust@nightly", when="@:0.8", type="build")
diff --git a/var/spack/repos/builtin/packages/py-transformers/package.py b/var/spack/repos/builtin/packages/py-transformers/package.py
index 5380f44a78..7f4e8306c6 100644
--- a/var/spack/repos/builtin/packages/py-transformers/package.py
+++ b/var/spack/repos/builtin/packages/py-transformers/package.py
@@ -16,17 +16,15 @@ class PyTransformers(PythonPackage):
 
     maintainers("adamjstewart")
 
+    version("4.35.2", sha256="2d125e197d77b0cdb6c9201df9fa7e2101493272e448b9fba9341c695bee2f52")
     version("4.31.0", sha256="4302fba920a1c24d3a429a29efff6a63eac03f3f3cf55b55927fc795d01cb273")
     version("4.24.0", sha256="486f353a8e594002e48be0e2aba723d96eda839e63bfe274702a4b5eda85559b")
     version("4.6.1", sha256="83dbff763b7e7dc57cbef1a6b849655d4fcab6bffdd955c5e8bea12a4f76dc10")
     version("2.8.0", sha256="b9f29cdfd39c28f29e0806c321270dea337d6174a7aa60daf9625bf83dbb12ee")
 
-    depends_on("python@3.8:", when="@4.31:", type=("build", "run"))
-    depends_on("python@3.7:", when="@4.24:", type=("build", "run"))
-    depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-importlib-metadata", when="@4.6: ^python@:3.7", type=("build", "run"))
     depends_on("py-filelock", type=("build", "run"))
+    depends_on("py-huggingface-hub@0.16.4:0", when="@4.34:", type=("build", "run"))
     depends_on("py-huggingface-hub@0.14.1:0", when="@4.26:", type=("build", "run"))
     depends_on("py-huggingface-hub@0.10:0", when="@4.24:", type=("build", "run"))
     depends_on("py-huggingface-hub@0.0.8", when="@4.6.1", type=("build", "run"))
@@ -38,7 +36,8 @@ class PyTransformers(PythonPackage):
     depends_on("py-regex@:2019.12.16,2019.12.18:", type=("build", "run"))
     depends_on("py-requests", type=("build", "run"))
     depends_on("py-safetensors@0.3.1:", when="@4.31:", type=("build", "run"))
-    depends_on("py-tokenizers@0.11.1:0.11.2,0.11.4:0.13", when="@4.24:", type=("build", "run"))
+    depends_on("py-tokenizers@0.14:0.18", when="@4.35:", type=("build", "run"))
+    depends_on("py-tokenizers@0.11.1:0.11.2,0.11.4:0.13", when="@4.24:4.33", type=("build", "run"))
     depends_on("py-tokenizers@0.10.1:0.10", when="@4.6.1", type=("build", "run"))
     depends_on("py-tokenizers@0.5.2", when="@2.8.0", type=("build", "run"))
     depends_on("py-tqdm@4.27:", type=("build", "run"))