Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update CI --> supported Python versions #197

Merged
merged 2 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,36 @@ jobs:
RUN_TEST: pytest giddy --cov giddy -v -n auto -r a --cov-config .coveragerc --cov-report xml --color yes --cov-append --cov-report term-missing
name: ${{ matrix.os }}, ${{ matrix.environment-file }}
runs-on: ${{ matrix.os }}
defaults:
run:
shell: bash -l {0}
timeout-minutes: 60
strategy:
matrix:
os: [ubuntu-latest]
environment-file:
- ci/37.yaml
- ci/38.yaml
- ci/39.yaml
- ci/310.yaml
- ci/310-DEV.yaml
- ci/310-DEV_shapely_dev.yaml
- ci/311.yaml
- ci/311-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

steps:
- name: checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- 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 bleeding edge libpysal, esda, mapclassify & splot (Ubuntu / Python 3.10)
- name: install bleeding edge libpysal, esda, mapclassify & splot (Ubuntu / Python 3.11)
shell: bash -l {0}
run: |
pip install git+https://github.com/pysal/libpysal.git@main
Expand All @@ -71,15 +71,8 @@ jobs:
run: 'python -c "import geopandas; geopandas.show_versions();"'
if: contains(matrix.environment-file, 'DEV')

- name: run tests - bash
shell: bash -l {0}
run: ${{ env.RUN_TEST }}
if: matrix.os != 'windows-latest'

- name: run tests - powershell
shell: powershell
- name: run tests
run: ${{ env.RUN_TEST }}
if: matrix.os == 'windows-latest'

- name: codecov
uses: codecov/codecov-action@v3
Expand Down
20 changes: 0 additions & 20 deletions ci/310-DEV_shapely_dev.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion ci/310-DEV.yaml → ci/311-DEV.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test
channels:
- conda-forge
dependencies:
- python=3.10
- python=3.11
# required
- geopandas>=0.4.0
- pip
Expand Down
2 changes: 1 addition & 1 deletion ci/37.yaml → ci/311.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test
channels:
- conda-forge
dependencies:
- python=3.7
- python=3.11
# required
- esda>=2.1.1
- libpysal>=4.0.1
Expand Down
19 changes: 0 additions & 19 deletions ci/38.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: binder-env
channels:
- conda-forge
dependencies:
- python=3.10
- python=3.11
- geopandas
- libspatialindex
- matplotlib
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,9 @@ def setup_package():
"Topic :: Scientific/Engineering :: GIS",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"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",
],
license="3-Clause BSD",
packages=find_packages(),
Expand Down