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
32 changes: 16 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,22 @@ jobs:
uv venv
uv pip install -r requirements.txt
- run: uv run python run.py mypy
stubtest:
name: Run stubtest on the the stubs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ env.UV_PYTHON }}
uses: actions/setup-python@v5
with:
python-version: ${{ env.UV_PYTHON }}
- name: Install uv
uses: astral-sh/setup-uv@v5
- name: Install dependencies
run: |
uv venv
uv pip install -r requirements.txt
- run: uv run python run.py stubtest
# stubtest:
# name: Run stubtest on the the stubs
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v4
# - name: Set up Python ${{ env.UV_PYTHON }}
# uses: actions/setup-python@v5
# with:
# python-version: ${{ env.UV_PYTHON }}
# - name: Install uv
# uses: astral-sh/setup-uv@v5
# - name: Install dependencies
# run: |
# uv venv
# uv pip install -r requirements.txt
# - run: uv run python run.py stubtest
pyright:
name: Run pyright on the tests and on the stubs
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Notebook
"notebook.formatOnSave.enabled": true,
"notebook.codeActionsOnSave": {
"source.organizeImports.ruff": "explicit",
"notebook.source.organizeImports.ruff": "explicit",
},
// Python
"[python]": {
Expand Down
13 changes: 7 additions & 6 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# Tools
# -----
ruff>=0.8.0
ruff>=0.9.2
pytest>=8.0
rich-argparse>=1.5.2
mypy>=1.14.0
pyright>=1.1.391
rich-argparse>=1.6.0
mypy>=1.14.1
pyright>=1.1.392

# Runtime dependencies
# --------------------
geopandas>=1.0.0

# Transient dependencies
# ----------------------
# geopandas
# tests
types-geopandas>=1.0.1.20250119
types-shapely>=2.0.0.20241112
pandas-stubs>=2.2.3.241009
matplotlib>=3.8.0
Expand All @@ -26,3 +26,4 @@ types-netaddr>=1.2.0
types-python-dateutil>=2.9.0
# pandapower
networkx>=3.2.1
geopandas>=1.0.0
75 changes: 42 additions & 33 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,32 @@
# uv pip compile requirements.in --output-file requirements.txt
branca==0.8.1
# via folium
certifi==2024.12.14
certifi==2025.4.26
# via
# pyogrio
# pyproj
# requests
charset-normalizer==3.4.1
# via requests
contourpy==1.3.1
contourpy==1.3.2
# via matplotlib
cycler==0.12.1
# via matplotlib
django-types==0.20.0
# via -r requirements.in
djangorestframework-types==0.9.0
# via -r requirements.in
folium==0.19.4
folium==0.19.5
# via -r requirements.in
fonttools==4.55.3
fonttools==4.57.0
# via matplotlib
geopandas==1.0.1
# via -r requirements.in
idna==3.10
# via requests
iniconfig==2.0.0
iniconfig==2.1.0
# via pytest
jinja2==3.1.5
jinja2==3.1.6
# via
# branca
# folium
Expand All @@ -37,19 +37,19 @@ markdown-it-py==3.0.0
# via rich
markupsafe==3.0.2
# via jinja2
matplotlib==3.10.0
matplotlib==3.10.1
# via -r requirements.in
mdurl==0.1.2
# via markdown-it-py
mypy==1.14.1
mypy==1.15.0
# via -r requirements.in
mypy-extensions==1.0.0
mypy-extensions==1.1.0
# via mypy
networkx==3.4.2
# via -r requirements.in
nodeenv==1.9.1
# via pyright
numpy==2.2.1
numpy==2.2.5
# via
# contourpy
# folium
Expand All @@ -59,72 +59,81 @@ numpy==2.2.1
# pandas-stubs
# pyogrio
# shapely
# types-geopandas
# types-shapely
packaging==24.2
packaging==25.0
# via
# geopandas
# matplotlib
# pyogrio
# pytest
pandas==2.2.3
# via geopandas
pandas-stubs==2.2.3.241126
# via -r requirements.in
pillow==11.1.0
pandas-stubs==2.2.3.250308
# via
# -r requirements.in
# types-geopandas
pillow==11.2.1
# via matplotlib
pluggy==1.5.0
# via pytest
pygments==2.19.1
# via rich
pyogrio==0.10.0
# via geopandas
pyparsing==3.2.1
pyparsing==3.2.3
# via matplotlib
pyproj==3.7.0
# via geopandas
pyright==1.1.391
pyproj==3.7.1
# via
# geopandas
# types-geopandas
pyright==1.1.400
# via -r requirements.in
pytest==8.3.4
pytest==8.3.5
# via -r requirements.in
python-dateutil==2.9.0.post0
# via
# matplotlib
# pandas
pytz==2024.2
pytz==2025.2
# via pandas
requests==2.32.3
# via folium
rich==13.9.4
rich==14.0.0
# via rich-argparse
rich-argparse==1.6.0
rich-argparse==1.7.0
# via -r requirements.in
rtree==1.3.0
rtree==1.4.0
# via -r requirements.in
ruff==0.9.1
ruff==0.11.7
# via -r requirements.in
shapely==2.0.6
shapely==2.1.0
# via geopandas
six==1.17.0
# via python-dateutil
types-geopandas==1.0.1.20250404
# via -r requirements.in
types-netaddr==1.3.0.20240530
# via -r requirements.in
types-psycopg2==2.9.21.20241019
types-psycopg2==2.9.21.20250318
# via
# -r requirements.in
# django-types
types-python-dateutil==2.9.0.20241206
# via -r requirements.in
types-pytz==2024.2.0.20241221
types-pytz==2025.2.0.20250326
# via pandas-stubs
types-shapely==2.0.0.20241221
# via -r requirements.in
typing-extensions==4.12.2
types-shapely==2.0.0.20250404
# via
# -r requirements.in
# types-geopandas
typing-extensions==4.13.2
# via
# mypy
# pyright
tzdata==2024.2
tzdata==2025.2
# via pandas
urllib3==2.3.0
urllib3==2.4.0
# via requests
xyzservices==2024.9.0
xyzservices==2025.4.0
# via folium
2 changes: 1 addition & 1 deletion run.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"ruff-format": ["tests", "stubs"],
"mypy": ["tests", "stubs"],
"pyright": ["tests", "stubs"],
"stubtest": ["--allowlist=stubtest_allowlist.txt", "geopandas"],
# "stubtest": ["--allowlist=stubtest_allowlist.txt"],
"pytest": [],
}

Expand Down
4 changes: 0 additions & 4 deletions stubs/geopandas-stubs/.ruff.toml

This file was deleted.

20 changes: 0 additions & 20 deletions stubs/geopandas-stubs/__init__.pyi

This file was deleted.

20 changes: 0 additions & 20 deletions stubs/geopandas-stubs/_config.pyi

This file was deleted.

21 changes: 0 additions & 21 deletions stubs/geopandas-stubs/_decorator.pyi

This file was deleted.

22 changes: 0 additions & 22 deletions stubs/geopandas-stubs/_exports.pyi

This file was deleted.

Loading