Merge pull request ckan#6709 from ckan/update-requirements-feb-2022

Update Python requirements

ckan/lib/search/index.py

@@ -52,6 +52,7 @@ def clear_index() -> None:
     query = "+site_id:\"%s\"" % (config.get_value('ckan.site_id'))
     try:
         conn.delete(q=query)
+        conn.commit()
     except socket.error as e:
         err = 'Could not connect to SOLR %r: %r' % (conn.url, e)
         log.error(err)

requirements.in

@@ -1,36 +1,36 @@
 # The file contains the direct ckan requirements (python3).
 # Use pip-compile to create a requirements.txt file from this
-alembic==1.7.4
+alembic==1.7.6
 Babel==2.9.1
 Beaker==1.11.0
 bleach==4.1.0
 blinker==1.4
 click==8.0.3
 dominate==2.6.0
 feedgen==0.9.0
-Flask==2.0.2
+Flask==2.0.3
 Flask-Babel==1.0.0
 flask-multistatic==1.0
-Jinja2==3.0.2
-PyJWT==2.1.0
-Markdown==3.3.4
+Jinja2==3.0.3
+PyJWT==2.3.0
+Markdown==3.3.6
 passlib==1.7.4
 polib==1.1.1
-psycopg2==2.9.1
-python-magic==0.4.24
-pysolr==3.6.0
+psycopg2==2.9.3
+python-magic==0.4.25
+pysolr==3.9.0
 python-dateutil==2.8.2
-pytz==2021.3
-PyUtilib==6.0.0
+pytz
+PyUtilib==6.0.0 
 pyyaml==6.0
-repoze.who==2.4
-requests==2.26.0
-rq==1.10.0
-simplejson==3.17.5
+repoze.who==2.4.1
+requests==2.27.1
+rq==1.10.1
+simplejson==3.17.6
 SQLAlchemy==1.4
 sqlparse==0.4.2
-typing_extensions==4.0.0
-tzlocal==3.0
+typing_extensions==4.1.1
+tzlocal==4.1
 webassets==2.0
-Werkzeug[watchdog]==2.0.2
-zope.interface==5.4.0
+Werkzeug[watchdog]==2.0.3
+zope.interface==5.4.0

requirements.txt

@@ -1,64 +1,164 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
 #    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             # via -r requirements.in
