Skip to content

Commit

Permalink
individual locate test, tqdm, & bare minimal testing env (#324)
Browse files Browse the repository at this point in the history
* break out locate tests

* address tqdm & bare min testing

* bump min scipy to 1.2.1

* bump min scipy to 1.3.2

* bump min pandas to 1.0.5

* bump min geopandas to 0.8.0

* bump min geopandas to 0.10.0

* pin min tqdm in 3.9; remove from 3.8

* try 3.11 testing again

* 3.11 shapely>=2

* update codecov; drop 310-DEV,310-shapely

* update supported versions
  • Loading branch information
jGaboardi authored Dec 28, 2022
1 parent 8fce892 commit 172b356
Show file tree
Hide file tree
Showing 18 changed files with 1,482 additions and 1,032 deletions.
9 changes: 5 additions & 4 deletions .ci/310.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ channels:
- conda-forge
dependencies:
- python=3.10
- geopandas>=0.7.0
- geopandas>=0.10.0
- libpysal
- matplotlib
- networkx
- numpy>=1.3
- pandas>=1
- numpy>=1.21
- pandas>=1.0.5
- scikit-learn>=0.22
- scipy>=1.0
- scipy>=1.3.2
- shapely
- spaghetti
- tqdm=>4.27.0
# testing
- codecov
- coverage
Expand Down
11 changes: 6 additions & 5 deletions .ci/310-DEV.yaml → .ci/311-DEV.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ name: test
channels:
- conda-forge
dependencies:
- python=3.10
- geopandas>=0.7.0
- python=3.11
- geopandas>=0.10.0
- matplotlib
- networkx
- numpy>=1.3
- pandas>=1
- numpy>=1.21
- pandas>=1.0.5
- pip
- scikit-learn>=0.22
- scipy>=1.0
- scipy>=1.3.2
- spaghetti
- tqdm>=4.27.0
# testing
- codecov
- coverage
Expand Down
9 changes: 5 additions & 4 deletions .ci/310-DEV_shapely_dev.yaml → .ci/311-DEV_shapely_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ channels:
- conda-forge
- conda-forge/label/shapely_dev
dependencies:
- python=3.10
- python=3.11
- geopandas>=0.12.0
- matplotlib
- networkx
- numpy>=1.3
- pandas>=1
- numpy>=1.21
- pandas>=1.0.5
- pip
- scikit-learn>=0.22
- scipy>=1.0
- scipy>=1.3.2
- shapely>=2.0b1
- spaghetti
- tqdm>=4.27.0
# testing
- codecov
- coverage
Expand Down
28 changes: 28 additions & 0 deletions .ci/311.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: test
channels:
- conda-forge
dependencies:
- python=3.11
- geopandas>=0.10.0
- libpysal
- matplotlib
- networkx
- numpy>=1.21
- pandas>=1.0.5
- scikit-learn>=0.22
- scipy>=1.3.2
- shapely
- spaghetti
- tqdm=>4.27.0
# testing
- codecov
- coverage
- pytest
- pytest-cov
- pytest-xdist
# docs
- nbsphinx
- numpydoc
- sphinx<=4.5.0
- sphinxcontrib-bibtex
- sphinx_bootstrap_theme
10 changes: 5 additions & 5 deletions .ci/38.yaml → .ci/38-MIN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ channels:
- conda-forge
dependencies:
- python=3.8
- geopandas>=0.7.0
- geopandas=0.10.0
- libpysal
- matplotlib
- networkx
- numpy>=1.3
- pandas>=1
- scikit-learn>=0.22
- scipy>=1.0
- numpy=1.21
- pandas=1.0.5
- scikit-learn=0.22
- scipy=1.3.2
- shapely
- spaghetti
# testing
Expand Down
9 changes: 5 additions & 4 deletions .ci/39.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ channels:
- conda-forge
dependencies:
- python=3.9
- geopandas>=0.7.0
- geopandas>=0.10.0
- libpysal
- matplotlib
- networkx
- numpy>=1.3
- pandas>=1
- numpy>=1.21
- pandas>=1.0.5
- scikit-learn>=0.22
- scipy>=1.0
- scipy>=1.3.2
- shapely
- spaghetti
- tqdm=4.27.0
# testing
- codecov
- coverage
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@
strategy:
matrix:
os: [ubuntu-latest]
environment-file: [.ci/38.yaml, .ci/39.yaml, .ci/310.yaml, .ci/310-DEV.yaml, .ci/310-DEV_shapely_dev.yaml]
environment-file: [
.ci/38-MIN.yaml,
.ci/39.yaml,
.ci/310.yaml,
.ci/311.yaml,
.ci/311-DEV.yaml,
.ci/311-DEV_shapely_dev.yaml,
]
include:
- environment-file: .ci/310.yaml
- environment-file: .ci/311.yaml
os: macos-latest
- environment-file: .ci/310.yaml
- environment-file: .ci/311.yaml
os: windows-latest
fail-fast: false

Expand All @@ -43,7 +50,7 @@
shell: bash -l {0}
run: pip install pulp

- name: install bleeding edge libpysal (only Ubuntu / Python 3.10)
- name: install bleeding edge libpysal (only Ubuntu w/ latest Python)
shell: bash -l {0}
run: pip install git+https://github.com/pysal/libpysal.git@master
if: matrix.os == 'ubuntu-latest' && contains(matrix.environment-file, 'DEV')
Expand Down
4 changes: 2 additions & 2 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
codecov:
notify:
after_n_builds: 7
after_n_builds: 8
coverage:
range: 50..95
round: nearest
Expand All @@ -18,5 +18,5 @@ coverage:
comment:
layout: "reach, diff, files"
behavior: once
after_n_builds: 7
after_n_builds: 8
require_changes: true
3 changes: 2 additions & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Installation
============

spopt supports Python 3.8_, 3.9_, and 3.10_. Please make sure that you are
spopt supports Python 3.8_, 3.9_, 3.10_, and 3.11_. Please make sure that you are
operating in a Python >= 3.8 environment.

Installing released version
Expand Down Expand Up @@ -46,6 +46,7 @@ contribute to spopt development.
.. _3.8: https://docs.python.org/3.8/
.. _3.9: https://docs.python.org/3.9/
.. _3.10: https://docs.python.org/3.10/
.. _3.11: https://docs.python.org/3.11/
.. _Python Package Index: https://pypi.org/project/spopt/
.. _pysal/spopt: https://github.com/pysal/spopt
.. _fork: https://help.github.com/articles/fork-a-repo/
Expand Down
9 changes: 5 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ channels:
- conda-forge
dependencies:
- python=3.10
- geopandas>=0.7.0
- geopandas>=0.10.0
- jupyterlab
- libpysal
- mapclassify
- networkx
- numpy>=1.3
- pandas>=1
- numpy>=1.21
- pandas>=1.0.5
- pip
- pulp
- scikit-learn>=0.22
- scipy>=1.0
- scipy>=1.3.2
- tqdm>=4.27.0

# notebook/binder specific
- folium
Expand Down
9 changes: 5 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
geopandas>=0.7
geopandas>=0.10.0
libpysal
networkx
numpy>=1.3
pandas>=1
numpy>=1.21
pandas>=1.0.5
pulp
scikit-learn>=0.22
scipy>=0.11
scipy>=1.3.2
spaghetti
tqdm>=4.27.0
1 change: 1 addition & 0 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
black
pre-commit
tqdm>=4.27.0
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,15 @@ def setup_package():
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
],
license="3-Clause BSD",
packages=find_packages(),
py_modules=[package],
install_requires=install_reqs,
extras_require=extras_reqs,
zip_safe=False,
python_requires=">=3.7",
python_requires=">=3.8",
)


Expand Down
Loading

0 comments on commit 172b356

Please sign in to comment.