Merge pull request #161 from knaaptime/2.0

2.0 refactor

Author: knaaptime

.ci/37.yml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   - python=3.7
   - pandas
-  - geopandas>=0.7
+  - geopandas>=0.9
   - matplotlib
   - scikit-learn
   - seaborn
@@ -21,4 +21,7 @@ dependencies:
   - tqdm
   - pandana
   - urbanaccess
-  - mapclassify
+  - mapclassify
+  - pygeos
+  - quilt3
+  - deprecation

.ci/38.yml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   - python=3.8
   - pandas
-  - geopandas>=0.7
+  - geopandas>=0.9
   - matplotlib
   - scikit-learn
   - seaborn
@@ -21,4 +21,7 @@ dependencies:
   - tqdm
   - pandana
   - urbanaccess
-  - mapclassify
+  - mapclassify
+  - pygeos
+  - quilt3
+  - deprecation

.ci/39.yml

@@ -4,7 +4,7 @@ channels:
 dependencies:
   - python=3.9
   - pandas
-  - geopandas>=0.7
+  - geopandas>=0.9
   - matplotlib
   - scikit-learn
   - seaborn
@@ -28,3 +28,6 @@ dependencies:
   - sphinx_bootstrap_theme
   - numpydoc  
   - mapclassify
+  - pygeos
+  - quilt3
+  - deprecation

.github/workflows/unittests.yml

@@ -17,39 +17,40 @@
      timeout-minutes: 90
      strategy:
        matrix:
-         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+         os: [ubuntu-latest, macos-latest, windows-latest]
          environment-file: [.ci/37.yml, .ci/38.yml, .ci/39.yml]
          experimental: [false]
-     defaults:
-       run:
-         shell: bash -l {0}
      steps:
-       - uses: actions/checkout@v2
-       - uses: actions/cache@v2
-         env:
-           CACHE_NUMBER: 0
-         with:
-           path: ~/conda_pkgs_dir
-           key: ${{ matrix.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles(matrix.environment-file) }}
-       - uses: conda-incubator/setup-miniconda@v2
+       - name: checkout repo
+         uses: actions/checkout@v2
+       
+       - name: setup micromamba
+         uses: mamba-org/provision-with-micromamba@main
          with:
-            miniconda-version: 'latest'
-            mamba-version: '*'
-            channels: conda-forge
-            channel-priority: true
-            auto-update-conda: false
-            auto-activate-base: false
-            environment-file: ${{ matrix.environment-file }}
-            activate-environment: test
-            use-only-tar-bz2: true
-       - run: conda info --all
-       - run: conda list
-       - run: conda config --show-sources
-       - run: conda config --show
-       - run: pip install -e . --no-deps --force-reinstall
-       - name: Pytest
+           environment-file: ${{ matrix.environment-file }}
+           micromamba-version: 'latest'
+        
+       - name: reinstall segregation - bash
+         shell: bash -l {0}
+         run: pip install -e . --no-deps --force-reinstall
+         if: matrix.os != 'windows-latest'
+      
+       - name: reinstall segregation - powershell
+         shell: powershell
+         run: pip install -e . --no-deps --force-reinstall
+         if: matrix.os == 'windows-latest'
+       
+       - name: run pytest - bash
+         shell: bash -l {0}
+         run: pytest -v segregation --cov=segregation --cov-report=xml
+         if: matrix.os != 'windows-latest'
+       
+       - name: run pytest - powershell
+         shell: powershell
          run: pytest -v segregation --cov=segregation --cov-report=xml
-       - name: codecov (${{ matrix.os }}, ${{ matrix.environment-file }})
+         if: matrix.os == 'windows-latest'
+       
+       - name: codecov
          uses: codecov/codecov-action@v1
          with:
            token: ${{ secrets.CODECOV_TOKEN }}