Merge pull request #84 from metabrainz/version-upgrades

Upgrade to python 3, flask 2, and other dependencies

Author: amCap1712

brainzutils/__init__.py

@@ -1,9 +1,13 @@
-# TODO: We are the backport of importlib to support python 3.7.
-#  When we raise the minimum to python 3.8, we can remove this and use the builtin importlib module.
-from importlib_metadata import version, PackageNotFoundError
+import sys
+
+if sys.version_info >= (3, 10):
+    from importlib.metadata import version, PackageNotFoundError
+else:
+    # importlib.metadata's API changed in 3.10, so use a backport for versions less than this.
+    from importlib_metadata import version, PackageNotFoundError
 
 try:
     __version__ = version(__name__)
 except PackageNotFoundError:
     # package is not installed
-    pass
+    __version__ = "unknown"

requirements.txt

@@ -1,16 +1,16 @@
-Flask>=1.1.2
-Jinja2>=2.11.2
-werkzeug>=1.0.1
-Flask-DebugToolbar>=0.11.0
+Flask>=2.1.0
+Jinja2>=3.0
+itsdangerous>=2.0
+click>=8.0
+Werkzeug>=2.0
+Flask-DebugToolbar>=0.13.1
 Flask-UUID>=0.2
-sentry-sdk[flask]>=0.20.2
+sentry-sdk[flask]>=1.5.8
 certifi
-redis>=3.5,<4.0
-msgpack==0.5.6
-requests>=2.23.0
-SQLAlchemy>=1.3.16
+redis>=4.2.2
+msgpack-python==0.5.6
+requests>=2.27.1
+SQLAlchemy>=1.3.16,<2.0
 mbdata@git+https://github.com/amCap1712/mbdata.git@upstream-schema-changes
 sqlalchemy-dst>=1.0.1
-importlib-metadata>=3.10.0
-itsdangerous==2.0.1
-MarkupSafe==2.0.1
+importlib-metadata>=3.10.0;python_version<'3.10'

requirements_dev.txt

@@ -1,5 +1,5 @@
-psycopg2-binary==2.8.6
-freezegun==0.3.15
-pytest==4.6.9
-pytest-cov==2.8.1
-pylint==1.9.4
+psycopg2-binary==2.9.3
+freezegun==1.2.1
+pytest==7.1.1
+pytest-cov==3.0.0
+pylint==2.13.5

setup.py

@@ -12,5 +12,5 @@
     packages=find_packages(),
     use_scm_version=True,
     setup_requires=['setuptools_scm'],
-    install_requires=open("requirements.txt").read().split(),
+    install_requires=open("requirements.txt").read().splitlines(),
 )

test/Dockerfile

@@ -1,4 +1,4 @@
-FROM metabrainz/python:3.7-20210115
+FROM metabrainz/python:3.10-20220315
 
 ENV DOCKERIZE_VERSION v0.6.1
 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \