From a31c6fcb03c29b497d3281357a7fd0cafe81fa9e Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 13 Jul 2024 18:18:45 -0400 Subject: [PATCH 1/5] support 312, ect --- .github/workflows/build_docs.yml | 2 +- .github/workflows/testing.yml | 32 ++++++++++++++-------------- ci/{310.yaml => 310-latest.yaml} | 2 -- ci/{39-MIN.yaml => 310-oldest.yaml} | 2 +- ci/{311-DEV.yaml => 311-latest.yaml} | 6 ++++-- ci/312-dev.yaml | 20 +++++++++++++++++ ci/{311.yaml => 312-latest.yaml} | 4 +--- ci/39-oldest.yaml | 15 +++++++++++++ pyproject.toml | 3 --- 9 files changed, 58 insertions(+), 28 deletions(-) rename ci/{310.yaml => 310-latest.yaml} (92%) rename ci/{39-MIN.yaml => 310-oldest.yaml} (92%) rename ci/{311-DEV.yaml => 311-latest.yaml} (77%) create mode 100644 ci/312-dev.yaml rename ci/{311.yaml => 312-latest.yaml} (90%) create mode 100644 ci/39-oldest.yaml diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 9618dfa..0bd0f75 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -19,7 +19,7 @@ strategy: matrix: os: ['ubuntu-latest'] - environment-file: [ci/311.yaml] + environment-file: [ci/312-latest.yaml] experimental: [false] defaults: run: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index f261d6d..f327be8 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -30,17 +30,25 @@ jobs: matrix: os: [ubuntu-latest] environment-file: - - ci/39-MIN.yaml - - ci/310.yaml - - ci/311.yaml - - ci/311-DEV.yaml + - ci/39-oldest.yaml + - ci/310-oldest.yaml + - ci/310-latest.yaml + - ci/311-latest.yaml + - ci/312-latest.yaml + - ci/312-dev.yaml include: - - environment-file: ci/311.yaml - os: macos-latest - - environment-file: ci/311.yaml + - environment-file: ci/312-latest.yaml + os: macos-13 # Intel + - environment-file: ci/312-latest.yaml + os: macos-14 # Apple Silicon + - environment-file: ci/312.yaml os: windows-latest fail-fast: false - + + defaults: + run: + shell: bash -l {0} + steps: - name: checkout repo uses: actions/checkout@v4 @@ -51,15 +59,7 @@ jobs: environment-file: ${{ matrix.environment-file }} micromamba-version: 'latest' - - name: install bleeding edge libpysal & spreg (Ubuntu / latest Python) - shell: bash -l {0} - run: | - pip install git+https://github.com/pysal/libpysal.git@main - pip install git+https://github.com/pysal/spreg.git@main - if: matrix.os == 'ubuntu-latest' && contains(matrix.environment-file, 'DEV') - - name: environment info - shell: bash -l {0} run: | micromamba info micromamba list diff --git a/ci/310.yaml b/ci/310-latest.yaml similarity index 92% rename from ci/310.yaml rename to ci/310-latest.yaml index e456648..48fd400 100644 --- a/ci/310.yaml +++ b/ci/310-latest.yaml @@ -4,10 +4,8 @@ channels: dependencies: - python=3.10 # required - - git - libpysal - numpy - - pip - scipy - spreg # testing diff --git a/ci/39-MIN.yaml b/ci/310-oldest.yaml similarity index 92% rename from ci/39-MIN.yaml rename to ci/310-oldest.yaml index 820fd96..fb6ca67 100644 --- a/ci/39-MIN.yaml +++ b/ci/310-oldest.yaml @@ -2,7 +2,7 @@ name: test channels: - conda-forge dependencies: - - python=3.9 + - python=3.10 # required - git - libpysal=4.5 diff --git a/ci/311-DEV.yaml b/ci/311-latest.yaml similarity index 77% rename from ci/311-DEV.yaml rename to ci/311-latest.yaml index b1c9a28..8375072 100644 --- a/ci/311-DEV.yaml +++ b/ci/311-latest.yaml @@ -4,8 +4,10 @@ channels: dependencies: - python=3.11 # required - - git - - pip + - libpysal + - numpy + - scipy + - spreg # testing - codecov - pytest diff --git a/ci/312-dev.yaml b/ci/312-dev.yaml new file mode 100644 index 0000000..f59bd24 --- /dev/null +++ b/ci/312-dev.yaml @@ -0,0 +1,20 @@ +name: test +channels: + - conda-forge +dependencies: + - python=3.12 + # required + - git + - pip + # testing + - codecov + - pytest + - pytest-cov + - pytest-xdist + - pip: + # dev versions of packages + - --pre --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple --extra-index-url https://pypi.org/simple + - numpy + - scipy + - pip install git+https://github.com/pysal/libpysal.git@main + - pip install git+https://github.com/pysal/spreg.git@main diff --git a/ci/311.yaml b/ci/312-latest.yaml similarity index 90% rename from ci/311.yaml rename to ci/312-latest.yaml index dd08ad3..9c76230 100644 --- a/ci/311.yaml +++ b/ci/312-latest.yaml @@ -2,12 +2,10 @@ name: test channels: - conda-forge dependencies: - - python=3.11 + - python=3.12 # required - - git - libpysal - numpy - - pip - scipy - spreg # testing diff --git a/ci/39-oldest.yaml b/ci/39-oldest.yaml new file mode 100644 index 0000000..5530733 --- /dev/null +++ b/ci/39-oldest.yaml @@ -0,0 +1,15 @@ +name: test +channels: + - conda-forge +dependencies: + - python=3.9 + # required + - libpysal=4.5 + - numpy=1.23 + - scipy=1.8 + - spreg=1.2 + # testing + - codecov + - pytest + - pytest-cov + - pytest-xdist diff --git a/pyproject.toml b/pyproject.toml index 38753c9..dc56ae8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,9 +16,6 @@ keywords = ["spatial statistics"] readme = "README.md" classifiers = [ "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent", "Intended Audience :: Science/Research", From 4a10bc79341d3baca8000c32d1c0fef98d6134ef Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 13 Jul 2024 18:22:07 -0400 Subject: [PATCH 2/5] trigger From 3cdb6906e27cbc9cf1a43e78f06cd8b631d7f385 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 13 Jul 2024 18:24:10 -0400 Subject: [PATCH 3/5] update env name --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index f327be8..19e8d50 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -41,7 +41,7 @@ jobs: os: macos-13 # Intel - environment-file: ci/312-latest.yaml os: macos-14 # Apple Silicon - - environment-file: ci/312.yaml + - environment-file: ci/312-latest.yaml os: windows-latest fail-fast: false From 937882ad20863de5f0f7f743c72505d54b1f3f5e Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sat, 13 Jul 2024 18:27:15 -0400 Subject: [PATCH 4/5] declared defaults twice --- .github/workflows/testing.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 19e8d50..0e77f3b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -44,14 +44,12 @@ jobs: - environment-file: ci/312-latest.yaml os: windows-latest fail-fast: false - - defaults: - run: - shell: bash -l {0} - + steps: - name: checkout repo uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch all history for all branches and tags. - name: setup micromamba uses: mamba-org/setup-micromamba@v1 From 02eccba9b02f796058f05e97cb64c53b25415882 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Sun, 14 Jul 2024 11:10:37 -0400 Subject: [PATCH 5/5] remove pip install from pip section --- ci/312-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/312-dev.yaml b/ci/312-dev.yaml index f59bd24..e136571 100644 --- a/ci/312-dev.yaml +++ b/ci/312-dev.yaml @@ -16,5 +16,5 @@ dependencies: - --pre --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple --extra-index-url https://pypi.org/simple - numpy - scipy - - pip install git+https://github.com/pysal/libpysal.git@main - - pip install git+https://github.com/pysal/spreg.git@main + - git+https://github.com/pysal/libpysal.git@main + - git+https://github.com/pysal/spreg.git@main