Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
11 changes: 9 additions & 2 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
description: Manual Doc Build
default: test
required: false

jobs:
docs:
name: build & push docs
Expand All @@ -23,26 +24,32 @@ jobs:
- ci/314-latest.yaml
experimental:
- false

defaults:
run:
shell: bash -l {0}

steps:
- name: checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: setup micromamba
uses: mamba-org/setup-micromamba@v2
uses: mamba-org/setup-micromamba@v3
with:
environment-file: ${{ matrix.environment-file }}
micromamba-version: latest

- name: reinstall for version
run: |
pip install -e . --no-deps --force-reinstall

- name: make docs
run: |
cd docs
make html

- name: Publish to Github Pages
uses: peaceiris/actions-gh-pages@v4
with:
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/release_and_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
description: Manual Release
default: test
required: false

jobs:
build:
name: Create release & publish to PyPI
Expand All @@ -20,26 +21,30 @@ jobs:

steps:
- name: checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: 3.x

- name: Build source and wheel distributions
run: |
python -m pip install --upgrade build twine
python -m build
twine check --strict dist/*

- name: Create Release Notes
uses: actions/github-script@v6
uses: actions/github-script@v9
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: >
await github.request(`POST /repos/${{ github.repository }}/releases`, {
tag_name: "${{ github.ref }}",
generate_release_notes: true
});

- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
20 changes: 13 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
name: Continuous Integration
on:
push:
branches:
- "*"
branches: [main]
pull_request:
branches:
- "*"
Expand All @@ -15,6 +14,7 @@ on:
description: Manual Unittest Run
default: test
required: false

jobs:
unittests:
name: ${{ matrix.os }}, ${{ matrix.environment-file }}
Expand All @@ -28,8 +28,7 @@ jobs:
os:
- ubuntu-latest
environment-file:
- ci/311-oldest.yaml
- ci/311-latest.yaml
- ci/312-oldest.yaml
- ci/312-latest.yaml
- ci/313-latest.yaml
- ci/314-latest.yaml
Expand All @@ -42,25 +41,30 @@ jobs:
- environment-file: ci/314-latest.yaml
os: windows-latest
fail-fast: false

steps:
- name: checkout repo
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: setup micromamba
uses: mamba-org/setup-micromamba@v2
uses: mamba-org/setup-micromamba@v3
with:
environment-file: ${{ matrix.environment-file }}
micromamba-version: latest

- name: environment info
shell: bash -l {0}
run: |
micromamba info
micromamba list

- name: spatial versions (if geopandas is installed)
shell: bash -l {0}
run: python -c "import geopandas; geopandas.show_versions();"
if: contains(matrix.environment-file, 'dev')

- name: run pytest
run: |
pytest \
Expand All @@ -73,6 +77,7 @@ jobs:
--cov-append \
--cov-report xml \
--cov-report term-missing

- name: run docstring tests
if: contains(matrix.environment-file, 'dev') && contains(matrix.os, 'ubuntu')
run: |
Expand All @@ -88,8 +93,9 @@ jobs:
--cov-report term-missing \
--doctest-only \
--doctest-continue-on-failure

- name: codecov
uses: codecov/codecov-action@v5
uses: codecov/codecov-action@v6
with:
token: ${{ secrets.CODECOV_TOKEN }}
name: giddy-codecov
19 changes: 0 additions & 19 deletions ci/311-latest.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion ci/312-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- python=3.12
# required
- esda
- esda<3
- libpysal
- mapclassify
- quantecon
Expand Down
6 changes: 3 additions & 3 deletions ci/311-oldest.yaml → ci/312-oldest.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: 311-oldest
name: 312-oldest
channels:
- conda-forge
dependencies:
- python=3.11
- python=3.12
# required
- esda=2.7
- libpysal=4.12
- mapclassify=2.7
- quantecon=0.8
- scipy=1.12
- scipy=1.14
- seaborn
# testing
- codecov
Expand Down
2 changes: 1 addition & 1 deletion ci/313-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- python=3.13
# required
- esda
- esda<3
- libpysal
- mapclassify
- quantecon
Expand Down
4 changes: 1 addition & 3 deletions ci/314-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies:
- pip:
# dev versions of packages
- --pre \
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
--extra-index-url https://pypi.org/simple
- matplotlib
- seaborn
Expand All @@ -27,5 +27,3 @@ dependencies:
- git+https://github.com/pysal/libpysal.git@main
- git+https://github.com/pysal/mapclassify.git@main
- git+https://github.com/QuantEcon/QuantEcon.py.git@main


2 changes: 1 addition & 1 deletion ci/314-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- python=3.14
# required
- esda
- esda<3
- libpysal
- mapclassify
- quantecon
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Installation
============

giddy currently supports python `3.11`_ and above.
giddy currently supports python `3.12`_ and above.
Please make sure that you are operating in a supported environment.

Installing released version
Expand Down Expand Up @@ -40,7 +40,7 @@ your fork. By making changes
to your local clone and submitting a pull request to `pysal/giddy`_, you can
contribute to the giddy development.

.. _3.11: https://docs.python.org/3.11/
.. _3.12: https://docs.python.org/3.12/
.. _Python Package Index: https://pypi.org/project/giddy/
.. _pysal/giddy: https://github.com/pysal/giddy
.. _fork: https://help.github.com/articles/fork-a-repo/
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ classifiers = [
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: GIS",
]
requires-python = ">=3.11"
requires-python = ">=3.12"
dependencies = [
"esda>=2.7, <3",
"libpysal>=4.12",
"mapclassify>=2.7",
"quantecon>=0.8",
"scipy>=1.12",
"scipy>=1.14",
"seaborn",
"matplotlib",
]
Expand Down
Loading