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

reup cityseer method with new sequence + fresh FUA results #213

Merged
merged 12 commits into from
Dec 8, 2024
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
run: 'pixi run -e tests python -c "import geopandas; geopandas.show_versions();"'

- name: run tests
run:
pixi run -e tests pytest -v -r a -n logical --color yes --cov code --cov-append --cov-report term-missing --cov-report xml .
run: |
pixi run -e tests pytest core -v -r a -n logical --color yes --cov core --cov-append --cov-report term-missing --cov-report xml .

- name: codecov
uses: codecov/codecov-action@v4
Expand Down
2 changes: 1 addition & 1 deletion core/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def test_read_sample_data():


cities = list(core.utils.city_fua.keys())
cityseer_records = [40591, 10083, 14659, 28940, 14893, 12796, 26070]
cityseer_records = [39_715, 9740, 14_130, 28_187, 14_325, 12_382, 25_666]
osm_records = [78_908, 60_364, 79_317, 84_819, 79_907, 50_917, 92_667]
xnd2_records = [43_233, 12_439, 16_302, 30_552, 16_554, 13_468, 29_314]
man_records = [38_772, 8_640, 14_170, 29_252, 13_508, 11_032, numpy.nan]
Expand Down
Binary file modified data/1133/cityseer/1133.parquet
Binary file not shown.
Binary file modified data/1656/cityseer/1656.parquet
Binary file not shown.
Binary file modified data/4617/cityseer/4617.parquet
Binary file not shown.
Binary file modified data/4881/cityseer/4881.parquet
Binary file not shown.
Binary file modified data/809/cityseer/809.parquet
Binary file not shown.
Binary file modified data/869/cityseer/869.parquet
Binary file not shown.
Binary file modified data/8989/cityseer/8989.parquet
Binary file not shown.
818 changes: 653 additions & 165 deletions notebooks/methods/cityseer.ipynb

Large diffs are not rendered by default.

Binary file not shown.
14,493 changes: 4,305 additions & 10,188 deletions pixi.lock

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ esda = "*"
geopandas = "*"
h3-py = "3.7.7.*"
ipykernel = "*"
jupyterlab = "*"
jupyterlab = ">=4.3.2,<5"
matplotlib = ">=3.9"
momepy = ">=0.9.0"
osmnx = "*"
Expand All @@ -148,6 +148,7 @@ pre-commit = "*"
ruff = "*"
jupyter = "*"
ipywidgets = "*"
pixi-kernel = ">=0.5.2,<0.6"

[tool.pixi.pypi-dependencies]
core = { path = ".", editable = true }
Expand Down
Loading