From 7e029738da365f83a9af54a4b56a887bbd76e2db Mon Sep 17 00:00:00 2001 From: ajnisbet Date: Mon, 19 Feb 2024 16:23:33 -0800 Subject: [PATCH] Upgrade dependencies --- docker/Dockerfile | 8 ++++---- docs/changelog.md | 6 ++++-- docs/notes/kubernetes.md | 7 ++++++- requirements.in | 4 ++-- requirements.txt | 22 ++-------------------- 5 files changed, 18 insertions(+), 29 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3eff239..30c0847 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,17 +1,17 @@ # Container for packages that need to be built from source but have massive dev dependencies. -FROM python:3.9.17-slim-bullseye as builder +FROM python:3.11.8-slim-bookworm as builder RUN set -e && \ apt-get update && \ apt-get install -y --no-install-recommends \ gcc \ - python3.9-dev + python3.12-dev RUN pip config set global.disable-pip-version-check true && \ - pip wheel --wheel-dir=/root/wheels uwsgi==2.0.22 && \ + pip wheel --wheel-dir=/root/wheels uwsgi==2.0.24 && \ pip wheel --wheel-dir=/root/wheels regex==2023.12.25 # The actual container. -FROM python:3.9.17-slim-bullseye +FROM python:3.11.8-slim-bookworm RUN set -e && \ apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/docs/changelog.md b/docs/changelog.md index 51c3b78..a8ccdce 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -4,9 +4,11 @@ This is a list of changes to Open Topo Data between each release. ## Version 1.9.0 (19 Feb 2024) -* Dependency upgrades -* Fix handling of preflight requests ([#93](https://github.com/ajnisbet/opentopodata/issues/93)) +* Dependency upgrades, including python to 3.11 and rasterio to 1.3.9 * Add support for geojson responses ([#86](https://github.com/ajnisbet/opentopodata/pull/86), thanks [@arnesetzer](https://github.com/arnesetzer)!) +* Fix handling of preflight requests ([#93](https://github.com/ajnisbet/opentopodata/issues/93), thanks [@MaRaSu](https://github.com/MaRaSu)!) +* Fix error message bug ([#70](https://github.com/ajnisbet/opentopodata/pull/70), thanks [@khendrickx](https://github.com/khendrickx)!) + ## Version 1.8.3 (7 Feb 2023) diff --git a/docs/notes/kubernetes.md b/docs/notes/kubernetes.md index b853438..9ea7fee 100644 --- a/docs/notes/kubernetes.md +++ b/docs/notes/kubernetes.md @@ -82,4 +82,9 @@ spec: - containerPort: 5000 restartPolicy: Always -``` \ No newline at end of file +``` + + +--- + +Thanks to [@khintz](https://github.com/khintz) for contributing this documentation in [#57](https://github.com/ajnisbet/opentopodata/pull/57)! \ No newline at end of file diff --git a/requirements.in b/requirements.in index 0d344ef..637a868 100644 --- a/requirements.in +++ b/requirements.in @@ -1,5 +1,5 @@ black -Flask>=2.2.2 +Flask>=2.2.2 # Some flask 2.0 deprecations got real. flask-caching geographiclib numpy @@ -11,5 +11,5 @@ pytest pytest-cov pytest-timeout PyYAML -rasterio==1.3.8 +rasterio>=1.3.8 # Avoid memory leak https://github.com/ajnisbet/opentopodata/issues/68 requests diff --git a/requirements.txt b/requirements.txt index e991303..b900d0a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile requirements.in @@ -37,8 +37,6 @@ cligj==0.7.2 # via rasterio coverage[toml]==7.4.1 # via pytest-cov -exceptiongroup==1.2.0 - # via pytest flask==3.0.2 # via # -r requirements.in @@ -49,10 +47,6 @@ geographiclib==2.0 # via -r requirements.in idna==3.6 # via requests -importlib-metadata==7.0.1 - # via - # build - # flask iniconfig==2.0.0 # via pytest itsdangerous==2.1.2 @@ -106,30 +100,18 @@ pytest-timeout==2.2.0 # via -r requirements.in pyyaml==6.0.1 # via -r requirements.in -rasterio==1.3.8 +rasterio==1.3.9 # via -r requirements.in requests==2.31.0 # via -r requirements.in snuggs==1.4.7 # via rasterio -tomli==2.0.1 - # via - # black - # build - # coverage - # pip-tools - # pyproject-hooks - # pytest -typing-extensions==4.9.0 - # via black urllib3==2.2.1 # via requests werkzeug==3.0.1 # via flask wheel==0.42.0 # via pip-tools -zipp==3.17.0 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip