merge main

Author: jGaboardi

.github/workflows/unittests.yml

@@ -19,12 +19,19 @@
      strategy:
        matrix:
          os: ['ubuntu-latest']
-         environment-file: [ci/37-minimal.yaml, ci/37.yaml, ci/38.yaml, ci/39.yaml, ci/310.yaml]
+         environment-file: [
+            ci/38-minimal.yaml,
+            ci/39.yaml,
+            ci/310.yaml,
+            ci/311.yaml,
+            ci/311-dev.yaml
+         ]
          include:
-           - environment-file: ci/310.yaml
+           - environment-file: ci/311.yaml
              os: macos-latest
-           - environment-file: ci/310.yaml
+           - environment-file: ci/311.yaml
              os: windows-latest
+       fail-fast: false
 
      steps:
        - name: checkout repo
@@ -35,6 +42,7 @@
          with:
            environment-file: ${{ matrix.environment-file }}
            micromamba-version: 'latest'
+           channel-priority: 'flexible'
 
        - name: run tests - bash
          shell: bash -l {0}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos: 
--   repo: https://github.com/psf/black
-    rev: 22.6.0
-    hooks:
-    - id: black
-      language_version: python3
+- repo: https://github.com/psf/black
+  rev: 22.10.0
+  hooks:
+  - id: black
+    language_version: python3

ci/310.yaml

@@ -3,11 +3,11 @@ channels:
   - conda-forge
 dependencies:
   - python=3.10
-  - appdirs
+  - platformdirs
   - beautifulsoup4
   - jinja2
-  - pandas>=1.0
-  - scipy>=1.0
+  - pandas
+  - scipy
   - xarray
   # testing
   - codecov
@@ -16,12 +16,11 @@ dependencies:
   - pytest-cov
   - pytest-xdist
   # optional
-  - geopandas>=0.7.0
+  - geopandas
   - joblib
   - networkx
   - numba
   - packaging
-  - xarray
   - zstd
   # for docs build action (this env only)
   - nbsphinx

ci/311-dev.yaml

@@ -0,0 +1,33 @@
+name: test
+channels:
+  - conda-forge
+dependencies:
+  - python=3.11
+  - platformdirs
+  - beautifulsoup4
+  - jinja2
+  - pandas
+  - scipy
+  - xarray
+  # testing
+  - codecov
+  - matplotlib
+  - pytest
+  - pytest-cov
+  - pytest-xdist
+  # optional
+  - geopandas
+  - joblib
+  - networkx
+  - packaging
+  - zstd
+  - Cython
+  - pip
+  - pip:
+    # dev versions of packages
+    - --pre --extra-index https://pypi.anaconda.org/scipy-wheels-nightly/simple
+    - scipy
+    - pandas
+    - git+https://github.com/shapely/shapely.git@main
+    - git+https://github.com/geopandas/geopandas.git@main
+    - git+https://github.com/pydata/xarray.git@main

ci/38.yaml renamed to ci/311.yaml

@@ -2,12 +2,12 @@ name: test
 channels:
   - conda-forge
 dependencies:
-  - python=3.8
-  - appdirs
+  - python=3.11
+  - platformdirs
   - beautifulsoup4
   - jinja2
-  - pandas>=1.0
-  - scipy>=1.0
+  - pandas
+  - scipy
   - xarray
   # testing
   - codecov
@@ -16,10 +16,10 @@ dependencies:
   - pytest-cov
   - pytest-xdist
   # optional
-  - geopandas>=0.7.0
+  - geopandas>=0.12.0
   - joblib
   - networkx
-  - numba
   - packaging
+  - shapely>=2.0b1
   - xarray
   - zstd

ci/37.yaml renamed to ci/311_shapely_dev.yaml

@@ -2,8 +2,8 @@ name: test
 channels:
   - conda-forge
 dependencies:
-  - python=3.7
-  - appdirs
+  - python=3.11
+  - platformdirs
   - beautifulsoup4
   - jinja2
   - pandas>=1.0
@@ -15,11 +15,17 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-xdist
-  - networkx=2.7
   # optional
-  - geopandas>=0.7.0
+  - geopandas>=0.12.0
   - joblib
-  - numba
+  - networkx
   - packaging
+  - shapely>=2.0b1
   - xarray
   - zstd
+  # for docs build action (this env only)
+  - nbsphinx
+  - numpydoc
+  - sphinx
+  - sphinxcontrib-bibtex
+  - sphinx_bootstrap_theme

ci/37-minimal.yaml

@@ -0,0 +1,27 @@
+name: test
+channels:
+  - conda-forge
+dependencies:
+  - python=3.8
+  - beautifulsoup4=4.10
+  - jinja2=3.0
+  - pandas=1.3
+  - scipy=1.8
+  - xarray=0.18
+  # testing
+  - codecov
+  - matplotlib
+  - pytest
+  - pytest-cov
+  - pytest-xdist
+  # optional
+  - geopandas>=0.10.0
+  - shapely=1.8
+  - joblib
+  - networkx=2.7
+  - numba=0.54
+  - packaging
+  - zstd
+  - pip
+  - pip:
+      - platformdirs==2.0.2

ci/38-minimal.yaml

@@ -3,11 +3,11 @@ channels:
   - conda-forge
 dependencies:
   - python=3.9
-  - appdirs
+  - platformdirs
   - beautifulsoup4
   - jinja2
-  - pandas>=1.0
-  - scipy>=1.0
+  - pandas
+  - scipy
   - xarray
   # testing
   - codecov
@@ -16,10 +16,9 @@ dependencies:
   - pytest-cov
   - pytest-xdist
   # optional
-  - geopandas>=0.7.0
+  - geopandas
   - joblib
   - networkx
   - numba
   - packaging
-  - xarray
   - zstd

ci/39.yaml

@@ -3,7 +3,7 @@
 Installation
 ============
 
-libpysal supports python >= `3.7`_ only. Please make sure that you are
+libpysal supports python >= `3.8`_ only. Please make sure that you are
 operating in a python 3 environment.
 
 Installing released version
@@ -14,7 +14,7 @@ conda
 
 libpysal is available through conda::
 
- 
+
   conda install -c conda-forge libpysal
 
 
@@ -50,7 +50,7 @@ to your local clone and submitting a pull request to `pysal/libpysal`_, you can
 contribute to libpysal development.
 
 
-.. _3.7: https://docs.python.org/3.7/
+.. _3.7: https://docs.python.org/3.8/
 .. _Python Package Index: https://pypi.org/project/libpysal/
 .. _pysal/libpysal: https://github.com/pysal/libpysal
 .. _fork: https://help.github.com/articles/fork-a-repo/