-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #290 from GeoStat-Framework/add_numpy2_support
Add numpy2 support
- Loading branch information
Showing
10 changed files
with
149 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,17 +20,17 @@ jobs: | |
fail-fast: false | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v4 | ||
|
||
- name: Set up Python 3.8 | ||
uses: actions/setup-python@v2 | ||
- name: Set up Python 3.9 | ||
uses: actions/setup-python@v5 | ||
with: | ||
python-version: 3.8 | ||
python-version: 3.9 | ||
|
||
- name: Install dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install black 'isort[colors]<6' | ||
pip install -v --editable .[lint] | ||
- name: black check | ||
run: | | ||
|
@@ -40,63 +40,79 @@ jobs: | |
run: | | ||
python -m isort --check --diff --color . | ||
- name: cython-lint check | ||
run: | | ||
cython-lint src/pykrige/ | ||
build_wheels: | ||
name: wheels for ${{ matrix.cfg.os }} / ${{ matrix.cfg.arch }} | ||
runs-on: ${{ matrix.cfg.os }} | ||
name: wheels for ${{ matrix.os }} | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
cfg: | ||
- { os: ubuntu-latest, arch: x86_64 } | ||
- { os: ubuntu-latest, arch: i686 } | ||
- { os: windows-latest, arch: AMD64 } | ||
- { os: windows-latest, arch: x86 } | ||
- { os: macos-latest, arch: x86_64 } | ||
- { os: macos-latest, arch: arm64 } | ||
- { os: macos-latest, arch: universal2 } | ||
# macos-13 is an intel runner, macos-14 is apple silicon | ||
os: [ubuntu-latest, windows-latest, macos-13, macos-14] | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: '0' | ||
|
||
- name: Build wheels | ||
uses: pypa/[email protected] | ||
env: | ||
CIBW_ARCHS: ${{ matrix.cfg.arch }} | ||
uses: pypa/[email protected] | ||
with: | ||
output-dir: dist | ||
|
||
- uses: actions/upload-artifact@v2 | ||
- uses: actions/upload-artifact@v3 | ||
with: | ||
path: ./dist/*.whl | ||
|
||
build_sdist: | ||
name: sdist and coveralls | ||
runs-on: ubuntu-latest | ||
name: sdist on ${{ matrix.os }} with py ${{ matrix.ver.py }} numpy${{ matrix.ver.np }} scipy${{ matrix.ver.sp }} | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
fail-fast: false | ||
|
||
matrix: | ||
os: [ubuntu-latest, windows-latest, macos-13, macos-14] | ||
# https://github.com/scipy/oldest-supported-numpy/blob/main/setup.cfg | ||
ver: | ||
- {py: '3.8', np: '==1.20.0', sp: '==1.5.4'} | ||
- {py: '3.9', np: '==1.20.0', sp: '==1.5.4'} | ||
- {py: '3.10', np: '==1.21.6', sp: '==1.7.2'} | ||
- {py: '3.11', np: '==1.23.2', sp: '==1.9.2'} | ||
- {py: '3.12', np: '==1.26.2', sp: '==1.11.2'} | ||
- {py: '3.12', np: '>=2.0.0rc1', sp: '>=1.13.0'} | ||
exclude: | ||
- os: macos-14 | ||
ver: {py: '3.8', np: '==1.20.0', sp: '==1.5.4'} | ||
- os: macos-14 | ||
ver: {py: '3.9', np: '==1.20.0', sp: '==1.5.4'} | ||
- os: macos-14 | ||
ver: {py: '3.10', np: '==1.21.6', sp: '==1.7.2'} | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: '0' | ||
|
||
- name: Set up Python 3.8 | ||
uses: actions/setup-python@v2 | ||
- name: Set up Python ${{ matrix.ver.py }} | ||
uses: actions/setup-python@v5 | ||
with: | ||
python-version: 3.8 | ||
python-version: ${{ matrix.ver.py }} | ||
|
||
- name: Install dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install build coveralls>=3.0.0 | ||
pip install build "coveralls>=3.0.0" | ||
- name: Install PyKrige | ||
run: | | ||
pip install -v --editable .[test] | ||
- name: Run tests | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
run: | | ||
pip install "numpy${{ matrix.ver.np }}" "scipy${{ matrix.ver.sp }}" | ||
python -m pytest --cov pykrige --cov-report term-missing -v tests/ | ||
python -m coveralls --service=github | ||
|
@@ -105,7 +121,8 @@ jobs: | |
# PEP 517 package builder from pypa | ||
python -m build --sdist --outdir dist . | ||
- uses: actions/upload-artifact@v2 | ||
- uses: actions/upload-artifact@v3 | ||
if: matrix.os == 'ubuntu-latest' && matrix.ver.py == '3.9' | ||
with: | ||
path: dist/*.tar.gz | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ build: | |
sphinx: | ||
configuration: docs/source/conf.py | ||
|
||
formats: all | ||
formats: [pdf] | ||
|
||
python: | ||
install: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
__all__ = ["cok", "lapack", "variogram_models"] | ||
__all__ = ["cok", "variogram_models"] |
Oops, something went wrong.