21584 - REPORT-API - Python Upgrade

report-api/Makefile

@@ -41,19 +41,25 @@ clean-test: ## clean test files
 	rm -f .coverage
 	rm -fr htmlcov/
 
-install: clean ## Install python virtrual environment
+build-req: clean ## Upgrade requirements
 	test -f venv/bin/activate || python3 -m venv  $(CURRENT_ABS_DIR)/venv ;\
 	. venv/bin/activate ;\
 	pip install --upgrade pip ;\
 	pip install -Ur requirements/prod.txt ;\
 	pip freeze | sort > requirements.txt ;\
 	cat requirements/repo-libraries.txt >> requirements.txt ;\
-	pip install -Ur requirements/repo-libraries.txt ;\
-	pip install -Ur requirements/dev.txt  ;\
-	touch venv/bin/activate  # update so it's as new as requirements/prod.txt
+	pip install -Ur requirements/repo-libraries.txt
+
+install: clean ## Install python virtrual environment
+	test -f venv/bin/activate || python3 -m venv  $(CURRENT_ABS_DIR)/venv ;\
+	. venv/bin/activate ;\
+	pip install --upgrade pip ;\
+	pip install -Ur requirements.txt
 
 install-dev: ## Install local application
-	. venv/bin/activate && pip install -e .
+	. venv/bin/activate ; \
+	pip install -Ur requirements/dev.txt; \
+	pip install -e .
 
 #################################################################################
 # COMMANDS - CI                                                                 #

report-api/requirements.txt

@@ -1,56 +1,58 @@
-Brotli==1.0.9
-Flask-WeasyPrint==0.6
-Flask==1.1.2
-Jinja2==3.0.3
-MarkupSafe==2.0.1
-Pillow==10.3.0
-Werkzeug==1.0.1
+Brotli==1.1.0
+Flask==3.0.3
+Jinja2==3.1.4
+MarkupSafe==2.1.5
+Werkzeug==3.0.3
 aniso8601==9.0.1
-attrs==22.2.0
-blinker==1.6.1
-cachelib==0.10.2
-cairocffi==1.5.0
-certifi==2023.7.22
-cffi==1.15.1
-charset-normalizer==3.1.0
-click==8.1.3
+attrs==23.2.0
+blinker==1.8.2
+cachelib==0.13.0
+cairocffi==1.7.0
+certifi==2024.6.2
+cffi==1.16.0
+charset-normalizer==3.3.2
+click==8.1.7
 cssselect2==0.7.0
-ecdsa==0.18.0
-flask-jwt-oidc==0.3.0
-flask-restx==1.1.0
-fonttools==4.43.0
-gunicorn==20.1.0
+ecdsa==0.19.0
+flask-restx==1.3.0
+flask_weasyprint==1.1.0
+fonttools==4.53.0
+gunicorn==22.0.0
 html5lib==1.1
 idna==3.7
-importlib-resources==5.12.0
-itsdangerous==2.0.1
+importlib_metadata==7.1.0
+importlib_resources==6.4.0
+itsdangerous==2.2.0
 jaeger-client==4.8.0
 jsonschema==4.17.3
 opentracing==2.4.0
+packaging==24.0
+pillow==10.3.0
 pkgutil_resolve_name==1.3.10
-psycopg2-binary==2.9.6
-pyasn1==0.4.8
-pycparser==2.21
-pydyf==0.6.0
-pyphen==0.14.0
-pyrsistent==0.19.3
-python-dateutil==2.8.2
-python-dotenv==1.0.0
+psycopg2-binary==2.9.9
+pyasn1==0.6.0
+pycparser==2.22
+pydyf==0.10.0
+pyphen==0.15.0
+pyrsistent==0.20.0
+python-dateutil==2.9.0.post0
+python-dotenv==1.0.1
 python-jose==3.3.0
-pytz==2023.3
-requests==2.31.0
+pytz==2024.1
+requests==2.32.3
 rsa==4.9
-sentry-sdk==1.19.1
+sentry-sdk==2.3.1
 six==1.16.0
 threadloop==1.0.2
-thrift==0.16.0
-tinycss2==1.2.1
-tornado==6.3.3
-typing_extensions==4.5.0
-urllib3==1.26.17
-weasyprint==58.1
+thrift==0.20.0
+tinycss2==1.3.0
+tornado==6.4
+urllib3==2.2.1
+weasyprint==61.2
 webencodings==0.5.1
-zipp==3.15.0
-zopfli==0.2.2
+zipp==3.19.1
+zopfli==0.2.3
 -e git+https://github.com/bcgov/sbc-common-components.git#egg=sbc-common-components&subdirectory=python
 git+https://github.com/daxiom/simple-cloudevent.py.git
+git+https://github.com/seeker25/flask-jwt-oidc.git
+

report-api/requirements/prod.txt

@@ -8,7 +8,7 @@ python-dotenv
 psycopg2-binary
 jsonschema==4.17.3
 requests
-cairocffi>=0.9.0
+cairocffi
 flask-jwt-oidc
 
 #For report generation
@@ -18,8 +18,8 @@ Flask-WeasyPrint
 #Sentry
 sentry-sdk[flask]
 jaeger-client
-itsdangerous==2.0.1
-Jinja2==3.0.3
-markupsafe==2.0.1
+itsdangerous
+Jinja2
+markupsafe
 
-werkzeug<2
+werkzeug