diff --git a/.ci/310.yaml b/.ci/310.yaml index aa37d995..be3175d1 100644 --- a/.ci/310.yaml +++ b/.ci/310.yaml @@ -3,17 +3,18 @@ channels: - conda-forge dependencies: - python=3.10 - - geopandas>=0.10.0 + - geopandas - libpysal + - mapclassify - matplotlib - networkx - - numpy>=1.21 - - pandas>=1.0.5 - - scikit-learn>=0.22 - - scipy>=1.3.2 + - numpy + - pandas + - scikit-learn + - scipy - shapely - spaghetti - - tqdm>=4.27.0 + - tqdm # testing - codecov - coverage diff --git a/.ci/311-DEV.yaml b/.ci/311-DEV.yaml index 8dc09972..333224d5 100644 --- a/.ci/311-DEV.yaml +++ b/.ci/311-DEV.yaml @@ -5,14 +5,15 @@ dependencies: - python=3.11 - geopandas - libpysal + - mapclassify - matplotlib - networkx - - numpy>=1.21 - - pandas>=1.0.5 - - scikit-learn>=0.22 - - scipy>=1.3.2 + - numpy + - pandas + - scikit-learn + - scipy - spaghetti - - tqdm>=4.27.0 + - tqdm # testing - codecov - coverage diff --git a/.ci/311.yaml b/.ci/311.yaml index de883154..d6e06e59 100644 --- a/.ci/311.yaml +++ b/.ci/311.yaml @@ -5,14 +5,15 @@ dependencies: - python=3.11 - geopandas - libpysal + - mapclassify - matplotlib - networkx - - numpy>=1.21 - - pandas>=1.0.5 - - scikit-learn>=0.22 - - scipy>=1.3.2 + - numpy + - pandas + - scikit-learn + - scipy - spaghetti - - tqdm=>4.27.0 + - tqdm # testing - codecov - coverage diff --git a/.ci/38-MIN.yaml b/.ci/38-MIN.yaml index 1cfd8844..7b0238f8 100644 --- a/.ci/38-MIN.yaml +++ b/.ci/38-MIN.yaml @@ -3,15 +3,15 @@ channels: - conda-forge dependencies: - python=3.8 - - geopandas=0.10.0 + - geopandas=0.10 - libpysal - matplotlib - - networkx + - networkx=2.6 - numpy=1.21 - - pandas=1.0.5 - - scikit-learn=0.22 - - scipy=1.3.2 - - shapely + - pandas=1.3 + - scikit-learn=1.0 + - scipy=1.7 + - shapely=2.0 - spaghetti # testing - codecov diff --git a/.ci/39.yaml b/.ci/39.yaml index a4917df1..e4a0e553 100644 --- a/.ci/39.yaml +++ b/.ci/39.yaml @@ -5,15 +5,15 @@ dependencies: - python=3.9 - geopandas - libpysal + - mapclassify - matplotlib - networkx - - numpy>=1.21 - - pandas>=1.0.5 - - scikit-learn>=0.22 - - scipy>=1.3.2 + - numpy + - pandas + - scikit-learn + - scipy - shapely - spaghetti - - tqdm=4.27.0 # testing - codecov - coverage diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index d40a6701..55852317 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -30,7 +30,7 @@ uses: actions/checkout@v3 - name: setup micromamba - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: ${{ matrix.environment-file }} micromamba-version: 'latest' diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1013e5d8..defc40db 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -15,8 +15,6 @@ name: ${{ matrix.os }}, ${{ matrix.environment-file }} runs-on: ${{ matrix.os }} timeout-minutes: 30 - env: - RUN_TEST: pytest spopt -v -r a -n auto --cov spopt --color yes --cov-report term-missing --cov-append --cov-report xml . strategy: matrix: os: [ubuntu-latest] @@ -33,43 +31,39 @@ - environment-file: .ci/311.yaml os: windows-latest fail-fast: false - + + defaults: + run: + shell: bash -l {0} + steps: - name: checkout repo uses: actions/checkout@v3 - name: setup micromamba - uses: mamba-org/provision-with-micromamba@main + uses: mamba-org/setup-micromamba@v1 with: environment-file: ${{ matrix.environment-file }} micromamba-version: 'latest' - channel-priority: 'flexible' ############################################################################## #- name: install pulp via pip - # shell: bash -l {0} - # run: pip install pulp + # run: | + # pip install pulp + # pulptest ############################################################################## - name: environment info - shell: bash -l {0} run: | micromamba info micromamba list - name: spatial versions - shell: bash -l {0} run: 'python -c "import geopandas; geopandas.show_versions();"' - name: run tests - bash - shell: bash -l {0} - run: ${{ env.RUN_TEST }} - if: matrix.os != 'windows-latest' - - - name: run tests - powershell - shell: powershell - run: ${{ env.RUN_TEST }} - if: matrix.os == 'windows-latest' + run: | + pytest spopt -v -r a -n auto --cov spopt --color yes --cov-report term-missing --cov-append --cov-report xml . - name: codecov uses: codecov/codecov-action@v3 diff --git a/README.md b/README.md index 9df9ca0a..04823d91 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ All examples can be run interactively by launching this repository as a [![Binde - [scikit-learn](https://scikit-learn.org/stable/) - [geopandas](https://geopandas.org/) - [pulp](https://coin-or.github.io/pulp/) +- [shapely](https://shapely.readthedocs.io/en/stable/) - [spaghetti](https://github.com/pysal/spaghetti) ## Installation diff --git a/pyproject.toml b/pyproject.toml index c5032eff..d389ec60 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,15 +30,16 @@ classifiers = [ ] requires-python = ">=3.8" dependencies = [ - "geopandas>=0.10.0", + "geopandas>=0.10", "libpysal", "mapclassify", - "networkx", + "networkx>=2.6", "numpy>=1.21", - "pandas>=1.0.5", + "pandas>=1.3,!=1.5.0", "pulp", - "scikit-learn>=0.22", - "scipy>=1.3.2", + "scikit-learn>=1.0", + "scipy>=1.7", + "shapely>=2", "spaghetti", "tqdm>=4.27.0", ]