Skip to content

Commit 8116db6

Browse files
martinfleissjsreyjGaboardi
authored
CI: revamp CI matrix and set bump minimal requirements (#521)
* TEST: 3.11 dev coverage (#516) * TEST: add 3.11 and shapely_dev coverage * TEST: fix environment-file list * TEST: remove option numba * Update ci/311_shapely_dev.yaml Co-authored-by: Martin Fleischmann <[email protected]> --------- Co-authored-by: James Gaboardi <[email protected]> Co-authored-by: Martin Fleischmann <[email protected]> * revamp CI matrix * get old platformdirs from pip * fix yaml * bump min scipy to 1.8 * bump networkx * pin also numpy * update requirements * try numpy from pypi * unpin numpy, numba does that implicitly * update numpy pin in reqs --------- Co-authored-by: Sergio Rey <[email protected]> Co-authored-by: James Gaboardi <[email protected]>
1 parent 969039d commit 8116db6

File tree

9 files changed

+85
-59
lines changed

9 files changed

+85
-59
lines changed

‎.github/workflows/unittests.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
matrix:
2121
os: ['ubuntu-latest']
2222
environment-file: [
23-
ci/38.yaml,
23+
ci/38-minimal.yaml,
2424
ci/39.yaml,
2525
ci/310.yaml,
26-
ci/310_shapely_dev.yaml
26+
ci/311.yaml,
27+
ci/311-dev.yaml
2728
]
2829
include:
29-
- environment-file: ci/310.yaml
30+
- environment-file: ci/311.yaml
3031
os: macos-latest
31-
- environment-file: ci/310.yaml
32+
- environment-file: ci/311.yaml
3233
os: windows-latest
3334
fail-fast: false
3435

‎ci/310.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66
- platformdirs
77
- beautifulsoup4
88
- jinja2
9-
- pandas>=1.0
10-
- scipy>=1.0
9+
- pandas
10+
- scipy
1111
- xarray
1212
# testing
1313
- codecov
@@ -16,12 +16,11 @@ dependencies:
1616
- pytest-cov
1717
- pytest-xdist
1818
# optional
19-
- geopandas>=0.7.0
19+
- geopandas
2020
- joblib
2121
- networkx
2222
- numba
2323
- packaging
24-
- xarray
2524
- zstd
2625
# for docs build action (this env only)
2726
- nbsphinx

‎ci/310_shapely_dev.yaml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎ci/311-dev.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.11
6+
- platformdirs
7+
- beautifulsoup4
8+
- jinja2
9+
- pandas
10+
- scipy
11+
- xarray
12+
# testing
13+
- codecov
14+
- matplotlib
15+
- pytest
16+
- pytest-cov
17+
- pytest-xdist
18+
# optional
19+
- geopandas
20+
- joblib
21+
- networkx
22+
- packaging
23+
- zstd
24+
- Cython
25+
- pip
26+
- pip:
27+
# dev versions of packages
28+
- --pre --extra-index https://pypi.anaconda.org/scipy-wheels-nightly/simple
29+
- scipy
30+
- pandas
31+
- git+https://github.com/shapely/shapely.git@main
32+
- git+https://github.com/geopandas/geopandas.git@main
33+
- git+https://github.com/pydata/xarray.git@main

‎ci/38.yaml‎ renamed to ‎ci/311.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: test
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.8
5+
- python=3.11
66
- platformdirs
77
- beautifulsoup4
88
- jinja2
9-
- pandas>=1.0
10-
- scipy>=1.0
9+
- pandas
10+
- scipy
1111
- xarray
1212
# testing
1313
- codecov
@@ -16,10 +16,10 @@ dependencies:
1616
- pytest-cov
1717
- pytest-xdist
1818
# optional
19-
- geopandas>=0.7.0
19+
- geopandas>=0.12.0
2020
- joblib
2121
- networkx
22-
- numba
2322
- packaging
23+
- shapely>=2.0b1
2424
- xarray
2525
- zstd

‎ci/38-minimal.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.8
6+
- beautifulsoup4=4.10
7+
- jinja2=3.0
8+
- pandas=1.3
9+
- scipy=1.8
10+
- xarray=0.18
11+
# testing
12+
- codecov
13+
- matplotlib
14+
- pytest
15+
- pytest-cov
16+
- pytest-xdist
17+
# optional
18+
- geopandas>=0.10.0
19+
- shapely=1.8
20+
- joblib
21+
- networkx=2.7
22+
- numba=0.54
23+
- packaging
24+
- zstd
25+
- pip
26+
- pip:
27+
- platformdirs==2.0.2

‎ci/39.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ dependencies:
66
- platformdirs
77
- beautifulsoup4
88
- jinja2
9-
- pandas>=1.0
10-
- scipy>=1.0
9+
- pandas
10+
- scipy
1111
- xarray
1212
# testing
1313
- codecov
@@ -16,10 +16,9 @@ dependencies:
1616
- pytest-cov
1717
- pytest-xdist
1818
# optional
19-
- geopandas>=0.7.0
19+
- geopandas
2020
- joblib
2121
- networkx
2222
- numba
2323
- packaging
24-
- xarray
2524
- zstd

‎docs/installation.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Installation
44
============
55

6-
libpysal supports python >= `3.7`_ only. Please make sure that you are
6+
libpysal supports python >= `3.8`_ only. Please make sure that you are
77
operating in a python 3 environment.
88

99
Installing released version
@@ -14,7 +14,7 @@ conda
1414

1515
libpysal is available through conda::
1616

17-
17+
1818
conda install -c conda-forge libpysal
1919

2020

@@ -50,7 +50,7 @@ to your local clone and submitting a pull request to `pysal/libpysal`_, you can
5050
contribute to libpysal development.
5151

5252

53-
.. _3.7: https://docs.python.org/3.7/
53+
.. _3.7: https://docs.python.org/3.8/
5454
.. _Python Package Index: https://pypi.org/project/libpysal/
5555
.. _pysal/libpysal: https://github.com/pysal/libpysal
5656
.. _fork: https://help.github.com/articles/fork-a-repo/

‎requirements.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
platformdirs
2-
beautifulsoup4
3-
jinja2
4-
numpy>=1.3
5-
pandas
1+
platformdirs>=2.0.2
2+
beautifulsoup4>=4.10
3+
jinja2>=3.0
4+
numpy>=1.20
5+
pandas>=1.3
66
requests
7-
scipy>=0.11
7+
scipy>=1.8
88
packaging

0 commit comments

Comments
 (0)