From e0458568338a499aafacbc0ee5aa5b55a212aea8 Mon Sep 17 00:00:00 2001
From: Monika Tercjak <57092960+sheenaze@users.noreply.github.com>
Date: Wed, 11 Sep 2024 21:29:57 +0200
Subject: [PATCH 1/6] Update environment.yml

checking if defining pyscaffold in the env helps fixing the problem with failing tests
---
 environment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environment.yml b/environment.yml
index 1be0bae..a4d3918 100644
--- a/environment.yml
+++ b/environment.yml
@@ -17,5 +17,6 @@ dependencies:
     - seaborn
     - pygeogrids
     - pyproj
+    - pyscaffold
     - pytest
     - pytest-cov

From be15af79e7262d0072c50c256df4cd334a81463f Mon Sep 17 00:00:00 2001
From: Wolfgang Preimesberger <wolfgang.preimesberger@geo.tuwien.ac.at>
Date: Wed, 11 Sep 2024 21:53:18 +0200
Subject: [PATCH 2/6] Update CI and dependency list

---
 .github/workflows/test.yml | 14 +++++++-------
 environment.yml            |  1 +
 setup.cfg                  |  3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a9d2316..421941c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@artifacts
         with:
           miniconda-version: "latest"
           auto-update-conda: true
@@ -50,19 +50,19 @@ jobs:
       - name: Export Environment
         shell: bash -l {0}
         run: |
-          mkdir -p .artifacts
+          mkdir -p artifacts
           filename=env_py${{ matrix.python-version }}_${{ matrix.os }}.yml
-          conda env export --no-builds | grep -v "prefix" > .artifacts/$filename
+          conda env export --no-builds | grep -v "prefix" > artifacts/$filename
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: os_py_environments
-          path: .artifacts/*
+          path: artifacts/*
       - name: Install package and test
         shell: bash -l {0}
         run: |
-          python setup.py install
-          python setup.py test
+          pip install -e .
+          pytest
       - name: Upload Coverage
         shell: bash -l {0}
         run: |
diff --git a/environment.yml b/environment.yml
index 1be0bae..e742819 100644
--- a/environment.yml
+++ b/environment.yml
@@ -14,6 +14,7 @@ dependencies:
 - pip:
     - parse
     - colorcet
+    - scipy
     - seaborn
     - pygeogrids
     - pyproj
diff --git a/setup.cfg b/setup.cfg
index ba18198..b00c85a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,11 +28,14 @@ install_requires =
 	xarray
 	pandas
 	numpy
+    netcdf4
 	matplotlib
 	seaborn
 	cartopy
 	colorcet
     parse
+    scipy
+    pygeogrids
 	
 # The usage of test_requires is discouraged, see `Dependency Management` docs
 # tests_require = pytest; pytest-cov

From 4414cb1af3656bec73e42eac0baeab25237bf665 Mon Sep 17 00:00:00 2001
From: Wolfgang Preimesberger <wolfgang.preimesberger@geo.tuwien.ac.at>
Date: Wed, 11 Sep 2024 22:10:41 +0200
Subject: [PATCH 3/6] Update env

---
 environment.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 20df36e..2040144 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,12 +3,14 @@ channels:
 - defaults
 - conda-forge
 dependencies:
+- python=3.10
 - xarray
 - netcdf4
 - pandas
 - numpy
 - matplotlib
 - cartopy>=0.21
+- pyproj
 - h5netcdf
 - pip
 - pip:
@@ -17,7 +19,5 @@ dependencies:
     - scipy
     - seaborn
     - pygeogrids
-    - pyproj
-    - pyscaffold
     - pytest
     - pytest-cov

From d0a2264d2d450a8a76dc6d1c3837a8689637fed8 Mon Sep 17 00:00:00 2001
From: Wolfgang Preimesberger <wolfgang.preimesberger@geo.tuwien.ac.at>
Date: Wed, 11 Sep 2024 22:12:33 +0200
Subject: [PATCH 4/6] Update CI

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 421941c..c766451 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: true
-      - uses: conda-incubator/setup-miniconda@artifacts
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           miniconda-version: "latest"
           auto-update-conda: true

From b9b822d0492b559e78b20826844e3f2a3e21f6a8 Mon Sep 17 00:00:00 2001
From: Wolfgang Preimesberger <wolfgang.preimesberger@geo.tuwien.ac.at>
Date: Wed, 11 Sep 2024 22:14:58 +0200
Subject: [PATCH 5/6] Update env

---
 environment.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 2040144..2f1e630 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,7 +3,6 @@ channels:
 - defaults
 - conda-forge
 dependencies:
-- python=3.10
 - xarray
 - netcdf4
 - pandas

From af936f65c689e179491ed4d27f547df30a9e2ef1 Mon Sep 17 00:00:00 2001
From: Wolfgang Preimesberger <wolfgang.preimesberger@geo.tuwien.ac.at>
Date: Wed, 11 Sep 2024 22:20:54 +0200
Subject: [PATCH 6/6] Update CI

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c766451..b20a9f8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: os_py_environments
+          name: Artifacts-py${{ matrix.python-version }}-${{ matrix.os }}
           path: artifacts/*
       - name: Install package and test
         shell: bash -l {0}