Skip to content

Commit d88b07f

Browse files
committed
Create second environment file to test conda-forge package
1 parent 9f7b92e commit d88b07f

4 files changed

Lines changed: 35 additions & 7 deletions

File tree

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ jobs:
217217
with:
218218
miniconda-version: "latest"
219219
auto-update-conda: true
220-
environment-file: environment.yml
220+
environment-file: mhkit/tests/conda-forge/environment.yml
221221
activate-environment: TEST
222222
python-version: ${{ matrix.python-version }}
223223
use-only-tar-bz2: false
224224

225225
- name: Create MHKiT Conda environment
226226
shell: bash -l {0}
227227
run: |
228-
conda env create -f environment.yml
228+
conda env create -f mhkit/tests/conda-forge/environment.yml
229229
conda activate mhkit-env
230230
231231
- name: Install testing dependencies
@@ -238,7 +238,7 @@ jobs:
238238
shell: bash -l {0}
239239
run: |
240240
conda activate mhkit-env
241-
pip install -e ".[all,dev]"
241+
pip install -e ".[all,dev]" --no-deps
242242
243243
- name: Run pytest & generate coverage report
244244
shell: bash -l {0}

environment.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ channels:
55
dependencies:
66
- python>=3.10,<3.13
77
- pip
8-
- h5py>=3.11.0
9-
- h5pyd>=0.18.0
108
- hdf5>=1.14.3,<1.14.5.0a0
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: mhkit-env
2+
channels:
3+
- conda-forge
4+
- defaults
5+
dependencies:
6+
- python>=3.10,<3.13
7+
- pip
8+
- numpy>=2.0.0
9+
- pandas>=2.2.2
10+
- scipy>=1.14.0
11+
- xarray>=2024.6.0
12+
- scikit-learn>=1.5.1
13+
- h5py>=3.11.0
14+
- h5pyd>=0.18.0
15+
- netCDF4>=1.6.5
16+
- hdf5>=1.14.3,<1.14.5.0a0
17+
- statsmodels>=0.14.2
18+
- requests
19+
- beautifulsoup4
20+
- numexpr>=2.10.0
21+
- lxml
22+
- bottleneck
23+
- pecos>=0.3.0
24+
- notebook
25+
- matplotlib>=3.9.1
26+
- fatpack
27+
- nrel-rex
28+
- cartopy

pyproject.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,14 @@ wave = [
4242
"beautifulsoup4",
4343
"bottleneck",
4444
"lxml",
45-
"pyarrow"
45+
"pyarrow",
46+
"h5py>=3.11.0",
47+
"h5pyd>=0.18.0",
4648
]
4749

4850
tidal = [
4951
"netCDF4>=1.7.1.post1",
50-
"bottleneck"
52+
"bottleneck",
5153
]
5254

5355
river = [

0 commit comments

Comments
 (0)