Merge pull request #501 from healthysustainablecities/enhancements

Enhancements

.ghsci_version

@@ -1 +1 @@
-4.7.0
+4.7.1

.test-compose.yml

@@ -1,6 +1,6 @@
 services:
   ghsci:
-    image: globalhealthyliveablecities/global-indicators:v4.7.0
+    image: globalhealthyliveablecities/global-indicators:v4.7.1
     container_name: ghsci
     shm_size: 2g
     stdin_open: true # docker run -i

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   ghsci:
-    image: globalhealthyliveablecities/global-indicators:v4.7.0
+    image: globalhealthyliveablecities/global-indicators:v4.7.1
     container_name: ghsci
     shm_size: 2g
     stdin_open: true # docker run -i

docker/Dockerfile

@@ -1,6 +1,6 @@
  ##############################################################################
 # Build an image from the dockerfile:
-# >>> docker build -t globalhealthyliveablecities/global-indicators:latest .
+# >>> docker build . -t globalhealthyliveablecities/global-indicators:latest
 #
 # Run bash in this container from main project folder and export package versions to Docker/requirements.txt:
 # >>> docker run --rm -it --shm-size=2g --net=host -v "$PWD":/home/ghsci/work globalhealthyliveablecities/global-indicators /bin/bash
@@ -29,14 +29,15 @@ ENV PATH=$PATH:/root/bin
 
 # Install conda pack
 RUN conda config --set show_channel_urls true && \
-	conda config --set channel_priority strict && \
+    conda config --set channel_priority strict && \
     conda config --prepend channels conda-forge && \
     conda update --yes -n base conda && \
     conda install -c conda-forge conda-pack && \
     conda env create -n env -f environment.yml && \
     conda pack -n env -o env.tar.gz && \
     conda list -n env --explicit > spec-file.txt
 
+
 # =============================================================================
 # Runtime environment
 FROM debian:stable-slim AS runtime
@@ -54,11 +55,7 @@ RUN mkdir /env && \
 ENV PATH="/env/bin/:$PATH"
 ENV PROJ_LIB="/env/share/proj"
 
-RUN pip install uharfbuzz && \
-    pip install -e git+https://github.com/wklumpen/gtfs-lite.git#egg=gtfs-lite && \
-    pip install -e git+https://github.com/anerv/BikeDNA_BIG#egg=src && \
-    pip install -e git+https://github.com/py-pdf/fpdf2#egg=fpdf2 && \
-    echo 'alias configure="python configure.py"' >> ~/.bashrc && \
+RUN echo 'alias configure="python configure.py"' >> ~/.bashrc && \
     echo 'alias analysis="python analysis.py"' >> ~/.bashrc && \
     echo 'alias generate="python generate.py"' >> ~/.bashrc && \
     echo 'alias compare="python compare.py"' >> ~/.bashrc  && \

docker/environment.yml

@@ -3,14 +3,15 @@ channels:
   - conda-forge
 dependencies:
   - python
-  - osmnx=1.9.4 # OpenStreetMap network retrieval and analysis
+  - osmnx=2.0.* # OpenStreetMap network retrieval and analysis
+  - gdal # GDAL and OGR libraries
+  - libgdal-pg # PostgreSQL GDAL extension
   - pandas=2.1.* # pandas > 2.2 requires transition to Apache Arrow postgreSQL driver
+  - nicegui=2.9.1 # web app framework
   - fpdf2=2.8.* # pdf templating
   - sqlalchemy=1.4.* # SQL connectivity with PostgreSQL
-  - 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
@@ -24,5 +25,9 @@ dependencies:
   - psycopg2 # PostgreSQL connection
   - pyyaml # YAML parsing
   - yamllint # YAML linting
+  - uharfbuzz # text shaping for font rendering
   - urllib3>=2.2.3 # HTTP request handling (docker scout patch)
   - certifi>=2023.7.22 # SSL certificate verification (docker scout patch)
+  - pip
+  - pip: # python package installer
+    - gtfs-lite # GTFS data reading

docker/requirements.txt

@@ -40,19 +40,18 @@ exceptiongroup==1.2.2
 executing==2.1.0
 fastapi==0.109.2
 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.5.0
-GDAL==3.9.3
-GeoAlchemy2==0.16.0
+GDAL==3.10.0
+GeoAlchemy2==0.17.0
 geographiclib==2.0
-geopandas==0.14.4
+geopandas==1.0.1
 geopy==2.4.1
 greenlet==3.1.1
-gtfs-lite==0.2.2
+gtfs-lite==0.2.1
 h11==0.14.0
 h2==4.1.0
 hpack==4.0.0
@@ -90,7 +89,7 @@ lxml==5.3.0
 mapclassify==2.8.1
 markdown2==2.5.2
 MarkupSafe==3.0.2
-matplotlib==3.8.4
+matplotlib==3.10.0
 matplotlib-inline==0.1.7
 mercantile==1.2.1
 mistune==3.1.0
@@ -100,14 +99,14 @@ nbclient==0.10.2
 nbconvert==7.16.5
 nbformat==5.10.4
 nest_asyncio==1.6.0
-networkx==3.3
+networkx==3.4.2
 nicegui==2.9.0.dev0
 notebook_shim==0.2.4
 numexpr==2.10.2
 numpy==1.26.4
 openpyxl==3.1.5
-orjson==3.10.13
-osmnx==1.9.4
+orjson==3.10.14
+osmnx==2.0.1
 overrides==7.7.0
 OWSLib==0.32.0
 packaging==24.2
@@ -132,10 +131,11 @@ ptyprocess==0.7.0
 pure_eval==0.2.3
 py-cpuinfo==9.0.0
 pycparser==2.22
-pydantic==2.10.4
+pydantic==2.10.5
 pydantic_core==2.27.2
 pygeometa==0.16.1
 Pygments==2.19.1
+pyogrio==0.10.0
 pyparsing==3.2.1
 pyproj==3.7.0
 pyshp==2.3.1
@@ -148,25 +148,24 @@ python-socketio==5.12.1
 pytz==2024.2
 PyYAML==6.0.2
 pyzmq==26.2.0
-rasterio==1.3.11
+rasterio==1.4.3
 referencing==0.35.1
 requests==2.32.3
 rfc3339_validator==0.1.4
 rfc3986-validator==0.1.1
+rio-vrt==0.3.1
 rpds-py==0.22.3
-Rtree==1.3.0
-scikit-learn==1.5.2
-scipy==1.13.1
+scikit-learn==1.6.1
+scipy==1.15.1
 Send2Trash==1.8.3
-setuptools==75.6.0
+setuptools==75.8.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.54
-src==0.0.0
 stack_data==0.6.3
 starlette==0.36.3
 tables==3.10.2
@@ -181,13 +180,13 @@ types-python-dateutil==2.9.0.20241206
 typing_extensions==4.12.2
 typing_utils==0.1.0
 tzdata==2024.2
-uharfbuzz==0.44.0
-unicodedata2==15.1.0
+uharfbuzz==0.45.0
+unicodedata2==16.0.0
 uri-template==1.3.0
 urllib3==2.3.0
 uvicorn==0.34.0
 vbuild==0.8.2
-watchfiles==1.0.3
+watchfiles==1.0.4
 wcwidth==0.2.13
 webcolors==24.11.1
 webencodings==0.5.1