From 6481be55c4a6566ec8914c4565df746bb990cdc3 Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 11:31:15 -0400 Subject: [PATCH 1/9] Pinning numpy version in setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a2484e20..27980336 100644 --- a/setup.py +++ b/setup.py @@ -28,6 +28,7 @@ def local_pkg(name: str, relative_path: str) -> str: "scipy", # restart capacities only "h5netcdf", # for xarray "dask", # for xarray + "numpy==1.26.4", ] From e274d6480217a7a44c387194d169b488f7e45e78 Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 11:34:34 -0400 Subject: [PATCH 2/9] Removed python 3.8.12 from testing matrix --- .github/workflows/unit_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index e6ef31bc..fb466150 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.8.12, 3.11.7] + python: [3.11.7] steps: - name: Checkout repository uses: actions/checkout@v3.5.2 From 787c70acf3396aa30ec1ad67aec6f55efe368dd9 Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 11:46:57 -0400 Subject: [PATCH 3/9] Updating lint workflow to use python 3.11.7 --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 0cab2313..7ef52638 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -14,7 +14,7 @@ jobs: - name: Step Python uses: actions/setup-python@v4.6.0 with: - python-version: '3.8.12' + python-version: '3.11.7' - name: Install OpenMPI for gt4py run: | sudo apt-get install libopenmpi-dev From da2d5ee80e116ac9607cbd7d2216d9ddbf61ea11 Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 12:25:53 -0400 Subject: [PATCH 4/9] Changed action/checkout to version 4 --- .github/workflows/unit_tests.yaml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index fb466150..913ff973 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -11,7 +11,7 @@ jobs: python: [3.11.7] steps: - name: Checkout repository - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v4 with: submodules: 'recursive' - name: Setup Python diff --git a/setup.py b/setup.py index 27980336..648f4fbf 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def local_pkg(name: str, relative_path: str) -> str: "scipy", # restart capacities only "h5netcdf", # for xarray "dask", # for xarray - "numpy==1.26.4", + # "numpy==1.26.4", ] From ee8aa85b254701ccda7cf42449370ad3d4884eab Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 12:30:22 -0400 Subject: [PATCH 5/9] Re-pinning numpy --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 648f4fbf..27980336 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def local_pkg(name: str, relative_path: str) -> str: "scipy", # restart capacities only "h5netcdf", # for xarray "dask", # for xarray - # "numpy==1.26.4", + "numpy==1.26.4", ] From b21263edfc697f9cf223622e0c381f2deff4bc2e Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 13:51:49 -0400 Subject: [PATCH 6/9] Looking at pip list --- .github/workflows/unit_tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 913ff973..4e16b9ff 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -25,6 +25,7 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel pip install .[test] + pip list - name: Run serial-cpu tests run: | coverage run --rcfile=setup.cfg -m pytest -x tests From 45260315b253b768e25efea71034d036ee869174 Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 15:23:22 -0400 Subject: [PATCH 7/9] Pinned other requirements --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 27980336..1d2cbc2b 100644 --- a/setup.py +++ b/setup.py @@ -24,11 +24,13 @@ def local_pkg(name: str, relative_path: str) -> str: "xarray", "f90nml>=1.1.0", "fsspec", - "netcdf4", + "netcdf4==1.7.0", "scipy", # restart capacities only "h5netcdf", # for xarray - "dask", # for xarray + "dask==2024.5.2", # for xarray "numpy==1.26.4", + "importlib_metadata==7.1.0", + "Faker==25.8.0", ] From 5cc229f2a79ecc8ce3dfe0f8eac00811c56359aa Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Thu, 20 Jun 2024 16:00:18 -0400 Subject: [PATCH 8/9] Only pinning what needs to be pinned --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 1d2cbc2b..abb1ccf9 100644 --- a/setup.py +++ b/setup.py @@ -27,10 +27,8 @@ def local_pkg(name: str, relative_path: str) -> str: "netcdf4==1.7.0", "scipy", # restart capacities only "h5netcdf", # for xarray - "dask==2024.5.2", # for xarray + "dask", # for xarray "numpy==1.26.4", - "importlib_metadata==7.1.0", - "Faker==25.8.0", ] From 7c5326d76b4eae3f3866249c87c93853906ffdb9 Mon Sep 17 00:00:00 2001 From: Frank Malatino Date: Fri, 21 Jun 2024 07:50:32 -0400 Subject: [PATCH 9/9] Removing call to pip list from unit_tests.yaml --- .github/workflows/unit_tests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 4e16b9ff..913ff973 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -25,7 +25,6 @@ jobs: run: | python -m pip install --upgrade pip setuptools wheel pip install .[test] - pip list - name: Run serial-cpu tests run: | coverage run --rcfile=setup.cfg -m pytest -x tests