diff --git a/.github/workflows/build-conda.yml b/.github/workflows/build-conda.yml index fb137106..025f5a42 100644 --- a/.github/workflows/build-conda.yml +++ b/.github/workflows/build-conda.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] os: [ubuntu-latest, windows-latest, macos-12] steps: - uses: actions/checkout@v4 @@ -26,7 +26,7 @@ jobs: run: | conda create --name TEST python=${{ matrix.python-version }} numpy cython pip pytest wheel pyproj eccodes --strict-channel-priority source activate TEST - pip install -e . --no-deps --force-reinstall + python -m pip install -e . --no-deps --force-reinstall conda info --all conda list diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index a338cef8..5ec7f9ef 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] os: [windows-latest, macos-latest] platform: [x64, x32] exclude: @@ -32,7 +32,7 @@ jobs: run: | conda create --name TEST python=${{ matrix.python-version }} numpy cython pip pytest wheel pyproj eccodes --strict-channel-priority source activate TEST - pip install -e . --no-deps --force-reinstall + python -m pip install -e . --no-deps --force-reinstall conda info --all conda list diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5580af44..2beae570 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: PROJ_LIB: /usr/share/proj strategy: matrix: - python-version: ["3.11"] + python-version: ["3.13"] steps: - uses: actions/checkout@v4 @@ -31,18 +31,23 @@ jobs: - name: Install some dependencies via pip run: | # Install pyspharm using a few tricks - pip install numpy setuptools wheel - FFLAGS="-fallow-argument-mismatch" pip install --no-use-pep517 pyspharm + python -m pip install numpy setuptools wheel build meson-python + #FFLAGS="-fallow-argument-mismatch" python -m pip install --no-use-pep517 pyspharm + git clone https://github.com/jswhit/pyspharm + cd pyspharm + python -m build . + python -m pip install dist/*whl + cd .. # for later building/checking - pip install build twine - pip install check-manifest + python -m pip install build twine + python -m pip install check-manifest # below here only needed for mpl/cartopy based tests - pip install pytest-mpl - pip install cartopy + python -m pip install pytest-mpl + python -m pip install cartopy - name: Install pygrib run: | - pip install -e . + python -m pip install -e . - name: Test run: | diff --git a/pyproject.toml b/pyproject.toml index 124dd713..914d0d8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,17 +14,16 @@ readme = "README.md" authors = [ {name = "Jeff Whitaker", email = "jeffrey.s.whitaker@noaa.gov"}, ] -requires-python = ">=3.7" +requires-python = ">=3.9" license = {text = "MIT"} classifiers = [ "Development Status :: 4 - Beta", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Intended Audience :: Science/Research", "License :: OSI Approved :: MIT License", "Topic :: Software Development :: Libraries :: Python Modules",