Skip to content

Commit 90b3e22

Browse files
committed
Merge branch 'reqt' of github.com:ICESat2-SlideRule/sliderule-python into reqt
2 parents 0724760 + dd6d317 commit 90b3e22

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Tests
22

33
on:
44
push:
5-
branches: "*"
5+
branches: main
66
pull_request:
77
branches: main
88

@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
CONDA_ENV: [3.8, 3.9]
16+
CONDA_ENV: [3.8, 3.9, unpinned]
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2

ci/environment-3.8.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- python=3.8
6-
- geopandas
7-
- numpy
6+
- geopandas-base
87
- pip
98
- pytest
109
- requests

ci/environment-3.9.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- python=3.9
6-
- geopandas
7-
- numpy
6+
- geopandas-base
87
- pip
98
- pytest
109
- requests

ci/environment-unpinned.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
name: sliderule-ci
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python
6+
- pip
7+
- pytest

0 commit comments

Comments
 (0)