Skip to content

Commit 527491b

Browse files
jGaboardijGaboardi
authored
reup spec000 & some linting [2026-04-15] (#204)
* reup spec000 & some linting * leave numba for another day * add back numba
1 parent 5716a76 commit 527491b

18 files changed

Lines changed: 154 additions & 171 deletions

‎.github/workflows/build_docs.yml‎

Lines changed: 59 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,59 @@
1-
# Building and hosting documentation for PACKAGE_NAME
2-
#
3-
# Notes:
4-
# - After the first run of this workflow:
5-
# - Within the project repo, navigate to Setting/Github Pages
6-
# - set `the source branch to `gh-pages/(root))`.
7-
# - Uncomment everything below the following line to enable the workflow.
8-
#---------------------------------------------------------------------------
9-
10-
name: Build Docs
11-
12-
on:
13-
push:
14-
# Sequence of patterns matched against refs/tags
15-
tags:
16-
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
17-
workflow_dispatch:
18-
inputs:
19-
version:
20-
description: Manual Doc Build
21-
default: test
22-
required: false
23-
jobs:
24-
docs:
25-
name: build & push docs
26-
runs-on: ${{ matrix.os }}
27-
timeout-minutes: 90
28-
strategy:
29-
matrix:
30-
os: ['ubuntu-latest']
31-
environment-file: [ci/envs/314-latest.yaml]
32-
experimental: [false]
33-
defaults:
34-
run:
35-
shell: bash -l {0}
36-
37-
steps:
38-
- name: checkout repo
39-
uses: actions/checkout@v4
40-
41-
- name: setup micromamba
42-
uses: mamba-org/setup-micromamba@v2
43-
with:
44-
environment-file: ${{ matrix.environment-file }}
45-
micromamba-version: 'latest'
46-
47-
- name: Install Dependencies
48-
run: |
49-
# Install ipykernel and jupyter into the 'test' environment
50-
micromamba install -n test ipykernel jupyter -c conda-forge -y
51-
52-
- name: Register Jupyter kernel "python3" (for nbsphinx)
53-
run: |
54-
python -m ipykernel install --sys-prefix --name python3 --display-name "Python 3"
55-
jupyter kernelspec list
56-
57-
- name: make docs
58-
run: |
59-
pip install -e . --no-deps --force-reinstall
60-
cd docs; make html
61-
62-
- name: Publish to Github Pages
63-
uses: peaceiris/actions-gh-pages@v4
64-
with:
65-
github_token: ${{ secrets.GITHUB_TOKEN }}
66-
publish_dir: docs/build/html/
67-
keep_files: false
1+
---
2+
name: Build Docs
3+
4+
on:
5+
push:
6+
# Sequence of patterns matched against refs/tags
7+
tags:
8+
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
9+
workflow_dispatch:
10+
inputs:
11+
version:
12+
description: Manual Doc Build
13+
default: test
14+
required: false
15+
jobs:
16+
docs:
17+
name: build & push docs
18+
runs-on: ${{ matrix.os }}
19+
timeout-minutes: 90
20+
strategy:
21+
matrix:
22+
os: ['ubuntu-latest']
23+
environment-file: [ci/envs/314-latest.yaml]
24+
experimental: [false]
25+
defaults:
26+
run:
27+
shell: bash -l {0}
28+
29+
steps:
30+
- name: checkout repo
31+
uses: actions/checkout@v6
32+
33+
- name: setup micromamba
34+
uses: mamba-org/setup-micromamba@v3
35+
with:
36+
environment-file: ${{ matrix.environment-file }}
37+
micromamba-version: 'latest'
38+
39+
- name: Install Dependencies
40+
run: |
41+
# Install ipykernel and jupyter into the 'test' environment
42+
micromamba install -n test ipykernel jupyter -c conda-forge -y
43+
44+
- name: Register Jupyter kernel "python3" (for nbsphinx)
45+
run: |
46+
python -m ipykernel install --sys-prefix --name python3 --display-name "Python 3"
47+
jupyter kernelspec list
48+
49+
- name: make docs
50+
run: |
51+
pip install -e . --no-deps --force-reinstall
52+
cd docs; make html
53+
54+
- name: Publish to Github Pages
55+
uses: peaceiris/actions-gh-pages@v4
56+
with:
57+
github_token: ${{ secrets.GITHUB_TOKEN }}
58+
publish_dir: docs/build/html/
59+
keep_files: false

‎.github/workflows/release_and_publish.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# Release package on GitHub and publish to PyPI
2-
# IMPORTANT -- 1 MANUAL STEP
3-
# * FOLLOWING TAGGED RELEASE
4-
# - update CHANGELOG.md
5-
#--------------------------------------------------
1+
---
62
name: Release & Publish
73

84
on:

‎.github/workflows/tests.yaml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: Tests
1+
---
2+
name: Continuous Integration
23

34
on:
45
push:
@@ -24,28 +25,37 @@ jobs:
2425
matrix:
2526
os: [ubuntu-latest]
2627
environment-file:
27-
- ci/envs/311-oldest.yaml
28-
- ci/envs/311-latest.yaml
28+
- ci/envs/312-oldest.yaml
2929
- ci/envs/312-latest.yaml
3030
- ci/envs/313-latest.yaml
3131
- ci/envs/314-latest.yaml
32+
- ci/envs/314-numba-latest.yaml
3233
- ci/envs/314-dev.yaml
3334
include:
35+
# no numba
3436
- environment-file: ci/envs/314-latest.yaml
3537
os: macos-15-intel # Intel
3638
- environment-file: ci/envs/314-latest.yaml
3739
os: macos-latest # Apple Silicon
3840
- environment-file: ci/envs/314-latest.yaml
3941
os: windows-latest
42+
# with numba
43+
- environment-file: ci/envs/314-numba-latest.yaml
44+
os: macos-15-intel # Intel
45+
- environment-file: ci/envs/314-numba-latest.yaml
46+
os: macos-latest # Apple Silicon
47+
- environment-file: ci/envs/314-numba-latest.yaml
48+
os: windows-latest
49+
4050
defaults:
4151
run:
4252
shell: bash -l {0}
4353

4454
steps:
45-
- uses: actions/checkout@v4
55+
- uses: actions/checkout@v6
4656

4757
- name: setup micromamba
48-
uses: mamba-org/setup-micromamba@v2
58+
uses: mamba-org/setup-micromamba@v3
4959
with:
5060
environment-file: ${{ matrix.environment-file }}
5161
micromamba-version: "latest"
@@ -64,4 +74,4 @@ jobs:
6474
--cov-report term-missing \
6575
--cov-report xml .
6676
67-
- uses: codecov/codecov-action@v5
77+
- uses: codecov/codecov-action@v6

‎README.md‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,31 @@ This package is part of [PySAL](https://pysal.org): The Python Spatial Analysis
1212

1313
## Introduction
1414

15-
This [pointpats](https://github.com/pysal/pointpats) package is intended
16-
to support the statistical analysis of planar point patterns.
15+
This [pointpats](https://github.com/pysal/pointpats) package is intended to support the statistical analysis of planar point patterns.
1716

18-
It currently works on cartesian coordinates. Users with data in
19-
geographic coordinates need to project their data prior to using this
20-
module.
17+
It currently works on cartesian coordinates. Users with data in geographic coordinates need to project their data prior to using this module.
2118

2219
## Documentation
2320

24-
Online documentation is available
25-
[here](http://pysal.org/pointpats/).
21+
Online documentation is available [here](http://pysal.org/pointpats/).
2622

27-
## Installation
23+
## Installation
2824

2925
Install pointpats by running:
3026

3127
$ pip install pointpats
3228

3329
## Development
3430

35-
pointpats development is hosted on
36-
[github](https://github.com/pysal/pointpats).
31+
pointpats development is hosted on [github](https://github.com/pysal/pointpats).
3732

38-
As part of the PySAL project, pointpats development follows
39-
[PySAL's documentation for developers](https://pysal.org/docs/devs/) and the PySAL [development guidelines](https://github.com/pysal/pysal/wiki).
33+
As part of the PySAL project, pointpats development follows [PySAL's documentation for developers](https://pysal.org/docs/devs/) and the PySAL [development guidelines](https://github.com/pysal/pysal/wiki).
4034

41-
## Bug reports
35+
## Bug reports
4236

43-
To search for or report bugs, please see pointpats'
44-
[issues](https://github.com/pysal/pointpats/issues).
37+
To search for or report bugs, please see pointpats' [issues](https://github.com/pysal/pointpats/issues).
4538

46-
## BibTeX Citation
39+
## BibTeX Citation
4740

4841
```
4942
@software{wei_kang_2023_7706219,

‎ci/envs/311-oldest.yaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎ci/envs/312-latest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dependencies:
88
- matplotlib
99
- numpy
1010
- pandas
11+
- scikit-learn
1112
- scipy
1213
- shapely
1314
# tests
14-
- scikit-learn
1515
- statsmodels
1616
- pytest
1717
- pytest-cov

‎ci/envs/312-oldest.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: test
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.12
6+
- geopandas=1.1
7+
- libpysal=4.12
8+
- matplotlib=3.10
9+
- numpy=2.0
10+
- pandas=2.3
11+
- scipy=1.14
12+
- shapely=2.1
13+
# tests
14+
- scikit-learn=1.5
15+
- statsmodels
16+
- pytest
17+
- pytest-cov
18+
- pytest-xdist
19+
- codecov
20+
- pip
21+
- pip:
22+
- KDEpy

‎ci/envs/313-latest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dependencies:
88
- matplotlib
99
- numpy
1010
- pandas
11+
- scikit-learn
1112
- scipy
1213
- shapely
1314
# tests
14-
- scikit-learn
1515
- statsmodels
1616
- pytest
1717
- pytest-cov

‎ci/envs/314-dev.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ channels:
44
dependencies:
55
- python=3.14
66
- folium
7-
- libpysal
8-
- mapclassify
9-
- matplotlib
10-
- numpy
11-
- pandas
12-
- shapely
137
# tests
148
- codecov
159
- pytest
@@ -22,8 +16,13 @@ dependencies:
2216
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
2317
--extra-index-url https://pypi.org/simple
2418
- KDEpy
19+
- matplotlib
20+
- numpy
21+
- pandas
2522
- scipy
2623
- scikit-learn
24+
- shapely
2725
- statsmodels
2826
- git+https://github.com/pysal/libpysal.git
27+
- git+https://github.com/pysal/mapclassify.git
2928
- git+https://github.com/geopandas/geopandas.git

‎ci/envs/314-latest.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ dependencies:
99
- matplotlib
1010
- numpy
1111
- pandas
12+
- scikit-learn
1213
- scipy
1314
- shapely
1415

1516
# tests
16-
- scikit-learn
1717
- statsmodels
1818
- pytest
1919
- pytest-cov

0 commit comments

Comments
 (0)