Skip to content

Commit 9634ee7

Browse files
author
Leah Wasser
authored
clean up envt (#397)
* clean up envt * redo envt * envtt * envt * add envt spec * update build * add envt * rename envt file * add other python versions * oops should be os matrix not py * skip windows 3.6 build fiona problemz
1 parent df14896 commit 9634ee7

5 files changed

Lines changed: 89 additions & 34 deletions

File tree

.github/workflows/run-tests.yml

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,30 @@ on:
1313
- '*'
1414

1515
jobs:
16-
example-1:
17-
name: Ex1 (${{ matrix.python-version }}, ${{ matrix.os }})
16+
runtests:
17+
name: conda (${{ matrix.os }}, ${{ matrix.environment-file }})
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
fail-fast: false
2121
matrix:
2222
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
23-
python-version: [3.6, 3.7, 3.8]
24-
23+
environment-file: [ci/py36-env.yml, ci/py37-env.yml, ci/py38-env.yml]
24+
exclude:
25+
- environment-file: ci/py36-env.yml
26+
os: windows-latest
27+
defaults:
28+
run:
29+
shell: bash -l {0}
2530
steps:
2631
- uses: actions/checkout@v2
27-
- name: Setup Conda
28-
uses: s-weigand/setup-conda@v1
32+
- uses: conda-incubator/setup-miniconda@v2
2933
with:
30-
update-conda: true
31-
conda-channels: conda-forge
32-
python-version: ${{ matrix.python-version }}
33-
34-
- name: Install Env
35-
shell: bash
36-
run: |
37-
python --version
38-
#conda env create -f ci/environment.yml
39-
conda install -c conda-forge matplotlib \
40-
pytest requests \
41-
geopandas rasterio scikit-image \
42-
seaborn descartes
43-
44-
- name: Check Environment
45-
shell: bash
46-
run: |
47-
conda list
48-
python --version
49-
- name: Run Tests
50-
shell: bash
51-
run: |
52-
pytest -v --color=yes
53-
python --version
34+
miniconda-version: 'latest'
35+
channels: conda-forge
36+
channel-priority: true
37+
auto-update-conda: false
38+
auto-activate-base: false
39+
environment-file: ${{ matrix.environment-file }}
40+
activate-environment: matplotcheck-dev
41+
- run: conda list
42+
- run: pytest -v --color=yes

ci/py36-env.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: matplotcheck-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
6+
- python=3.6
7+
# Core scientific python
8+
- matplotlib
9+
- scipy
10+
11+
# Geo stuff
12+
- geopandas
13+
- rasterio
14+
- folium
15+
- pytest-vcr
16+
- pytest-cov
17+
- pytest
18+
- setuptools
19+
- descartes
20+
- seaborn
21+
- pillow
22+
- scikit-image
23+
- requests

ci/py37-env.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: matplotcheck-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
6+
- python=3.7
7+
# Core scientific python
8+
- matplotlib
9+
- scipy
10+
11+
# Geo stuff
12+
- geopandas
13+
- rasterio
14+
- folium
15+
- pytest-vcr
16+
- pytest-cov
17+
- pytest
18+
- setuptools
19+
- descartes
20+
- seaborn
21+
- pillow
22+
- scikit-image
23+
- requests

ci/py38-env.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: matplotcheck-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
6+
- python=3.8
7+
# Core scientific python
8+
- matplotlib
9+
- scipy
10+
11+
# Geo stuff
12+
- geopandas
13+
- rasterio
14+
- folium
15+
- pytest-vcr
16+
- pytest-cov
17+
- pytest
18+
- setuptools
19+
- descartes
20+
- seaborn
21+
- pillow
22+
- scikit-image
23+
- requests

environment.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ channels:
44
dependencies:
55

66
# Core scientific python
7-
- numpy>=1.14.0
8-
- matplotlib>=3.0.0
9-
- python=3.7
7+
- matplotlib
108
- scipy
119

1210
# Geo stuff
13-
- certifi
1411
- geopandas
1512
- rasterio
1613
- folium

0 commit comments

Comments
 (0)