Skip to content

Commit db29aab

Browse files
committed
Fix conda for GitHub Actions
1 parent 85f798e commit db29aab

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/build_workflow.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
needs: check-jobs-to-skip
5555
if: ${{ needs.check-jobs-to-skip.outputs.should_skip != 'true' }}
5656
runs-on: ubuntu-latest
57+
timeout-minutes: 15
5758
strategy:
5859
matrix:
5960
python-version: ["3.11", "3.12", "3.13"]
@@ -79,7 +80,7 @@ jobs:
7980
miniforge-variant: Miniforge3
8081
miniforge-version: latest
8182
environment-file: conda/dev.yml
82-
channel-priority: flexible # Changed from strict to flexible
83+
channel-priority: strict
8384
auto-update-conda: true
8485
python-version: ${{ matrix.python-version }}
8586
channels: conda-forge
@@ -142,7 +143,7 @@ jobs:
142143
# miniforge-variant: Miniforge3
143144
# miniforge-version: latest
144145
# environment-file: conda/dev.yml
145-
# channel-priority: flexible # Changed from strict to flexible
146+
# channel-priority: strict
146147
# auto-update-conda: true
147148
# python-version: "3.13" # Use stable Python version for docs
148149

conda/dev.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ dependencies:
1818
- beautifulsoup4
1919
- lxml
2020
- matplotlib-base >=3.8.2,<3.10
21-
- mpas_tools >=0.21.0
21+
- mpas_tools
2222
- netcdf4
23-
- numpy >=2.0,< 2.1.0
23+
- numpy >=2.0,<3.0
2424
- output_viewer=1.3.3
25-
- pcmdi_metrics
25+
- pcmdi_metrics>=3.9.3
2626
- xarray >=2023.02.0
2727
- xcdat >=0.7.3,<1.0
2828
# Testing
@@ -41,10 +41,13 @@ dependencies:
4141
- black ==25.1.0
4242
- flake8 ==7.3.0
4343
- isort ==6.0.1
44-
- mypy ==1.18.2
44+
#- mypy ==1.18.2
4545
- pre-commit ==4.3.0
4646
- types-PyYAML >=6.0.0
4747
# Developer Tools
4848
# =======================
4949
- tbump=6.9.0
5050
- ipykernel
51+
# pip dependencies
52+
- pip:
53+
- mypy==1.18.2

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies = [
2323
"matplotlib >=3.8.2,<3.10",
2424
"netcdf4",
2525
"numpy >=2.0,<3.0",
26+
"pcmdi_metrics>=3.9.3",
2627
"xarray >=2023.02.0",
2728
"xcdat >=0.7.3,<1.0",
2829
]

0 commit comments

Comments
 (0)