From 37d26d116f6ecfcddfd769c378309bfc735c9beb Mon Sep 17 00:00:00 2001
From: Monika Tercjak <57092960+sheenaze@users.noreply.github.com>
Date: Wed, 11 Sep 2024 22:35:55 +0200
Subject: [PATCH] Update environment.yml (#81)

* Update environment.yml

checking if defining pyscaffold in the env helps fixing the problem with failing tests

* Update CI and dependency list

* Update env

* Update CI

* Update env

* Update CI

---------

Co-authored-by: Wolfgang Preimesberger <wolfgang.preimesberger@geo.tuwien.ac.at>
---
 .github/workflows/test.yml | 16 ++++++++--------
 environment.yml            |  3 ++-
 setup.cfg                  |  3 +++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a9d2316..b20a9f8 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@v3
         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/*
+          name: Artifacts-py${{ matrix.python-version }}-${{ matrix.os }}
+          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..2f1e630 100644
--- a/environment.yml
+++ b/environment.yml
@@ -9,13 +9,14 @@ dependencies:
 - numpy
 - matplotlib
 - cartopy>=0.21
+- pyproj
 - h5netcdf
 - pip
 - pip:
     - parse
     - colorcet
+    - scipy
     - seaborn
     - pygeogrids
-    - pyproj
     - pytest
     - pytest-cov
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