Skip to content

Commit dc294c8

Browse files
committed
simplify matrix test environments
1 parent 85e8743 commit dc294c8

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ on:
88

99
jobs:
1010
test:
11-
name: ${{ matrix.CONDA_ENV }}-build
11+
name: ${{ matrix.CONDA_ENV }}-pytest
1212
runs-on: ubuntu-latest
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
CONDA_ENV: [36, 36-defaults, 37-nodefaults, 37-upstream]
16+
CONDA_ENV: [36, 37, 38, 37-upstream]
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2

ci/environment-py36.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ channels:
44
dependencies:
55
- python=3.6
66
- aiohttp
7-
- intake>=0.4.1
7+
- intake
88
- netcdf4
99
- pip
1010
- pydap
1111
- pytest
1212
- rasterio
1313
- scikit-image
14-
- xarray>=0.11.2
14+
- xarray
1515
- zarr

ci/environment-py37-upstream.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: test_env
22
channels:
33
- conda-forge
4-
- defaults
54
dependencies:
65
- python=3.7
76
- aiohttp
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
name: test_env
22
channels:
33
- conda-forge
4-
- defaults
54
dependencies:
65
- python=3.7
7-
- intake>=0.4.1
6+
- intake
87
- netcdf4
98
- pip
109
- pydap
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
name: test_env
2+
channels:
3+
- conda-forge
24
dependencies:
3-
- python=3.6
4-
- aiohttp
5+
- python=3.8
56
- intake
67
- netcdf4
78
- pip
9+
- pydap
810
- pytest
911
- rasterio
1012
- scikit-image

0 commit comments

Comments
 (0)