update requirements.txt

ckan/config/middleware/flask_app.py

@@ -297,7 +297,7 @@ def save_session(self, app: Any, session: Any, response: Any):
     login_manager.init_app(app)
 
     @login_manager.user_loader
-    def load_user(user_id: Optional[str]):
+    def load_user(user_id: Any) -> Union[model.User, None]:
         return model.User.get(user_id)
 
     # Initialize repoze.who

dev-requirements.txt

@@ -9,7 +9,7 @@ factory-boy==3.2.0
 flask-debugtoolbar==0.11.0
 freezegun==1.1.0
 ipdb==0.13.7
-pip-tools==5.1.2
+pip-tools==6.5.1
 Pillow==8.4.0
 responses==0.13.3
 sphinx-rtd-theme==0.4.3

requirements.in

@@ -28,10 +28,10 @@ repoze.who==2.4
 requests==2.26.0
 rq==1.10.0
 simplejson==3.17.5
-SQLAlchemy==1.3.5
+SQLAlchemy==1.4
 sqlparse==0.4.2
 typing_extensions==4.0.0
 tzlocal==3.0
 webassets==2.0
 Werkzeug[watchdog]==2.0.2
-zope.interface==5.4.0
+zope.interface==5.4.0

requirements.txt

@@ -1,17 +1,15 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
+# This file is autogenerated by pip-compile with python 3.9
 # To update, run:
 #
-#    pip-compile --output-file=requirements.txt requirements.in
+#    pip-compile requirements.in
 #
 alembic==1.7.4
     # via -r requirements.in
 babel==2.9.1
     # via
     #   -r requirements.in
     #   flask-babel
-backports.zoneinfo==0.2.1
-    # via tzlocal
 beaker==1.11.0
     # via -r requirements.in
 bleach==4.1.0
@@ -35,19 +33,18 @@ flask==2.0.2
     # via
     #   -r requirements.in
     #   flask-babel
+    #   flask-login
     #   flask-multistatic
 flask-babel==1.0.0
     # via -r requirements.in
 flask-login==0.5.0
-    #
+    # via -r requirements.in
 flask-multistatic==1.0
     # via -r requirements.in
+greenlet==1.1.2
+    # via sqlalchemy
 idna==3.3
     # via requests
-importlib-metadata==4.8.1
-    # via alembic
-importlib-resources==5.2.2
-    # via alembic
 itsdangerous==2.0.1
     # via flask
 jinja2==3.0.2
@@ -98,7 +95,7 @@ pyyaml==6.0
     # via -r requirements.in
 redis==3.5.3
     # via rq
-repoze.who==2.4
+repoze-who==2.4
     # via -r requirements.in
 requests==2.26.0
     # via
@@ -113,13 +110,13 @@ six==1.16.0
     #   bleach
     #   python-dateutil
     #   pyutilib
-sqlalchemy==1.3.5
+sqlalchemy==1.4.0
     # via
     #   -r requirements.in
     #   alembic
 sqlparse==0.4.2
     # via -r requirements.in
-typing_extensions==4.0.0
+typing-extensions==4.0.0
     # via -r requirements.in
 tzlocal==3.0
     # via -r requirements.in
@@ -132,19 +129,15 @@ webassets==2.0
 webencodings==0.5.1
     # via bleach
 webob==1.8.7
-    # via repoze.who
+    # via repoze-who
 werkzeug[watchdog]==2.0.2
     # via
     #   -r requirements.in
     #   flask
-zipp==3.6.0
-    # via
-    #   importlib-metadata
-    #   importlib-resources
-zope.interface==5.4.0
+zope-interface==5.4.0
     # via
     #   -r requirements.in
-    #   repoze.who
+    #   repoze-who
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools
+# setuptools