From be15af79e7262d0072c50c256df4cd334a81463f Mon Sep 17 00:00:00 2001 From: Wolfgang Preimesberger Date: Wed, 11 Sep 2024 21:53:18 +0200 Subject: [PATCH] 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