From 845d5a842df15d5d1902710d30f52bfc16ad3129 Mon Sep 17 00:00:00 2001 From: veenstrajelmer <60435591+veenstrajelmer@users.noreply.github.com> Date: Thu, 11 Jul 2024 14:46:04 +0200 Subject: [PATCH] revert and separate py39 yml --- .github/workflows/ci.yml | 1 - .github/workflows/pytest-py39.yml | 35 +++++++++++++++++++++++++++++++ pyproject.toml | 9 ++------ 3 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/pytest-py39.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a57f41aa..409177dee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,6 @@ jobs: - py312 - py311 - py310 - - py39 steps: - name: Check out repo uses: actions/checkout@v4 diff --git a/.github/workflows/pytest-py39.yml b/.github/workflows/pytest-py39.yml new file mode 100644 index 000000000..b3975f934 --- /dev/null +++ b/.github/workflows/pytest-py39.yml @@ -0,0 +1,35 @@ +name: pytest + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + build: + + strategy: + fail-fast: false + matrix: + python-version: ["3.9"] + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install -e . + # dev dependencies, cannot be read with pip because they are in pixi + python -m pip install dask geopandas mapbox_earcut matplotlib-base netcdf4 numba_celltree pip pooch pre-commit pydata-sphinx-theme pymetis pyproj pytest pytest-cov ruff shapely scipy sphinx sphinx-gallery xarray zarr ipykernel twine build + - name: Test with pytest + run: | + pytest diff --git a/pyproject.toml b/pyproject.toml index 1c59b53b5..ba029224e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,12 +7,12 @@ name = "xugrid" description = "Xarray extension for unstructured grids" readme = { file = "README.rst", content-type = "text/x-rst" } maintainers = [{ name = "Huite Bootsma", email = "huite.bootsma@deltares.nl" }] -requires-python = ">=3.9" +requires-python = ">=3.10" dependencies = [ 'pandas', 'numba', 'numba_celltree', - 'numpy<2.0.0', + 'numpy', 'pooch', 'scipy', 'xarray', @@ -25,7 +25,6 @@ classifiers = [ 'Programming Language :: Python', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', @@ -120,12 +119,8 @@ python = "3.11.*" [tool.pixi.feature.py310.dependencies] python = "3.10.*" -[tool.pixi.feature.py39.dependencies] -python = "3.9.*" - [tool.pixi.environments] default = { features = ["py312"], solve-group = "py312" } py312 = { features = ["py312"], solve-group = "py312" } py311 = ["py311"] py310 = ["py310"] -py39 = ["py39"]