Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pin xarray #29

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

pin xarray #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cfcc86e
pin xarray
malmans2 Oct 4, 2022
dc6b30c
update actions
malmans2 Oct 4, 2022
1e1b56c
try to fix pre-commit
malmans2 Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .github/workflows/pre-commit.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
16 changes: 8 additions & 8 deletions docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

# nsv

<a id="nsv._version"></a>

# nsv.\_version

<a id="nsv.utils"></a>

# nsv.utils

<a id="nsv.standardizer"></a>

# nsv.standardizer
Expand Down Expand Up @@ -181,14 +189,6 @@ Standardized Meteor cruise POS503

- `Dataset` - Standardized dataset

<a id="nsv.utils"></a>

# nsv.utils

<a id="nsv._version"></a>

# nsv.\_version

<a id="nsv.section_finder"></a>

# nsv.section\_finder
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- pandas
- pooch
- scipy
- xarray
- xarray<=2022.03.0
- numpy
- matplotlib
- ipython
Expand Down
2 changes: 1 addition & 1 deletion nsv/standardizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ install_requires =
pandas
pooch
scipy
xarray
xarray<=2022.03.0
geopy
xoak
python_requires = >=3.8
Expand Down