Fixup vulnerable fonttools dependency

davewalker5 · Jan 9, 2024 · eddd80b · eddd80b
1 parent 5b922c5
commit eddd80b
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 42 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,15 +1,15 @@
 FROM python:3.10-slim-bullseye AS runtime
 
-COPY naturerecorderpy-1.1.0.0 /opt/naturerecorderpy-1.1.0.0
+COPY naturerecorderpy-1.1.1.0 /opt/naturerecorderpy-1.1.1.0
 
-WORKDIR /opt/naturerecorderpy-1.1.0.0
+WORKDIR /opt/naturerecorderpy-1.1.1.0
 
 RUN apt-get update -y
 RUN pip install -r requirements.txt
-RUN pip install nature_recorder-1.1.0-py3-none-any.whl
+RUN pip install nature_recorder-1.1.1-py3-none-any.whl
 
-ENV NATURE_RECORDER_DATA_FOLDER=/var/opt/naturerecorderpy-1.1.0.0
-ENV NATURE_RECORDER_DB=/var/opt/naturerecorderpy-1.1.0.0/naturerecorder.db
+ENV NATURE_RECORDER_DATA_FOLDER=/var/opt/naturerecorderpy-1.1.1.0
+ENV NATURE_RECORDER_DB=/var/opt/naturerecorderpy-1.1.1.0/naturerecorder.db
 
 ENTRYPOINT [ "python" ]
 CMD [ "-m", "naturerec_web", "production" ]
diff --git a/requirements.txt b/requirements.txt
@@ -21,7 +21,7 @@ Flask-BasicAuth==0.2.0
 Flask-Cors==4.0.0
 Flask-Login==0.6.3
 Flask-WTF==1.2.1
-fonttools==4.29.1
+fonttools==4.43.0
 gevent==21.12.0
 geventhttpclient==2.0.11
 greenlet==1.1.2

diff --git a/run_behave.sh b/run_behave.sh
diff --git a/run_coverage.bat b/run_coverage.bat
@@ -2,6 +2,7 @@
 SET PROJECT_ROOT=%~p0
 CALL %PROJECT_ROOT%\venv\Scripts\activate.bat
 SET PYTHONPATH=%PROJECT_ROOT%src
+SET NATURE_RECORDER_DB=%PROJECT_ROOT%\data\naturerecorder_test.db
 
 ECHO Project root      = %PROJECT_ROOT%
 ECHO Python Path       = %PYTHONPATH%

diff --git a/run_coverage.sh b/run_coverage.sh
diff --git a/run_locust.sh b/run_locust.sh
diff --git a/run_tests.sh b/run_tests.sh
diff --git a/run_web.sh b/run_web.sh
diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@ def find_package_files(directory, remove_root):
 
 setuptools.setup(
     name="nature_recorder",
-    version="1.1.0",
+    version="1.1.1",
     description="Wildlife sightings database",
     packages=setuptools.find_packages("src"),
     include_package_data=True,