From e0579188710f220142ee81c913f292c055d9f9fa Mon Sep 17 00:00:00 2001 From: David Walker Date: Fri, 16 May 2025 21:34:58 +0100 Subject: [PATCH 1/2] Dependabot updates --- reports/requirements.txt | 2 +- requirements.txt | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/reports/requirements.txt b/reports/requirements.txt index efe6980..68515be 100644 --- a/reports/requirements.txt +++ b/reports/requirements.txt @@ -107,7 +107,7 @@ stack-data==0.6.3 tenacity==9.1.2 terminado==0.18.1 tinycss2==1.4.0 -tornado==6.4.2 +tornado==6.5 tqdm==4.67.1 traitlets==5.14.3 types-python-dateutil==2.9.0.20241206 diff --git a/requirements.txt b/requirements.txt index 05967bc..d785d91 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,17 +14,17 @@ docutils==0.17.1 Flask==2.2.5 Flask-Login==0.6.3 Flask-WTF==1.2.1 -greenlet==3.0.3 -h11==0.12.0 +greenlet==3.2.2 +h11==0.16.0 idna==3.7 imagesize==1.3.0 itsdangerous==2.0.1 Jinja2==3.1.6 Mako==1.2.4 MarkupSafe==2.1.2 -numpy==1.23.1 +numpy==2.2.5 outcome==1.1.0 -pandas==1.3.5 +pandas==2.2.3 pdfkit==1.0.0 pgeocode==0.3.0 pycountry==20.7.3 @@ -45,6 +45,7 @@ SQLAlchemy==1.4.27 trio==0.19.0 trio-websocket==0.9.2 typing_extensions==4.0.1 +tzdata==2025.2 urllib3==1.26.19 urllib3-secure-extra==0.1.0 Werkzeug==3.0.6 From 17f134fa0ce55acecbbefd099f872fc1ba874872 Mon Sep 17 00:00:00 2001 From: David Walker Date: Fri, 16 May 2025 21:36:49 +0100 Subject: [PATCH 2/2] Dependabot updates --- docker/Dockerfile | 30 +++++++++++++++--------------- setup.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a646bbd..7f47edf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,15 +1,15 @@ -FROM python:3.10-slim-bullseye AS runtime - -COPY naturerecorderpy-1.15.0.0 /opt/naturerecorderpy - -WORKDIR /opt/naturerecorderpy - -RUN apt-get update -y -RUN pip install -r requirements.txt -RUN pip install nature_recorder-1.15.0-py3-none-any.whl - -ENV NATURE_RECORDER_DATA_FOLDER=/var/opt/naturerecorderpy -ENV NATURE_RECORDER_DB=/var/opt/naturerecorderpy/naturerecorder.db - -ENTRYPOINT [ "python" ] -CMD [ "-m", "naturerec_web", "production" ] +FROM python:3.10-slim-bullseye AS runtime + +COPY naturerecorderpy-1.16.0.0 /opt/naturerecorderpy + +WORKDIR /opt/naturerecorderpy + +RUN apt-get update -y +RUN pip install -r requirements.txt +RUN pip install nature_recorder-1.16.0-py3-none-any.whl + +ENV NATURE_RECORDER_DATA_FOLDER=/var/opt/naturerecorderpy +ENV NATURE_RECORDER_DB=/var/opt/naturerecorderpy/naturerecorder.db + +ENTRYPOINT [ "python" ] +CMD [ "-m", "naturerec_web", "production" ] diff --git a/setup.py b/setup.py index bd8306e..5fc43a7 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ def find_package_files(directory, remove_root): setuptools.setup( name="nature_recorder", - version="1.15.0", + version="1.16.0", description="Wildlife sightings database", packages=setuptools.find_packages("src"), include_package_data=True,