From b46587bcaa2ccc84f48afd3b131490803be0424d Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Wed, 2 Oct 2024 15:20:49 -0600 Subject: [PATCH 1/5] Update Python versions used for testing Note that *pymt* currently doesn't work on 3.12, so it's omitted for now. --- .github/workflows/test-notebooks.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-notebooks.yml b/.github/workflows/test-notebooks.yml index 6464a5e1..f20bd46c 100644 --- a/.github/workflows/test-notebooks.yml +++ b/.github/workflows/test-notebooks.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: [3.9] + python-version: ["3.11"] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e29f722a..92e1c4d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.8, 3.9] + python-version: ["3.10", "3.11"] steps: - uses: actions/checkout@v2 @@ -66,5 +66,5 @@ jobs: pytest --cov=pymt --cov-report=xml:$(pwd)/coverage.xml -vvv - name: Coveralls - if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' + if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' uses: AndreMiras/coveralls-python-action@v20201129 From c0234a2f5008a86e4b480b52aba7e2293318e244 Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Wed, 2 Oct 2024 15:25:56 -0600 Subject: [PATCH 2/5] Bump versions of checkout and setup-miniconda actions --- .github/workflows/test-notebooks.yml | 5 ++--- .github/workflows/test.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-notebooks.yml b/.github/workflows/test-notebooks.yml index f20bd46c..c33fdf20 100644 --- a/.github/workflows/test-notebooks.yml +++ b/.github/workflows/test-notebooks.yml @@ -23,9 +23,9 @@ jobs: python-version: ["3.11"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: miniforge-variant: Mambaforge miniforge-version: latest @@ -39,7 +39,6 @@ jobs: - name: Install requirements run: | mamba install --file=requirements.txt - mamba install gimli.units mamba list - name: Build and install package diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 92e1c4d3..7f9cbd75 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,9 +23,9 @@ jobs: python-version: ["3.10", "3.11"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: miniforge-variant: Mambaforge miniforge-version: latest @@ -39,7 +39,6 @@ jobs: - name: Install requirements run: | mamba install --file=requirements.txt --file=requirements-testing.txt - mamba install gimli.units mamba list - name: Install Windows requirements From a5944ec875475ec0115833ac3d2ce3d1a42037c5 Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Wed, 2 Oct 2024 15:34:16 -0600 Subject: [PATCH 3/5] Restrict Python version to 3.10 This is because of the scipy issue (#162), yet to be fixed. --- .github/workflows/test-notebooks.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-notebooks.yml b/.github/workflows/test-notebooks.yml index c33fdf20..2654532a 100644 --- a/.github/workflows/test-notebooks.yml +++ b/.github/workflows/test-notebooks.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] - python-version: ["3.11"] + python-version: ["3.10"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f9cbd75..aafd94de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.10", "3.11"] + python-version: ["3.10"] steps: - uses: actions/checkout@v4 @@ -65,5 +65,5 @@ jobs: pytest --cov=pymt --cov-report=xml:$(pwd)/coverage.xml -vvv - name: Coveralls - if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11' + if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.10' uses: AndreMiras/coveralls-python-action@v20201129 From a46e6fbe5298114b7cf100079d80964c1a3fc45c Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Wed, 2 Oct 2024 15:52:35 -0600 Subject: [PATCH 4/5] Lift numpy version restriction The downstream problem https://github.com/permamodel/permamodel/issues/72 was fixed. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 601a674a..6ba27350 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ landlab>=2 matplotlib model_metadata>=0.7 netcdf4 -numpy<1.24 # for Ku pyyaml scipy<1.9 # see #162 shapely<2 # see #164 From 2686d10571f7856363b67d987184e783573d6341 Mon Sep 17 00:00:00 2001 From: Mark Piper Date: Wed, 2 Oct 2024 15:04:51 -0600 Subject: [PATCH 5/5] Require latest version of gimli.units --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 6ba27350..2476dac6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ click deprecated +gimli.units>=0.3.2 jinja2 landlab>=2 matplotlib