From 76c1439f37de9a8de2d2247f165b1bfafed0bf10 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Thu, 23 Dec 2021 14:00:38 -0500 Subject: [PATCH 1/8] attempt 3.10 in CI --- .github/workflows/unittests.yml | 2 +- ci/310.yaml | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 ci/310.yaml diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index fd294764..094f7d87 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -24,7 +24,7 @@ strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml] + environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/10.yaml] include: - environment-file: ci/39-BASE.yaml os: ubuntu-latest diff --git a/ci/310.yaml b/ci/310.yaml new file mode 100644 index 00000000..fda2134e --- /dev/null +++ b/ci/310.yaml @@ -0,0 +1,27 @@ +name: test +channels: + - conda-forge +dependencies: + - python=3.10 + # required + - esda + - libpysal + - numpy + - pandas>=1.0 + - pip + - rtree + - scipy>=1.0 + - watermark + # testing/formatting + - black + - codecov + - pytest + - pytest-cov + # optional + - geopandas>=0.7.0 + # for docs build action (this env only) + - nbsphinx + - numpydoc + - sphinx + - sphinxcontrib-bibtex + - sphinx_bootstrap_theme From 231185c04729bccf14ebedec0a65aeb0b54cce0c Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Thu, 23 Dec 2021 14:03:20 -0500 Subject: [PATCH 2/8] fix file name --- .github/workflows/unittests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 094f7d87..6c8c2f3b 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -24,7 +24,7 @@ strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/10.yaml] + environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml] include: - environment-file: ci/39-BASE.yaml os: ubuntu-latest From 68bd3a6a1a205f4144addc41195ea073274d9767 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Thu, 23 Dec 2021 14:17:12 -0500 Subject: [PATCH 3/8] test base and dev on 3.10 --- .github/workflows/unittests.yml | 6 +++--- ci/{39-BASE.yaml => 310-BASE.yaml} | 2 +- ci/{39-DEV.yaml => 310-DEV.yaml} | 2 +- codecov.yml | 2 +- setup.py | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) rename ci/{39-BASE.yaml => 310-BASE.yaml} (93%) rename ci/{39-DEV.yaml => 310-DEV.yaml} (94%) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 6c8c2f3b..8761d935 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -26,9 +26,9 @@ os: [macos-latest, ubuntu-latest, windows-latest] environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml] include: - - environment-file: ci/39-BASE.yaml + - environment-file: ci/310-BASE.yaml os: ubuntu-latest - - environment-file: ci/39-DEV.yaml + - environment-file: ci/310-DEV.yaml os: ubuntu-latest steps: @@ -41,7 +41,7 @@ environment-file: ${{ matrix.environment-file }} micromamba-version: 'latest' - - name: install bleeding edge libpysal & esda (only Ubuntu / Python 3.9) + - name: install bleeding edge libpysal & esda (only Ubuntu / Python 3.10) shell: bash -l {0} run: | pip install git+https://github.com/pysal/libpysal.git@master diff --git a/ci/39-BASE.yaml b/ci/310-BASE.yaml similarity index 93% rename from ci/39-BASE.yaml rename to ci/310-BASE.yaml index 335344cd..3d7ab435 100644 --- a/ci/39-BASE.yaml +++ b/ci/310-BASE.yaml @@ -2,7 +2,7 @@ name: test channels: - conda-forge dependencies: - - python=3.9 + - python=3.10 # required - esda - libpysal diff --git a/ci/39-DEV.yaml b/ci/310-DEV.yaml similarity index 94% rename from ci/39-DEV.yaml rename to ci/310-DEV.yaml index 3628ae4e..ac192339 100644 --- a/ci/39-DEV.yaml +++ b/ci/310-DEV.yaml @@ -2,7 +2,7 @@ name: test channels: - conda-forge dependencies: - - python=3.9 + - python=3.10 # required - numpy - pandas>=1.0 diff --git a/codecov.yml b/codecov.yml index dfe09c1a..0cb52e54 100644 --- a/codecov.yml +++ b/codecov.yml @@ -18,5 +18,5 @@ coverage: comment: layout: "reach, diff, files" behavior: once - after_n_builds: 11 + after_n_builds: 14 require_changes: true diff --git a/setup.py b/setup.py index 421ed525..e32f5c7d 100644 --- a/setup.py +++ b/setup.py @@ -76,6 +76,7 @@ def setup_package(): "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], license="3-Clause BSD", packages=[package], From b2cd2152f511f620ae9274cae47ab1a274a4a753 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Thu, 23 Dec 2021 14:37:14 -0500 Subject: [PATCH 4/8] update codecov --- codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codecov.yml b/codecov.yml index 0cb52e54..1864fb3a 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,6 @@ codecov: notify: - after_n_builds: 11 + after_n_builds: 14 coverage: range: 50..95 round: nearest From 93a057b2493cecc50991ab92e2e7130997ee83e3 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Fri, 24 Dec 2021 10:18:42 -0500 Subject: [PATCH 5/8] slim down testing matrix --- .github/workflows/unittests.yml | 6 +++++- codecov.yml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 8761d935..79c8bf9c 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -30,7 +30,11 @@ os: ubuntu-latest - environment-file: ci/310-DEV.yaml os: ubuntu-latest - + - environment-file: ci/310.yaml + os: macos-latest + - environment-file: ci/310.yaml + os: windows-latest + steps: - name: checkout repo uses: actions/checkout@v2 diff --git a/codecov.yml b/codecov.yml index 1864fb3a..4ab8d72a 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,6 +1,6 @@ codecov: notify: - after_n_builds: 14 + after_n_builds: 8 coverage: range: 50..95 round: nearest @@ -18,5 +18,5 @@ coverage: comment: layout: "reach, diff, files" behavior: once - after_n_builds: 14 + after_n_builds: 8 require_changes: true From 89f0cf18da682c2b1affda9ba86c8b42abad641b Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Fri, 24 Dec 2021 10:20:05 -0500 Subject: [PATCH 6/8] slim down testing matrix [2] --- .github/workflows/unittests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 79c8bf9c..0d4773ac 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -23,7 +23,7 @@ timeout-minutes: 30 strategy: matrix: - os: [macos-latest, ubuntu-latest, windows-latest] + os: [macos-latest] environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml] include: - environment-file: ci/310-BASE.yaml From e9f46a2c226771e518b4866ba23e29746a00f70b Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Fri, 24 Dec 2021 10:21:46 -0500 Subject: [PATCH 7/8] slim down testing matrix [3] --- .github/workflows/unittests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 0d4773ac..b75de798 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -23,7 +23,7 @@ timeout-minutes: 30 strategy: matrix: - os: [macos-latest] + os: [ubuntu-latest] environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml] include: - environment-file: ci/310-BASE.yaml From a5673b9febc6475b68dffaa405cd04e2dabfd008 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Fri, 24 Dec 2021 10:46:27 -0500 Subject: [PATCH 8/8] streamline matrix logic --- .github/workflows/unittests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index b75de798..cb286705 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -24,12 +24,8 @@ strategy: matrix: os: [ubuntu-latest] - environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml] + environment-file: [ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml, ci/310-BASE.yaml, ci/310-DEV.yaml] include: - - environment-file: ci/310-BASE.yaml - os: ubuntu-latest - - environment-file: ci/310-DEV.yaml - os: ubuntu-latest - environment-file: ci/310.yaml os: macos-latest - environment-file: ci/310.yaml