-blinker==1.4              # via -r requirements.in
-certifi==2021.10.8        # via requests
-charset-normalizer==2.0.7  # via requests
-click==8.0.3              # via -r requirements.in, flask, rq
-dominate==2.6.0           # via -r requirements.in
-feedgen==0.9.0            # via -r requirements.in
-flask-babel==1.0.0        # via -r requirements.in
-flask-multistatic==1.0    # via -r requirements.in
-flask==2.0.2              # via -r requirements.in, flask-babel, flask-multistatic
-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             # via -r requirements.in, flask, flask-babel
-lxml==4.6.3               # via feedgen
-mako==1.1.5               # via alembic
-markdown==3.3.4           # via -r requirements.in
-markupsafe==2.0.1         # via jinja2, mako
-nose==1.3.7               # via pyutilib
-packaging==21.0           # via bleach
-passlib==1.7.4            # via -r requirements.in
-polib==1.1.1              # via -r requirements.in
-psycopg2==2.9.1           # via -r requirements.in
-pyjwt==2.1.0              # via -r requirements.in
-pyparsing==2.4.7          # via packaging
-pysolr==3.6.0             # via -r requirements.in
-python-dateutil==2.8.2    # via -r requirements.in, feedgen
-python-magic==0.4.24      # via -r requirements.in
-pytz==2021.3              # via -r requirements.in, babel, flask-babel
-pyutilib==6.0.0           # via -r requirements.in
-pyyaml==6.0               # via -r requirements.in
-redis==3.5.3              # via rq
-repoze.who==2.4           # via -r requirements.in
-requests==2.26.0          # via -r requirements.in, pysolr
-rq==1.10.0                # via -r requirements.in
-simplejson==3.17.5        # via -r requirements.in
-six==1.16.0               # via bleach, python-dateutil, pyutilib
-sqlalchemy==1.4.0         # via -r requirements.in, alembic
-sqlparse==0.4.2           # via -r requirements.in
-typing_extensions==4.0.0  # via -r requirements.in
-tzlocal==3.0              # via -r requirements.in
-urllib3==1.26.7           # via requests
-watchdog==2.1.6           # via werkzeug
-webassets==2.0            # via -r requirements.in
-webencodings==0.5.1       # via bleach
-webob==1.8.7              # 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     # via -r requirements.in, repoze.who
+alembic==1.7.6
+    # via -r requirements.in
+babel==2.9.1
+    # via
+    #   -r requirements.in
+    #   flask-babel
+backports-zoneinfo==0.2.1
+    # via
+    #   pytz-deprecation-shim
+    #   tzlocal
+beaker==1.11.0
+    # via -r requirements.in
+bleach==4.1.0
+    # via -r requirements.in
+blinker==1.4
+    # via -r requirements.in
+certifi==2021.10.8
+    # via requests
+charset-normalizer==2.0.12
+    # via requests
+click==8.0.3
+    # via
+    #   -r requirements.in
+    #   flask
+    #   rq
+deprecated==1.2.13
+    # via redis
+dominate==2.6.0
+    # via -r requirements.in
+feedgen==0.9.0
+    # via -r requirements.in
+flask==2.0.3
+    # via
+    #   -r requirements.in
+    #   flask-babel
+    #   flask-multistatic
+flask-babel==1.0.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.11.3
+    # via
+    #   alembic
+    #   markdown
+importlib-resources==5.4.0
+    # via alembic
+itsdangerous==2.1.1
+    # via flask
+jinja2==3.0.3
+    # via
+    #   -r requirements.in
+    #   flask
+    #   flask-babel
+lxml==4.8.0
+    # via feedgen
+mako==1.2.0
+    # via alembic
+markdown==3.3.6
+    # via -r requirements.in
+markupsafe==2.1.1
+    # via
+    #   jinja2
+    #   mako
+nose==1.3.7
+    # via pyutilib
+packaging==21.3
+    # via
+    #   bleach
+    #   redis
+passlib==1.7.4
+    # via -r requirements.in
+polib==1.1.1
+    # via -r requirements.in
+psycopg2==2.9.3
+    # via -r requirements.in
+pyjwt==2.3.0
+    # via -r requirements.in
+pyparsing==3.0.7
+    # via packaging
+pysolr==3.9.0
+    # via -r requirements.in
+python-dateutil==2.8.2
+    # via
+    #   -r requirements.in
+    #   feedgen
+python-magic==0.4.25
+    # via -r requirements.in
+pytz==2021.3
+    # via
+    #   -r requirements.in
+    #   babel
+    #   flask-babel
+pytz-deprecation-shim==0.1.0.post0
+    # via tzlocal
+pyutilib==6.0.0
+    # via -r requirements.in
+pyyaml==6.0
+    # via -r requirements.in
+redis==4.1.4
+    # via rq
+repoze-who==2.4.1
+    # via -r requirements.in
+requests==2.27.1
+    # via
+    #   -r requirements.in
+    #   pysolr
+rq==1.10.1
+    # via -r requirements.in
+simplejson==3.17.6
+    # via -r requirements.in
+six==1.16.0
+    # via
+    #   bleach
+    #   python-dateutil
+    #   pyutilib
+sqlalchemy==1.4.0
+    # via
+    #   -r requirements.in
+    #   alembic
+sqlparse==0.4.2
+    # via -r requirements.in
+typing-extensions==4.1.1
+    # via -r requirements.in
+tzdata==2022.1
+    # via pytz-deprecation-shim
+tzlocal==4.1
+    # via -r requirements.in
+urllib3==1.26.9
+    # via requests
+watchdog==2.1.6
+    # via werkzeug
+webassets==2.0
+    # via -r requirements.in
+webencodings==0.5.1
+    # via bleach
+webob==1.8.7
+    # via repoze-who
+werkzeug[watchdog]==2.0.3
+    # via
+    #   -r requirements.in
+    #   flask
+wrapt==1.14.0
+    # via deprecated
+zipp==3.7.0
+    # via
+    #   importlib-metadata
+    #   importlib-resources
+zope-interface==5.4.0
+    # via
+    #   -r requirements.in
+    #   repoze-who
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools