Simplify the public numpy dependency (#172)

* Simplify the public numpy dependency

Signed-off-by: Michael Johansen <[email protected]>

* Update the pin oldest deps script to also handle dev dependencies.

Signed-off-by: Michael Johansen <[email protected]>

* Ignore the mypy index error.

Signed-off-by: Michael Johansen <[email protected]>

* Change the pin_oldest_deps script to delete duplicate dependencies in dev.deps.

Signed-off-by: Michael Johansen <[email protected]>

* Update scripts/pin_oldest_deps.py

Co-authored-by: Brad Keryan <[email protected]>

---------

Signed-off-by: Michael Johansen <[email protected]>
Co-authored-by: Michael Johansen <[email protected]>
Co-authored-by: Brad Keryan <[email protected]>

Author: 3 people

poetry.lock

@@ -30,15 +30,18 @@ packages = [{ include = "nitypes", from = "src" }]
 
 [tool.poetry.dependencies]
 python = "^3.9"
+numpy = ">=1.22"
+hightime = { version = ">=0.2.2", allow-prereleases = true }
+typing-extensions = ">=4.13.2"
+
+[tool.poetry.group.dev.dependencies]
 numpy = [
   { version = ">=1.22", python = ">=3.9,<3.12", markers = "implementation_name != 'pypy'" },
   { version = ">=1.26", python = ">=3.12,<3.13", markers = "implementation_name != 'pypy'" },
   { version = ">=2.1", python = "^3.13", markers = "implementation_name != 'pypy'" },
   { version = ">=2.1", python = ">=3.10,<3.11", markers = "implementation_name == 'pypy'" },
   { version = ">=2.3", python = "^3.11", markers = "implementation_name == 'pypy'" },
 ]
-hightime = { version = ">=0.2.2", allow-prereleases = true }
-typing-extensions = ">=4.13.2"
 
 [tool.poetry.group.lint.dependencies]
 bandit = { version = ">=1.7", extras = ["toml"] }

pyproject.toml

@@ -15,16 +15,28 @@ def main(args: list[str]) -> int | str | None:
     if args:
         return f"Unsupported arguments: {args!r}"
     pyproject = tomlkit.loads(pyproject_path.read_text())
+
     poetry_deps = pyproject["tool"]["poetry"]["dependencies"]  # type: ignore[index]
     assert isinstance(poetry_deps, AbstractTable)
+    _pin_oldest_for_deps_list(poetry_deps)
+
+    dev_deps = pyproject["tool"]["poetry"]["group"]["dev"]["dependencies"]  # type: ignore[index]
+    assert isinstance(dev_deps, AbstractTable)
+    _remove_duplicate_dev_deps(poetry_deps, dev_deps)
+
+    pyproject_path.write_text(tomlkit.dumps(pyproject))
+    print("Updated pyproject.toml with pinned dependencies.")
+    return None
 
-    for dep, value in poetry_deps.items():
+
+def _pin_oldest_for_deps_list(deps_list: AbstractTable) -> None:
+    for dep, value in deps_list.items():
         if dep == "python":
             continue
         if isinstance(value, str) and (
             value.startswith("^") or value.startswith("~") or value.startswith(">=")
         ):
-            poetry_deps[dep] = "==" + value.lstrip("^~>=")
+            deps_list[dep] = "==" + value.lstrip("^~>=")
         elif isinstance(value, Array):
             for constraint in value:
                 if "version" in constraint and (
@@ -34,9 +46,11 @@ def main(args: list[str]) -> int | str | None:
                 ):
                     constraint["version"] = "==" + constraint["version"].lstrip("^~>=")
 
-    pyproject_path.write_text(tomlkit.dumps(pyproject))
-    print("Updated pyproject.toml with pinned dependencies.")
-    return None
+
+def _remove_duplicate_dev_deps(poetry_deps: AbstractTable, dev_deps: AbstractTable) -> None:
+    for dep, _ in poetry_deps.items():
+        if dep in dev_deps:
+            del dev_deps[dep]
 
 
 if __name__ == "__main__":