diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 850c815..63ec298 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [ "3.10", "3.14"] + python-version: [ "3.11", "3.14"] os: [ ubuntu-latest ] fail-fast: false defaults: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3e7e374..abe8505 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.18 + rev: v0.15.20 hooks: - id: ruff args: ["--fix", "--show-fixes"] @@ -68,7 +68,7 @@ repos: - repo: https://github.com/tox-dev/pyproject-fmt - rev: "v2.25.0" + rev: "v2.25.1" hooks: - id: pyproject-fmt diff --git a/oceans/filters.py b/oceans/filters.py index 7a04e16..63852c1 100644 --- a/oceans/filters.py +++ b/oceans/filters.py @@ -432,7 +432,6 @@ def medfilt1(x, L=3): if L % 2 == 0: L += 1 - if N < 2: msg = "Input sequence must be >= 2." raise ValueError(msg) diff --git a/pyproject.toml b/pyproject.toml index 964850b..2afd576 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,6 @@ build-backend = "setuptools.build_meta" requires = [ "setuptools>=42", "setuptools-scm[toml]>=3.4", - "wheel", ] [project] @@ -16,10 +15,9 @@ maintainers = [ { name = "Arnaldo Russo" }, { name = "Filipe Fernandes", email = "ocefpaf+oceans@gmail.com" }, ] -requires-python = ">=3.10" +requires-python = ">=3.11" classifiers = [ "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", @@ -29,23 +27,16 @@ dynamic = [ "dependencies", "version", ] -optional-dependencies.extras = [ - "cartopy", - "iris", - "netcdf4", - "pandas", - "scipy", -] urls.documentation = "https://pyoceans.github.io/python-oceans/" urls.homepage = "https://pypi.python.org/pypi/oceans/" urls.repository = "https://github.com/pyoceans/python-oceans" [tool.setuptools] packages = [ "oceans" ] -zip-safe = false include-package-data = true -dynamic.dependencies = { file = [ "requirements.txt" ] } package-data.oceans = [ "colormaps/cmap_data/*.dat" ] +dynamic.dependencies = { file = [ "requirements.txt" ] } +zip-safe = false [tool.setuptools_scm] write_to = "oceans/_version.py" @@ -74,6 +65,19 @@ lint.per-file-ignores."oceans/plotting.py" = [ "T201", ] # `print` found +[tool.interrogate] +fail-under = 95 +ignore-init-method = true +ignore-init-module = false +ignore-magic = false +ignore-semiprivate = false +ignore-private = false +ignore-module = false +exclude = [ "docs", "tests" ] +color = true +verbose = 1 +quiet = false + [tool.check-manifest] ignore = [ ".coveragerc", @@ -89,16 +93,3 @@ ignore = [ ini_options.markers = [ "web: marks tests require connection (deselect with '-m \"not web\"')", ] - -[tool.interrogate] -ignore-init-method = true -ignore-init-module = false -ignore-magic = false -ignore-semiprivate = false -ignore-private = false -ignore-module = false -fail-under = 95 -exclude = [ "docs", "tests" ] -verbose = 1 -quiet = false -color = true diff --git a/requirements-dev.txt b/requirements-dev.txt index 71c531e..0b655f5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,15 +1,8 @@ cartopy -cf_xarray check-manifest nbsphinx -netcdf4 -pandas -pooch pytest pytest-cov pytest-xdist -scipy setuptools-scm sphinx -twine -xarray diff --git a/requirements.txt b/requirements.txt index d3a8bbc..dd79438 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,12 @@ +cf_xarray cmcrameri contourpy gsw matplotlib>=3.6.0 +netcdf4 numpy>=1.20 pandas>=1.0.1 +pooch +scipy seawater +xarray