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

Enhancements #498

Merged
merged 15 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
24a54ab
first steps to migrating to OSMnx 2.0 (#495), updating to using 1.9.4…
carlhiggs Jan 8, 2025
dfde39e
advanced software version and commented out old patch updates that ma…
carlhiggs Jan 8, 2025
d01672a
incremented ghsci version number for test build with updated dependen…
carlhiggs Jan 8, 2025
5215127
new trial v4.7.0 build of GHSCI software environment; starts up succe…
carlhiggs Jan 8, 2025
d5eedc7
reverted pandas to 2.1.* (to avoid dealing with migrating from sqlalc…
carlhiggs Jan 8, 2025
c2dbcbc
modified code referring to right index name of spatial join that does…
carlhiggs Jan 8, 2025
8a61c7a
corrected levels of government parsing (unintentionally had error of …
carlhiggs Jan 8, 2025
6fb5a42
updated requirements following updated Docker build
carlhiggs Jan 8, 2025
95ef575
added GHSCI app updates towards #496 (analysis, generating resources,…
carlhiggs Jan 9, 2025
ee09dbc
fixed popup choropleth in gui.py and allowed text wrapping
carlhiggs Jan 9, 2025
2c86eb2
addressed #497 in a basic way (a YAML error prints a friendly warning…
carlhiggs Jan 9, 2025
98add64
updated YAML error advice (#497) incorporating suggestions from both …
carlhiggs Jan 9, 2025
d155959
further updated error advice for #497 to clarify 'incorrect indentati…
carlhiggs Jan 9, 2025
440de14
added in test for valid yaml using the --strict flag to check that ou…
carlhiggs Jan 9, 2025
e42306c
added in additional test for invalid yaml to ensure that the valid ya…
carlhiggs Jan 9, 2025
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
2 changes: 1 addition & 1 deletion .ghsci_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.6.0
4.7.0
2 changes: 1 addition & 1 deletion .test-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
ghsci:
image: globalhealthyliveablecities/global-indicators:v4.6.0
image: globalhealthyliveablecities/global-indicators:v4.7.0
container_name: ghsci
shm_size: 2g
stdin_open: true # docker run -i
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
ghsci:
image: globalhealthyliveablecities/global-indicators:v4.6.0
image: globalhealthyliveablecities/global-indicators:v4.7.0
container_name: ghsci
shm_size: 2g
stdin_open: true # docker run -i
Expand Down
35 changes: 15 additions & 20 deletions docker/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,26 @@ channels:
- conda-forge
dependencies:
- python
- osmnx=1.9.3 # OpenStreetMap network retrieval and analysis
- geopandas=1.0.*
- pandas=2.1.*
- fpdf2=2.7.* # pdf templating
- osmnx=1.9.4 # OpenStreetMap network retrieval and analysis
- pandas=2.1.* # pandas > 2.2 requires transition to Apache Arrow postgreSQL driver
- fpdf2=2.8.* # pdf templating
- sqlalchemy=1.4.* # SQL connectivity with PostgreSQL
- nicegui=1.4.29 # web app framework
- cryptography=42.0.*,>=42.0.4
- tornado=6.4.*,>=6.4.1
- fonttools=4.43.*
- jupyterlab=4.2.* # code notebooks / web interface
- pillow=10.*,>=10.3.0
- pip=24.*
- pyrosm=0.6.* # possible alternate OSM/network retrieval
- idna>=3.7
- tqdm=4.*, >=4.66.3
- openpyxl
- babel
- cartopy
- nicegui=2.9.1 # web app framework
- fonttools=4.55.*
- jupyterlab=4.3.* # code notebooks / web interface
- pip # python package installer
- tqdm=4.*, >=4.66.3 # progress bar
- openpyxl # Excel file reading
- babel # language localization
- cartopy # map plotting
- contextily # basemaps and map styling
- ipywidgets
- ipywidgets # for jupyter lab progress bar
- geoalchemy2 # Geometry datatype extension for SQL Alchemy
- pandana # network analysis using Pandas
- rasterio # raster data reading
- pygeometa # metadata templating tools
- psycopg2 # PostgreSQL connection
- pyyaml # YAML parsing
- websockets
- zipp=3.19.*, >=3.19.1 # https://github.com/healthysustainablecities/global-indicators/security/dependabot/61
- yamllint # YAML linting
- urllib3>=2.2.3 # HTTP request handling (docker scout patch)
- certifi>=2023.7.22 # SSL certificate verification (docker scout patch)
232 changes: 115 additions & 117 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,204 +1,202 @@
affine==2.4.0
aiofiles==24.1.0
aiohttp==3.9.5
aiosignal==1.3.1
aiohappyeyeballs==2.4.4
aiohttp==3.11.11
aiosignal==1.3.2
annotated-types==0.7.0
anyio==3.7.1
argon2-cffi==23.1.0
argon2-cffi-bindings==21.2.0
arrow==1.3.0
asttokens==2.4.1
asttokens==3.0.0
async-lru==2.0.4
attrs==23.2.0
Babel==2.14.0
attrs==24.3.0
babel==2.16.0
beautifulsoup4==4.12.3
bidict==0.23.1
bleach==6.1.0
branca==0.7.2
bleach==6.2.0
branca==0.8.1
Brotli==1.1.0
cached-property==1.5.2
Cartopy==0.23.0
certifi==2024.7.4
cffi==1.16.0
charset-normalizer==3.3.2
click==8.1.7
Cartopy==0.24.0
certifi==2024.12.14
cffi==1.17.1
charset-normalizer==3.4.1
click==8.1.8
click-plugins==1.1.1
cligj==0.7.2
colorama==0.4.6
comm==0.2.2
contextily==1.6.0
contourpy==1.2.1
cryptography==42.0.8
contextily==1.6.2
contourpy==1.3.1
cycler==0.12.1
cykhash==2.0.1
Cython==3.0.10
dataclasses==0.8
debugpy==1.8.2
debugpy==1.8.11
decorator==5.1.1
defusedxml==0.7.1
docutils==0.21.2
entrypoints==0.4
et-xmlfile==1.1.0
et_xmlfile==2.0.0
exceptiongroup==1.2.2
executing==2.0.1
executing==2.1.0
fastapi==0.109.2
fastjsonschema==2.20.0
folium==0.17.0
fonttools==4.43.1
fpdf2==2.7.9
fastjsonschema==2.21.1
fiona==1.10.1
folium==0.19.4
fonttools==4.55.3
fpdf2==2.8.2
fqdn==1.5.1
frozenlist==1.4.1
GDAL==3.9.1
GeoAlchemy2==0.15.2
frozenlist==1.5.0
GDAL==3.9.3
GeoAlchemy2==0.16.0
geographiclib==2.0
geopandas==1.0.1
geopandas==0.14.4
geopy==2.4.1
greenlet==3.0.3
greenlet==3.1.1
gtfs-lite==0.2.2
h11==0.14.0
h2==4.1.0
hpack==4.0.0
httpcore==1.0.5
httpx==0.27.0
httpcore==1.0.7
httpx==0.28.1
hyperframe==6.0.1
idna==3.7
idna==3.10
ifaddr==0.2.0
importlib_metadata==8.0.0
importlib_resources==6.4.0
importlib_metadata==8.5.0
importlib_resources==6.5.2
ipykernel==6.29.5
ipython==8.26.0
ipywidgets==8.1.3
ipython==8.31.0
ipywidgets==8.1.5
isoduration==20.11.0
itsdangerous==2.2.0
jedi==0.19.1
Jinja2==3.1.4
jedi==0.19.2
Jinja2==3.1.5
joblib==1.4.2
json5==0.9.25
json5==0.10.0
jsonpointer==3.0.0
jsonschema==4.23.0
jsonschema-specifications==2023.12.1
jupyter_client==8.6.2
jsonschema-specifications==2024.10.1
jupyter_client==8.6.3
jupyter_core==5.7.2
jupyter-events==0.10.0
jupyter-events==0.11.0
jupyter-lsp==2.2.5
jupyter_server==2.14.2
jupyter_server==2.15.0
jupyter_server_terminals==0.5.3
jupyterlab==4.2.3
jupyterlab==4.3.4
jupyterlab_pygments==0.3.0
jupyterlab_server==2.27.3
jupyterlab_widgets==3.0.11
kiwisolver==1.4.5
lxml==5.2.2
mapclassify==2.6.1
markdown2==2.5.0
MarkupSafe==2.1.5
matplotlib==3.9.1
jupyterlab_widgets==3.0.13
kiwisolver==1.4.7
lxml==5.3.0
mapclassify==2.8.1
markdown2==2.5.2
MarkupSafe==3.0.2
matplotlib==3.8.4
matplotlib-inline==0.1.7
mercantile==1.2.1
mistune==3.0.2
multidict==6.0.5
mistune==3.1.0
multidict==6.1.0
munkres==1.1.4
nbclient==0.10.0
nbconvert==7.16.4
nbclient==0.10.2
nbconvert==7.16.5
nbformat==5.10.4
nest_asyncio==1.6.0
networkx==3.3
nicegui==1.4.28.dev0
nicegui==2.9.0.dev0
notebook_shim==0.2.4
numexpr==2.10.0
numexpr==2.10.2
numpy==1.26.4
openpyxl==3.1.4
orjson==3.10.6
osmnx==1.9.3
openpyxl==3.1.5
orjson==3.10.13
osmnx==1.9.4
overrides==7.7.0
OWSLib==0.31.0
packaging==24.1
OWSLib==0.32.0
packaging==24.2
pandana==0.7
pandas==2.1.4
pandocfilters==1.5.0
parso==0.8.4
pathspec==0.12.1
pexpect==4.9.0
pickleshare==0.7.5
pillow==10.4.0
pip==24.0
pillow==11.1.0
pip==24.3.1
pkgutil_resolve_name==1.3.10
platformdirs==4.2.2
prometheus_client==0.20.0
prompt_toolkit==3.0.47
platformdirs==4.3.6
prometheus_client==0.21.1
prompt_toolkit==3.0.48
propcache==0.2.1
pscript==0.7.7
psutil==6.0.0
psutil==6.1.1
psycopg2==2.9.9
ptyprocess==0.7.0
pure-eval==0.2.2
pure_eval==0.2.3
py-cpuinfo==9.0.0
pycparser==2.22
pydantic==2.8.2
pydantic_core==2.20.1
pygeometa==0.15.3
Pygments==2.18.0
pyogrio==0.9.0
pyparsing==3.1.2
pyproj==3.6.1
pyrobuf==0.9.3
pyrosm==0.6.2
pydantic==2.10.4
pydantic_core==2.27.2
pygeometa==0.16.1
Pygments==2.19.1
pyparsing==3.2.1
pyproj==3.7.0
pyshp==2.3.1
PySocks==1.7.1
python-dateutil==2.9.0
python-engineio==4.9.1
python-dateutil==2.9.0.post0
python-engineio==4.11.2
python-json-logger==2.0.7
python-multipart==0.0.9
python-rapidjson==1.18
python-socketio==5.11.3
pytz==2024.1
PyYAML==6.0.1
pyzmq==26.0.3
rasterio==1.3.10
python-multipart==0.0.20
python-socketio==5.12.1
pytz==2024.2
PyYAML==6.0.2
pyzmq==26.2.0
rasterio==1.3.11
referencing==0.35.1
requests==2.32.3
rfc3339-validator==0.1.4
rfc3339_validator==0.1.4
rfc3986-validator==0.1.1
rpds-py==0.19.0
scikit-learn==1.5.1
scipy==1.14.0
rpds-py==0.22.3
Rtree==1.3.0
scikit-learn==1.5.2
scipy==1.13.1
Send2Trash==1.8.3
setuptools==71.0.1
shapely==2.0.5
simple-websocket==1.0.0
six==1.16.0
setuptools==75.6.0
shapely==2.0.6
simple-websocket==1.1.0
six==1.17.0
sniffio==1.3.1
snuggs==1.4.7
soupsieve==2.5
SQLAlchemy==1.4.49
SQLAlchemy==1.4.54
src==0.0.0
stack-data==0.6.2
stack_data==0.6.3
starlette==0.36.3
tables==3.9.2
tables==3.10.2
terminado==0.18.1
threadpoolctl==3.5.0
tinycss2==1.3.0
tomli==2.0.1
tornado==6.4.1
tqdm==4.66.4
tinycss2==1.4.0
tomli==2.2.1
tornado==6.4.2
tqdm==4.67.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20240316
types-python-dateutil==2.9.0.20241206
typing_extensions==4.12.2
typing-utils==0.1.0
tzdata==2024.1
uharfbuzz==0.39.3
typing_utils==0.1.0
tzdata==2024.2
uharfbuzz==0.44.0
unicodedata2==15.1.0
uri-template==1.3.0
urllib3==2.2.2
uvicorn==0.30.1
urllib3==2.3.0
uvicorn==0.34.0
vbuild==0.8.2
watchfiles==0.22.0
watchfiles==1.0.3
wcwidth==0.2.13
webcolors==24.6.0
webcolors==24.11.1
webencodings==0.5.1
websocket-client==1.8.0
websockets==12.0
wheel==0.43.0
widgetsnbextension==4.0.11
wheel==0.45.1
widgetsnbextension==4.0.13
wsproto==1.2.0
xyzservices==2024.6.0
yarl==1.9.4
zipp==3.19.2
xyzservices==2024.9.0
yamllint==1.35.1
yarl==1.18.3
zipp==3.21.0
zstandard==0.23.0
2 changes: 1 addition & 1 deletion process/example.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.4"
"version": "3.12.8"
}
},
"nbformat": 4,
Expand Down
Loading
Loading