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 aac0c15..fe8d979 100644 --- a/environment.yml +++ b/environment.yml @@ -9,14 +9,15 @@ dependencies: - numpy - matplotlib - cartopy>=0.21 +- pyproj - h5netcdf - pip - pip: - parse - colorcet + - scipy - seaborn - pygeogrids - - pyproj - pytest - pytest-cov - pytesmo diff --git a/setup.cfg b/setup.cfg index b65ba87..f15a903 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,13 +28,15 @@ install_requires = xarray pandas numpy + netcdf4 matplotlib seaborn cartopy colorcet parse + scipy + pygeogrids pytesmo - # The usage of test_requires is discouraged, see `Dependency Management` docs # tests_require = pytest; pytest-cov # Require a specific Python version, e.g. Python 2.7 or >= 3.4 diff --git a/src/qa4sm_reader/plotting_methods.py b/src/qa4sm_reader/plotting_methods.py index 3d067df..1596747 100644 --- a/src/qa4sm_reader/plotting_methods.py +++ b/src/qa4sm_reader/plotting_methods.py @@ -1381,6 +1381,7 @@ def _dict2df(to_plot_dict: dict, meta_key: str) -> pd.DataFrame: range_grouped = pd.concat(range_grouped, axis=0) to_plot_df.append(range_grouped) to_plot_df = pd.concat(to_plot_df, axis=0) + return to_plot_df