Merge remote-tracking branch 'upstream/main'

jGaboardi · jGaboardi · commit 72ea3f4ae455 · 2022-11-02T09:55:21.000-04:00
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -19,7 +19,7 @@ on:
 jobs:
   unittests:
     env:
-      RUN_TEST: pytest -v splot --cov splot --cov-config .coveragerc --cov-report xml --color yes --cov-append --cov-report term-missing
+      RUN_TEST: pytest splot -v -r a --cov splot --cov-config .coveragerc --cov-report xml --color yes --cov-append --cov-report term-missing
     name: ${{ matrix.os }}, ${{ matrix.environment-file }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
@@ -31,11 +31,13 @@ jobs:
           - ci/39.yaml
           - ci/310.yaml
           - ci/310-DEV.yaml
+          - ci/310-DEV_shapely_dev.yaml
         include:
           - environment-file: ci/310.yaml
             os: macos-latest
           - environment-file: ci/310.yaml
             os: windows-latest
+      fail-fast: false
 
     steps:
       - name: checkout repo
@@ -45,15 +47,16 @@ jobs:
         uses: mamba-org/provision-with-micromamba@main
         with:
           environment-file: ${{ matrix.environment-file }}
-          micromamba-version: "latest"
+          micromamba-version: 'latest'
+          channel-priority: 'flexible'
 
       - name: install bleeding edge PySAL submodules (only Ubuntu / Python 3.10)
         shell: bash -l {0}
         run: |
           pip install git+https://github.com/pysal/libpysal.git@master
-          pip install git+https://github.com/pysal/mapclassify.git@master
+          pip install git+https://github.com/pysal/mapclassify.git@main
           pip install git+https://github.com/pysal/esda.git@master
-          pip install git+https://github.com/pysal/spreg.git@master
+          pip install git+https://github.com/pysal/spreg.git@main
           pip install git+https://github.com/pysal/giddy.git@master
         if: matrix.os == 'ubuntu-latest' && contains(matrix.environment-file, 'DEV')
 
@@ -71,6 +74,16 @@ jobs:
         shell: bash -l {0}
         run: cp utils/matplotlibrc .
 
+      - name: environment info
+        shell: bash -l {0}
+        run: |
+          micromamba info
+          micromamba list
+       
+      - name: spatial versions
+        shell: bash -l {0}
+        run: 'python -c "import geopandas; geopandas.show_versions();"'
+
       - name: run tests - bash
         shell: bash -l {0}
         run: ${{ env.RUN_TEST }}
diff --git a/ci/310-DEV.yaml b/ci/310-DEV.yaml
@@ -14,4 +14,4 @@
    - matplotlib
    - numpy
    - pip
-   - seaborn
+   - seaborn>=0.11.0
diff --git a/ci/310-DEV_shapely_dev.yaml b/ci/310-DEV_shapely_dev.yaml
@@ -0,0 +1,19 @@
+ name: test
+ channels:
+   - conda-forge
+   - conda-forge/label/shapely_dev
+ dependencies:
+   - python=3.10
+   # testing
+   - codecov
+   - pytest
+   - pytest-cov
+   # required
+   - bokeh
+   - geopandas>=0.12.0
+   - ipywidgets
+   - matplotlib
+   - numpy
+   - pip
+   - seaborn>=0.11.0
+   - shapely>=2.0b1
diff --git a/ci/310.yaml b/ci/310.yaml
@@ -18,5 +18,5 @@ dependencies:
   - matplotlib
   - numpy
   - pip
-  - seaborn
+  - seaborn>=0.11.0
   - spreg
diff --git a/ci/38.yaml b/ci/38.yaml
@@ -18,5 +18,5 @@
    - matplotlib
    - numpy
    - pip
-   - seaborn
+   - seaborn>=0.11.0
    - spreg
diff --git a/ci/39.yaml b/ci/39.yaml
@@ -18,5 +18,5 @@
    - matplotlib
    - numpy
    - pip
-   - seaborn
+   - seaborn>=0.11.0
    - spreg
diff --git a/requirements.txt b/requirements.txt
@@ -5,5 +5,5 @@ libpysal
 mapclassify
 matplotlib
 numpy
-seaborn
+seaborn>=0.11.0
 spreg
diff --git a/splot/_viz_esda_mpl.py b/splot/_viz_esda_mpl.py
@@ -351,7 +351,7 @@ def plot_moran_simulation(moran, aspect_equal=True,
     # plot distribution
     shade = kwargs.pop('shade', True)
     color = kwargs.pop('color', splot_colors['moran_base'])
-    sbn.kdeplot(moran.sim, shade=shade, color=color, ax=ax, **kwargs)
+    sbn.kdeplot(moran.sim, fill=shade, color=color, ax=ax, **kwargs)
 
     # customize plot
     fitline_kwds.setdefault('color', splot_colors['moran_fit'])
@@ -625,7 +625,7 @@ def plot_moran_bv_simulation(moran_bv, ax=None, aspect_equal=True,
     # plot distribution
     shade = kwargs.pop('shade', True)
     color = kwargs.pop('color', splot_colors['moran_base'])
-    sbn.kdeplot(moran_bv.sim, shade=shade, color=color, ax=ax, **kwargs)
+    sbn.kdeplot(moran_bv.sim, fill=shade, color=color, ax=ax, **kwargs)
 
     # customize plot
     fitline_kwds.setdefault('color', splot_colors['moran_fit'])
