diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml index c77de30..296dae5 100644 --- a/.github/workflows/pre-commit.yaml +++ b/.github/workflows/pre-commit.yaml @@ -10,6 +10,14 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - uses: pre-commit/action@v2.0.0 + - uses: actions/checkout@v3 + - name: Install Conda environment with Micromamba + uses: mamba-org/provision-with-micromamba@v13 + with: + environment-file: environment.yml + channels: conda-forge + cache-env: true + - name: Install package + run: | + python -m pip install --no-deps -e . + - uses: pre-commit/action@v3.0.0 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a243aa6..a7ea46b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ ci: autofix_prs: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.3.0 hooks: - id: check-added-large-files - id: check-yaml @@ -14,12 +14,12 @@ repos: - id: isort - repo: https://github.com/psf/black - rev: 22.1.0 + rev: 22.8.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 4.0.1 + rev: 5.0.4 hooks: - id: flake8 diff --git a/docs/api.md b/docs/api.md index 053c3df..2c5888d 100644 --- a/docs/api.md +++ b/docs/api.md @@ -2,6 +2,14 @@ # nsv + + +# nsv.\_version + + + +# nsv.utils + # nsv.standardizer @@ -181,14 +189,6 @@ Standardized Meteor cruise POS503 - `Dataset` - Standardized dataset - - -# nsv.utils - - - -# nsv.\_version - # nsv.section\_finder diff --git a/environment.yml b/environment.yml index 4bde3a3..b0bc870 100644 --- a/environment.yml +++ b/environment.yml @@ -10,7 +10,7 @@ dependencies: - pandas - pooch - scipy - - xarray + - xarray<=2022.03.0 - numpy - matplotlib - ipython diff --git a/nsv/standardizer.py b/nsv/standardizer.py index 1c82c19..cbd8a3f 100644 --- a/nsv/standardizer.py +++ b/nsv/standardizer.py @@ -145,7 +145,7 @@ def _interpolate_latrabjarg_bathymetry(self, dist_coord: DataArray) -> Dataset: ds = ds.interp(**{dist_coord.name: dist_coord.values}) ds = ds.rename_dims({dist_coord.name: "station"}) ds = ds.reset_index(["X"]).reset_coords(["X"]) - + return ds def _initialize_latrabjarg(self, mat) -> Dataset: diff --git a/setup.cfg b/setup.cfg index 80987d1..6ab59fb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,7 +11,7 @@ install_requires = pandas pooch scipy - xarray + xarray<=2022.03.0 geopy xoak python_requires = >=3.8