From be826a67073cdb4bbc71f8b6dbd4db832d12c18e Mon Sep 17 00:00:00 2001 From: Tom Kelly Date: Sun, 6 Nov 2022 19:58:54 +0000 Subject: [PATCH 1/4] Update setup.cfg update numba version --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7530e7d0..9f0255cf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = aquacrop -version = 2.2 +version = 2.2.1 author = Thomas Kelly author_email = thomas.kelly-2@manchester.ac.uk description = Soil-Crop-Water model based on AquaCrop-OS. @@ -23,13 +23,13 @@ classifiers = [options] install_requires = - numba==0.55.0 + numba>=0.56.0 numpy>=1.18.0,<1.22.0 pandas>=1.3.5 tqdm>=4.64.0 cffi==1.15.0 setup_requires = - numba==0.55.0 + numba>=0.56.0 numpy>=1.18.0,<1.22.0 pandas>=1.3.5 tqdm>=4.64.0 From 2e3d98ca4c77aef1946d2deba8817dbdd0afe9c6 Mon Sep 17 00:00:00 2001 From: Tom Kelly Date: Sun, 6 Nov 2022 20:01:10 +0000 Subject: [PATCH 2/4] Update requirements.txt update version --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ad6d1bf0..b361502c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -numba==0.55.0 +numba>=0.56.0 numpy>=1.18.0,<1.22.0 pandas>=1.3.5 tqdm>=4.64.0 -cffi==1.15.0 \ No newline at end of file +cffi==1.15.0 From 0fc23ca853b5d72363837dc9c18b2afea11c445d Mon Sep 17 00:00:00 2001 From: Tom Kelly Date: Sun, 6 Nov 2022 20:05:59 +0000 Subject: [PATCH 3/4] Update unittest.yml stop running 3.11 --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 0083ceae..e2de41e6 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.7, 3.8, 3.9, 3] + python-version: [3.7, 3.8, 3.9, 3.10] os: [ubuntu-latest, windows-latest, macOS-latest] steps: - uses: actions/checkout@v3 From ddc12a3e65135ba56eac5849222eb3c13c089f1b Mon Sep 17 00:00:00 2001 From: Tom Kelly Date: Sun, 6 Nov 2022 20:08:31 +0000 Subject: [PATCH 4/4] Update unittest.yml 3.10 string --- .github/workflows/unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index e2de41e6..1ef2760c 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.7, 3.8, 3.9, 3.10] + python-version: [3.7, 3.8, 3.9, '3.10'] os: [ubuntu-latest, windows-latest, macOS-latest] steps: - uses: actions/checkout@v3