update dependencies

ecmwf · May 30, 2024 · 5926ae9 · 5926ae9
1 parent 03bfaad
commit 5926ae9
Show file tree

Hide file tree

Showing 2 changed files with 101 additions and 71 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,19 +13,19 @@ repos:
 
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.6.0
   hooks:
   - id: check-yaml # Check YAML files for syntax errors only
     args: [--unsafe, --allow-multiple-documents]
   - id: debug-statements # Check for debugger imports and py37+ breakpoint()
   - id: end-of-file-fixer # Ensure files end in a newline
   - id: trailing-whitespace # Trailing whitespace checker
-#  - id: no-commit-to-branch # Prevent committing to main / master
+  - id: no-commit-to-branch # Prevent committing to main / master
   - id: check-added-large-files # Check for large files added to git
   - id: check-merge-conflict # Check for files that contain merge conflict
 
 - repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 24.1.1
+  rev: 24.4.2
   hooks:
     - id: black
       args: [--line-length=120]
@@ -41,7 +41,7 @@ repos:
 
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.3.0
+  rev: v0.4.6
   hooks:
   - id: ruff
     exclude: '(dev/.*|.*_)\.py$'
@@ -51,7 +51,6 @@ repos:
     - --exit-non-zero-on-fix
     - --preview
 
-
 - repo: https://github.com/sphinx-contrib/sphinx-lint
   rev: v0.9.1
   hooks:
@@ -69,3 +68,14 @@ repos:
   hooks:
   - id: docconvert
     args: ["numpy"]
+
+- repo: https://github.com/b8raoult/optional-dependencies-all
+  rev: "0.0.2"
+  hooks:
+  - id: optional-dependencies-all
+    args: ["--inplace", "--all-key", "all", "--exclude-keys", "dev,docs"]
+
+- repo: https://github.com/tox-dev/pyproject-fmt
+  rev: "2.1.3"
+  hooks:
+    - id: pyproject-fmt
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,93 +10,113 @@
 # https://packaging.python.org/en/latest/guides/writing-pyproject-toml/
 
 [build-system]
-requires = ["setuptools>=60", "setuptools-scm>=8.0"]
+requires = [
+  "setuptools>=60",
+  "setuptools-scm>=8",
+]
 
 [project]
-description = "A package to hold various functions to support training of ML models on ECMWF data."
 name = "anemoi-datasets"
 
-dynamic = ["version"]
-license = { file = "LICENSE" }
-requires-python = ">=3.9"
+description = "A package to hold various functions to support training of ML models on ECMWF data."
+keywords = [
+  "ai",
+  "datasets",
+  "tools",
+]
 
+license = { file = "LICENSE" }
 authors = [
-    { name = "European Centre for Medium-Range Weather Forecasts (ECMWF)", email = "software.support@ecmwf.int" },
+  { name = "European Centre for Medium-Range Weather Forecasts (ECMWF)", email = "software.support@ecmwf.int" },
 ]
 
-keywords = ["tools", "datasets", "ai"]
+requires-python = ">=3.9"
 
 classifiers = [
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: Implementation :: PyPy",
-    "Operating System :: OS Independent",
+  "Development Status :: 4 - Beta",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
+dynamic = [
+  "version",
+]
 dependencies = [
-    "anemoi-utils[provenance]>=0.2.1",
-    "zarr<=2.17.0",
-    "pyyaml",
-    "numpy",
-    "tqdm",
-    "semantic-version",
+  "anemoi-utils[provenance]>=0.3",
+  "numpy",
+  "pyyaml",
+  "semantic-version",
+  "tqdm",
+  "zarr<=2.17",
 ]
 
-[project.optional-dependencies]
-remote = ["boto3", "requests", "s3fs"]
-
-create = [
-    "climetlab>=0.22.1", # "earthkit-data"
-    "earthkit-meteo",
-    "pyproj",
-    "ecmwflibs>=0.6.3",
+optional-dependencies.all = [
+  "anemoi-utils[provenance]>=0.3",
+  "boto3",
+  "climetlab>=0.22.1",
+  "earthkit-meteo",
+  "ecmwflibs>=0.6.3",
+  "numpy",
+  "pyproj",
+  "pyyaml",
+  "requests",
+  "s3fs",
+  "semantic-version",
+  "tqdm",
+  "zarr<=2.17",
 ]
-
-docs = ["sphinx", "sphinx_rtd_theme", "nbsphinx", "pandoc", "sphinx_argparse"]
-
-all = [
-    "boto3",
-    "requests",
-    "s3fs",
-    "climetlab>=0.22.1", # "earthkit-data"
-    "earthkit-meteo",
-    "pyproj",
-    "ecmwflibs>=0.6.3",
+optional-dependencies.create = [
+  "climetlab>=0.22.1", # "earthkit-data"
+  "earthkit-meteo",
+  "ecmwflibs>=0.6.3",
+  "pyproj",
 ]
-
-dev = [
-    "boto3",
-    "requests",
-    "s3fs",
-    "climetlab>=0.22.1", # "earthkit-data"
-    "earthkit-meteo",
-    "pyproj",
-    "ecmwflibs>=0.6.3",
-    "sphinx",
-    "sphinx_rtd_theme",
-    "nbsphinx",
-    "sphinx_argparse",
-    "pandoc",
+optional-dependencies.dev = [
+  "boto3",
+  "climetlab>=0.22.1", # "earthkit-data"
+  "earthkit-meteo",
+  "ecmwflibs>=0.6.3",
+  "nbsphinx",
+  "pandoc",
+  "pyproj",
+  "requests",
+  "s3fs",
+  "sphinx",
+  "sphinx-argparse",
+  "sphinx-rtd-theme",
+]
+optional-dependencies.docs = [
+  "nbsphinx",
+  "pandoc",
+  "sphinx",
+  "sphinx-argparse",
+  "sphinx-rtd-theme",
+]
+optional-dependencies.remote = [
+  "boto3",
+  "requests",
+  "s3fs",
 ]
+urls.Documentation = "https://anemoi-datasets.readthedocs.io/"
+urls.Homepage = "https://github.com/ecmwf/anemoi-datasets/"
+urls.Issues = "https://github.com/ecmwf/anemoi-datasets/issues"
 
-[project.urls]
-Homepage = "https://github.com/ecmwf/anemoi-datasets/"
-Documentation = "https://anemoi-datasets.readthedocs.io/"
-Repository = "https://github.com/ecmwf/anemoi-datasets/"
-Issues = "https://github.com/ecmwf/anemoi-datasets/issues"
 # Changelog = "https://github.com/ecmwf/anemoi-datasets/CHANGELOG.md"
+urls.Repository = "https://github.com/ecmwf/anemoi-datasets/"
+scripts.anemoi-datasets = "anemoi.datasets.__main__:main"
 
-[project.scripts]
-anemoi-datasets = "anemoi.datasets.__main__:main"
+[tool.setuptools.package-data]
+"anemoi.datasets.data" = [
+  "*.css",
+]
 
 [tool.setuptools_scm]
 version_file = "src/anemoi/datasets/_version.py"
-
-[tool.setuptools.package-data]
-"anemoi.datasets.data" = ["*.css"]