Dependency update (#616)

* trying to fix issue with rasterio by pinning gdal

* checking that gdal pin is necessary

* reverting change

* removed gdal pin

* more updates

* added newer deps

* seeing if this fixes CI

* small change

* Update ci/py37-env.yml

* Update ci/py36-env.yml

* Update ci/py38-env.yml

Co-authored-by: Leah Wasser <leah.wasser@colorado.edu>

.github/workflows/run-tests.yml

@@ -13,40 +13,30 @@ on:
       - '*'
 
 jobs:
-  example-1:
-    name: Ex1 (${{ matrix.python-version }}, ${{ matrix.os }})
+  runtests:
+    name: conda (${{ matrix.os }}, ${{ matrix.environment-file }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: [3.6, 3.7, 3.8]
-
+        environment-file: [ci/py36-env.yml, ci/py37-env.yml, ci/py38-env.yml]
+        exclude:
+          - environment-file: ci/py36-env.yml
+            os: windows-latest
+    defaults:
+      run:
+        shell: bash -l {0}
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Conda
-        uses: s-weigand/setup-conda@v1
+      - uses: conda-incubator/setup-miniconda@v2
         with:
-          update-conda: true
-          conda-channels: conda-forge
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install Env
-        shell: bash
-        run: |
-          python --version
-          #conda env create -f ci/environment.yml
-          conda install -c  conda-forge matplotlib \
-            pytest requests  \
-            geopandas rasterio scikit-image
-
-      - name: Check Environment
-        shell: bash
-        run: |
-          conda list
-          python --version
-      - name: Run Tests
-        shell: bash
-        run: |
-          pytest -v --color=yes
-          python --version
+          miniconda-version: 'latest'
+          channels: conda-forge
+          channel-priority: true
+          auto-update-conda: false
+          auto-activate-base: false
+          environment-file: ${{ matrix.environment-file }}
+          activate-environment: earthpy-dev
+      - run: conda list
+      - run: pytest -v --color=yes

ci/py36-env.yml

@@ -0,0 +1,23 @@
+name: earthpy-dev
+channels:
+  - conda-forge
+dependencies:
+
+  - python=3.6
+  # Core scientific python
+  - matplotlib
+  - scipy
+
+  # Geo stuff
+  - geopandas
+  - rasterio
+  - folium
+  - pytest-vcr
+  - pytest-cov
+  - pytest
+  - setuptools
+  - descartes
+  - seaborn
+  - pillow
+  - scikit-image
+  - requests

ci/py37-env.yml

@@ -0,0 +1,23 @@
+name: earthpy-dev
+channels:
+  - conda-forge
+dependencies:
+
+  - python=3.7
+  # Core scientific python
+  - matplotlib
+  - scipy
+
+  # Geo stuff
+  - geopandas
+  - rasterio
+  - folium
+  - pytest-vcr
+  - pytest-cov
+  - pytest
+  - setuptools
+  - descartes
+  - seaborn
+  - pillow
+  - scikit-image
+  - requests

ci/py38-env.yml

@@ -0,0 +1,23 @@
+name: earthpy-dev
+channels:
+  - conda-forge
+dependencies:
+
+  - python=3.8
+  # Core scientific python
+  - matplotlib
+  - scipy
+
+  # Geo stuff
+  - geopandas
+  - rasterio
+  - folium
+  - pytest-vcr
+  - pytest-cov
+  - pytest
+  - setuptools
+  - descartes
+  - seaborn
+  - pillow
+  - scikit-image
+  - requests

dev-requirements.txt

@@ -1,13 +1,13 @@
-pre-commit==2.7.1
+pre-commit==2.10.0
 bumpversion==0.6.0
-codecov==2.1.9
-importlib-metadata==2.0.0
-pytest==6.0.1
+codecov==2.1.11
+importlib-metadata==3.4.0
+pytest==6.2.2
 pytest-vcr==1.0.2
-sphinx==3.2.1
-pytest-cov==2.10.1
+sphinx==3.4.3
+pytest-cov==2.11.1
 sphinx-autobuild==2020.9.1
-sphinx_gallery==0.8.1
-sphinx_rtd_theme==0.5.0
-tox==3.20.0
+sphinx_gallery==0.8.2
+sphinx_rtd_theme==0.5.1
+tox==3.21.4
 pip>=19.0