Skip to content

Commit decba75

Browse files
authored
Merge pull request #676 from British-Oceanographic-Data-Centre/675_scipy_integrate_cumtrapz_update
- 675 scipy integrate cumtrapz update - Updated config files (setup.py and environment.yml) to install dependencies using conda commands. - Added specific versions to dependencies in config files. - Replaced pip install command for conda install command in workflows config files. - Fixed some unit tests.
2 parents 06af058 + 4d81d83 commit decba75

File tree

69 files changed

+763
-1563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+763
-1563
lines changed

.github/workflows/build_package.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: [ '3.8', '3.9', '3.10' ]
13+
python-version: [ '3.9', '3.10' ]
1414

1515
steps:
1616
- uses: actions/checkout@v4
@@ -21,7 +21,10 @@ jobs:
2121
- name: Install dependencies
2222
run: |
2323
python -m pip install --upgrade pip virtualenv
24-
python -m pip install -r requirements.txt
24+
CONDA_BASE=$(conda info --base)
25+
source "${CONDA_BASE}/etc/profile.d/conda.sh"
26+
conda env update --prune --file environment.yml
27+
conda activate coast
2528
- name: Shell Script Permissions
2629
run: |
2730
chmod +x *.sh
@@ -33,7 +36,7 @@ jobs:
3336
./build.sh
3437
- name: Test Package Install
3538
run: |
36-
python -m pip install dist/COAsT-*.tar.gz
39+
python -m pip install dist/coast-*.tar.gz
3740
- name: Generate Conda Metadata
3841
run: |
3942
./generate_conda_meta.sh

.github/workflows/markdown-altimetry.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
repository: British-Oceanographic-Data-Centre/COAsT
21-
ref: develop
21+
ref: ${{ github.head_ref }}
2222
path: external
2323

24-
- name: Prepare environement
24+
- name: Prepare environment
2525
uses: conda-incubator/setup-miniconda@v2
2626
with:
2727
activate-environment: coast

.github/workflows/markdown-general.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
repository: British-Oceanographic-Data-Centre/COAsT
21-
ref: develop
21+
ref: ${{ github.head_ref }}
2222
path: external
2323

2424
- name: Prepare environment

.github/workflows/markdown-gridded.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
repository: British-Oceanographic-Data-Centre/COAsT
21-
ref: develop
21+
ref: ${{ github.head_ref }}
2222
path: external
2323

24-
- name: Prepare environement
24+
- name: Prepare environment
2525
uses: conda-incubator/setup-miniconda@v2
2626
with:
2727
activate-environment: coast

.github/workflows/markdown-profile.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
repository: British-Oceanographic-Data-Centre/COAsT
21-
ref: develop
21+
ref: ${{ github.head_ref }}
2222
path: external
2323

24-
- name: Prepare environement
24+
- name: Prepare environment
2525
uses: conda-incubator/setup-miniconda@v2
2626
with:
2727
activate-environment: coast

.github/workflows/markdown-tidegauge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
repository: British-Oceanographic-Data-Centre/COAsT
21-
ref: develop
21+
ref: ${{ github.head_ref }}
2222
path: external
2323

24-
- name: Prepare environement
24+
- name: Prepare environment
2525
uses: conda-incubator/setup-miniconda@v2
2626
with:
2727
activate-environment: coast

.github/workflows/verify_package.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: [ '3.8', '3.9', '3.10' ]
11+
python-version: [ '3.9', '3.10' ]
1212

1313
steps:
1414
- uses: actions/checkout@v4
@@ -19,7 +19,10 @@ jobs:
1919
- name: Install dependencies
2020
run: |
2121
python -m pip install --upgrade pip
22-
pip install -r requirements.txt
22+
CONDA_BASE=$(conda info --base)
23+
source "${CONDA_BASE}/etc/profile.d/conda.sh"
24+
conda env update --prune --file environment.yml
25+
conda activate coast
2326
- name: Lint with flake8
2427
run: |
2528
pip install flake8
@@ -29,10 +32,10 @@ jobs:
2932
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
3033
- name: Test with pytest
3134
run: |
32-
pip install dask[complete]
33-
pip install -r requirements.txt
35+
CONDA_BASE=$(conda info --base)
36+
source "${CONDA_BASE}/etc/profile.d/conda.sh"
37+
conda env update --prune --file environment.yml
38+
conda activate coast
3439
sudo apt-get update
3540
sudo apt-get install -y libgeos-dev
36-
pip install cartopy==0.21.0
37-
pip install zarr
3841
pytest tests

coast/_utils/docsy_tools.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""A class to help with writting markdown."""
2+
23
from typing import List, Type
34

45

coast/_utils/general_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""A general utility file."""
2+
23
import xarray as xr
34
import numpy as np
45
import sklearn.neighbors as nb

coast/_utils/logging_util.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""A logging unilty file"""
2+
23
import logging
34
import sys
45
import io

0 commit comments

Comments
 (0)