Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI against Python 3.12 #585

Merged
merged 11 commits into from
Oct 21, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ jobs:
matrix:
os: [ubuntu-latest]
environment-file:
- ci/38-minimal.yaml
- ci/39.yaml
- ci/310-minimal.yaml
- ci/310.yaml
- ci/311.yaml
- ci/311-dev.yaml
- ci/311-no-optional.yaml
- ci/312.yaml
- ci/312-dev.yaml
- ci/312-no-optional.yaml
include:
- environment-file: ci/310.yaml
- environment-file: ci/312.yaml
os: macos-latest
- environment-file: ci/310.yaml
- environment-file: ci/312.yaml
os: windows-latest
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: 23.9.1
rev: "23.10.0"
hooks:
- id: black
language_version: python3
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Python Spatial Analysis Library Core
.. image:: https://github.com/pysal/libpysal/workflows/.github/workflows/unittests.yml/badge.svg
:target: https://github.com/pysal/libpysal/actions?query=workflow%3A.github%2Fworkflows%2Funittests.yml

.. image:: https://codecov.io/gh/pysal/libpysal/branch/master/graph/badge.svg
.. image:: https://codecov.io/gh/pysal/libpysal/branch/main/graph/badge.svg
:target: https://codecov.io/gh/pysal/libpysal

.. image:: https://badge.fury.io/py/libpysal.svg
Expand Down Expand Up @@ -59,7 +59,7 @@ If you have any suggestions, feature requests, or bug reports,
please open new `issues <https://github.com/pysal/libpysal/issues>`_ on GitHub.
To submit patches, please review `PySAL's documentation for developers <https://pysal.org/docs/devs/>`_,
the PySAL `development guidelines <https://github.com/pysal/pysal/wiki>`_,
the `libpysal contributing guidelines <https://github.com/pysal/libpysal/blob/master/.github/CONTRIBUTING.md>`_
the `libpysal contributing guidelines <https://github.com/pysal/libpysal/blob/main/.github/CONTRIBUTING.md>`_
before opening a `pull request <https://github.com/pysal/libpysal/pulls>`_.
Once your changes get merged, you’ll automatically be added to
the `Contributors List <https://github.com/pysal/libpysal/graphs/contributors>`_.
Expand All @@ -76,6 +76,6 @@ To search for or report bugs, please see `libpysal's issues <https://github.com/
License information
*******************

See the `LICENSE <https://github.com/pysal/libpysal/blob/master/LICENSE.txt>`_
See the `LICENSE <https://github.com/pysal/libpysal/blob/main/LICENSE.txt>`_
for information on the history of this software, terms & conditions for usage,
and a DISCLAIMER OF ALL WARRANTIES.
2 changes: 1 addition & 1 deletion ci/38-minimal.yaml → ci/310-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test
channels:
- conda-forge
dependencies:
- python=3.8
- python=3.10
- beautifulsoup4=4.10
- jinja2=3.0
- pandas=1.4
Expand Down
2 changes: 1 addition & 1 deletion ci/311-dev.yaml → ci/312-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test
channels:
- conda-forge
dependencies:
- python=3.11
- python=3.12
- platformdirs
- beautifulsoup4
- jinja2
Expand Down
2 changes: 1 addition & 1 deletion ci/311-no-optional.yaml → ci/312-no-optional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test
channels:
- conda-forge
dependencies:
- python=3.11
- python=3.12
- platformdirs
- beautifulsoup4
- jinja2
Expand Down
7 changes: 4 additions & 3 deletions ci/39.yaml → ci/312.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: test
channels:
- conda-forge
dependencies:
- python=3.9
- python=3.12
- platformdirs
- beautifulsoup4
- jinja2
Expand All @@ -16,11 +16,12 @@ dependencies:
- pytest-cov
- pytest-xdist
# optional
- geopandas
- geopandas>=0.12.0
- joblib
- networkx
- numba
- packaging
- shapely>=2.0b1
- xarray
- zstd
- geodatasets
- pyarrow
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def setup(app):
"networkx": ("https://networkx.org/documentation/stable/", None),
"numpy": ("https://numpy.org/doc/stable/", None),
"pandas": ("https://pandas.pydata.org/pandas-docs/stable/", None),
"python": ("https://docs.python.org/3.11/", None),
"python": ("https://docs.python.org/3.12/", None),
"scipy": ("https://docs.scipy.org/doc/scipy/", None),
}

Expand Down
10 changes: 5 additions & 5 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libpysal: Python Spatial Analysis Library Core
<div class="col-sm-1 col-xs-hidden">
</div>
<div class="col-sm-10 col-xs-12">
<a href="http://nbviewer.jupyter.org/github/pysal/libpysal/blob/master/notebooks/weights.ipynb" class="thumbnail">
<a href="http://nbviewer.jupyter.org/github/pysal/libpysal/blob/main/notebooks/weights.ipynb" class="thumbnail">
<img src="_static/images/npweights.png" class="img-responsive center-block">
<div class="caption text-center">
<h6>Weights for nonplanar enforced geometries</h6>
Expand All @@ -38,10 +38,10 @@ Introduction

**libpysal** offers four modules that form the building blocks in many upstream packages in the `PySAL family <https://pysal.org>`_:

- Spatial Weights: libpysal.weights
- Input-and output: libpysal.io
- Computational geometry: libpysal.cg
- Built-in example datasets libpysal.examples
- Spatial Weights: libpysal.weights
- Input-and output: libpysal.io
- Computational geometry: libpysal.cg
- Built-in example datasets libpysal.examples


Examples demonstrating some of **libpysal** functionality are available in the `tutorial <tutorial.html>`_.
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ classifiers = [
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: GIS",
]
requires-python = ">=3.8"
requires-python = ">=3.10"
dependencies = [
"platformdirs>=2.0.2",
"beautifulsoup4>=4.10",
Expand Down Expand Up @@ -76,7 +76,7 @@ line-length = 88
[tool.ruff]
line-length = 88
select = ["E", "F", "W", "I", "UP", "N", "B", "A", "C4", "SIM", "ARG"]
target-version = "py38"
target-version = "py310"
ignore = [
"B006",
"B008",
Expand Down
Loading