Skip to content

Commit

Permalink
Merge pull request #5 from nfb2021/master_tmp
Browse files Browse the repository at this point in the history
Master tmp
  • Loading branch information
nfb2021 authored Sep 18, 2024
2 parents 933bc80 + 89e7ec0 commit 46b1e0a
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
3 changes: 2 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ dependencies:
- numpy
- matplotlib
- cartopy>=0.21
- pyproj
- h5netcdf
- pip
- pip:
- parse
- colorcet
- scipy
- seaborn
- pygeogrids
- pyproj
- pytest
- pytest-cov
- pytesmo
4 changes: 3 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/qa4sm_reader/plotting_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit 46b1e0a

Please sign in to comment.