Merge pull request #7808 from ckan/upgrade-requirements-202309

Upgrade requirements September 2023

changes/7808.misc

@@ -0,0 +1 @@
+Because of a new version of Sphinx, the command to rebuild the documentation is now ``sphinx-build doc build/sphinx``

ckan/lib/jobs.py

@@ -287,7 +287,7 @@ def execute_job(self, job: Job, *args: Any, **kwargs: Any) -> None:
         meta.engine.dispose()
 
         # The original implementation performs the actual fork
-        queue = remove_queue_name_prefix(cast(str, job.origin))
+        queue = remove_queue_name_prefix(job.origin)
 
         if not job.meta:
             job.meta = {}

ckan/tests/test_coding_standards.py

@@ -233,7 +233,7 @@ def test_building_the_docs():
     """
     try:
         output = subprocess.check_output(
-            [b"python", b"setup.py", b"build_sphinx"], stderr=subprocess.STDOUT
+            [b"sphinx-build", b"doc", b"build/sphinx"], stderr=subprocess.STDOUT
         )
     except subprocess.CalledProcessError as err:
         assert (

dev-requirements.txt

@@ -3,24 +3,24 @@
 beautifulsoup4==4.12.2
 cookiecutter==2.1.1
 coveralls   #Let Unpinned - Requires latest coveralls
-docutils==0.18
-Faker==18.5.1
-factory-boy==3.2.1
+docutils==0.18.1 # Needed until sphinx-rtd-theme 2.0 is out
+Faker==19.6.2
+factory-boy==3.3.0
 flask-debugtoolbar==0.13.1
 freezegun==1.2.2
 ipdb==0.13.13
-pip-tools==6.13.0
-Pillow==9.5.0
-responses==0.23.1
-sphinx-rtd-theme==1.2.0
+pip-tools==7.3.0
+Pillow==10.0.1
+responses==0.23.3
+sphinx-rtd-theme==1.3.0
 sqlalchemy-stubs==0.4
-sphinx==5.3.0
+sphinx==7.1.2
 toml==0.10.2
 towncrier==22.12.0
 
-pytest==7.3.1
-pytest-cov==4.0.0
+pytest==7.4.2
+pytest-cov==4.1.0
 pytest-factoryboy==2.5.1
 pytest-freezegun==0.4.2
-pytest-rerunfailures==11.1.2
+pytest-rerunfailures==12.0
 pytest-split==0.8.1

doc/contributing/documentation.rst

@@ -83,7 +83,7 @@ Build the docs
 You should now be able to build the CKAN documentation locally. Make sure your
 virtual environment is activated, and then run this command::
 
-    python setup.py build_sphinx
+    sphinx-build doc build/sphinx
 
 Now you can open the built HTML files in
 ``build/sphinx/html``, e.g.::
@@ -96,7 +96,7 @@ Edit the reStructuredText files
 
 To make changes to the documentation, use a text editor to edit the ``.rst``
 files in ``doc/``. Save your changes and then build the docs
-again (``python setup.py build_sphinx``) and open the HTML files in a web
+again (``sphinx-build doc build/sphinx``) and open the HTML files in a web
 browser to preview your changes.
 
 Once your docs are ready to submit to the CKAN project, follow the steps in
@@ -216,7 +216,7 @@ any new ones.
 It's best to delete the ``build`` directory and completely rebuild the docs, to
 check for any warnings::
 
-    rm -rf build; python setup.py build_sphinx
+    rm -rf build; sphinx-build doc build/sphinx
 
 
 Maximum line length

doc/contributing/release-process.rst

@@ -349,7 +349,7 @@ a release.
 #. Check that the docs compile correctly::
 
         rm build/sphinx -rf
-        python setup.py build_sphinx
+        sphinx-build doc build/sphinx
 
 #. Remove the beta letter in the version number.
 

requirements.in

@@ -1,38 +1,39 @@
 # The file contains the direct ckan requirements (python3).
 # Use pip-compile to create a requirements.txt file from this
-alembic==1.10.4
+alembic==1.12.0
 Babel==2.12.1
 Beaker==1.12.1
 bleach==6.0.0
 blinker==1.6.2
-click==8.1.3
-dominate==2.7.0
+certifi>=2023.7.22
+click==8.1.7
+dominate==2.8.0
 feedgen==0.9.0
-Flask==2.3.1
+Flask==2.3.3
 Flask-Babel==3.1.0
 Flask-Login==0.6.2
 Flask-WTF==1.1.1
 # For Python 3.11 support
 greenlet==2.0.2
 Jinja2==3.1.2
-Markdown==3.4.3
+Markdown==3.4.4
 passlib==1.7.4
 polib==1.2.0
-psycopg2==2.9.6
-PyJWT==2.6.0
+psycopg2==2.9.7
+PyJWT==2.8.0
 python-magic==0.4.27
 pysolr==3.9.0
 python-dateutil==2.8.2
 pytz
 PyUtilib==6.0.0
-pyyaml==6.0
-requests==2.29.0
-rq==1.13.0
-simplejson==3.17.6
-SQLAlchemy[mypy]==1.4.47
+pyyaml==6.0.1
+requests==2.31.0
+rq==1.15.1
+simplejson==3.19.1
+SQLAlchemy[mypy]==1.4.49
 sqlparse==0.4.4
-typing_extensions==4.5.0
-tzlocal==4.3
+typing_extensions==4.8.0
+tzlocal==5.0.1
 webassets==2.0
-Werkzeug[watchdog]==2.3.1
+Werkzeug[watchdog]==2.3.7
 zope.interface==6.0

requirements.txt

@@ -1,15 +1,17 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    pip-compile requirements.in
 #
-alembic==1.10.4
+alembic==1.12.0
     # via -r requirements.in
 babel==2.12.1
     # via
     #   -r requirements.in
     #   flask-babel
+backports-zoneinfo==0.2.1
+    # via tzlocal
 beaker==1.12.1
     # via -r requirements.in
 bleach==6.0.0
@@ -18,22 +20,24 @@ blinker==1.6.2
     # via
     #   -r requirements.in
     #   flask
-certifi==2021.10.8
-    # via requests
+certifi==2023.7.22
+    # via
+    #   -r requirements.in
+    #   requests
 charset-normalizer==2.0.12
     # via requests
-click==8.1.3
+click==8.1.7
     # via
     #   -r requirements.in
     #   flask
     #   rq
 deprecated==1.2.13
     # via redis
-dominate==2.7.0
+dominate==2.8.0
     # via -r requirements.in
 feedgen==0.9.0
     # via -r requirements.in
-flask==2.3.1
+flask==2.3.3
     # via
     #   -r requirements.in
     #   flask-babel
@@ -53,8 +57,11 @@ idna==3.3
     # via requests
 importlib-metadata==6.3.0
     # via
+    #   alembic
     #   flask
     #   markdown
+importlib-resources==6.1.0
+    # via alembic
 itsdangerous==2.1.2
     # via
     #   flask
@@ -68,7 +75,7 @@ lxml==4.9.1
     # via feedgen
 mako==1.2.2
     # via alembic
-markdown==3.4.3
+markdown==3.4.4
     # via -r requirements.in
 markupsafe==2.1.1
     # via
@@ -88,9 +95,9 @@ passlib==1.7.4
     # via -r requirements.in
 polib==1.2.0
     # via -r requirements.in
-psycopg2==2.9.6
+psycopg2==2.9.7
     # via -r requirements.in
-pyjwt==2.6.0
+pyjwt==2.8.0
     # via -r requirements.in
 pyparsing==3.0.7
     # via packaging
@@ -105,29 +112,28 @@ python-magic==0.4.27
 pytz==2022.7.1
     # 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
+pyyaml==6.0.1
     # via -r requirements.in
 redis==4.1.4
     # via rq
-requests==2.29.0
+requests==2.31.0
     # via
     #   -r requirements.in
     #   pysolr
-rq==1.13.0
+rq==1.15.1
     # via -r requirements.in
-simplejson==3.17.6
+simplejson==3.19.1
     # via -r requirements.in
 six==1.16.0
     # via
     #   bleach
     #   python-dateutil
     #   pyutilib
-sqlalchemy[mypy]==1.4.47
+sqlalchemy[mypy]==1.4.49
     # via
     #   -r requirements.in
     #   alembic
@@ -137,15 +143,13 @@ sqlparse==0.4.4
     # via -r requirements.in
 tomli==2.0.1
     # via mypy
-typing-extensions==4.5.0
+typing-extensions==4.8.0
     # via
     #   -r requirements.in
     #   alembic
     #   mypy
     #   sqlalchemy2-stubs
-tzdata==2022.1
-    # via pytz-deprecation-shim
-tzlocal==4.3
+tzlocal==5.0.1
     # via -r requirements.in
 urllib3==1.26.9
     # via requests
@@ -155,7 +159,7 @@ webassets==2.0
     # via -r requirements.in
 webencodings==0.5.1
     # via bleach
-werkzeug[watchdog]==2.3.1
+werkzeug[watchdog]==2.3.7
     # via
     #   -r requirements.in
     #   flask
@@ -165,7 +169,9 @@ wrapt==1.14.0
 wtforms==3.0.1
     # via flask-wtf
 zipp==3.15.0
-    # via importlib-metadata
+    # via
+    #   importlib-metadata
+    #   importlib-resources
 zope-interface==6.0
     # via -r requirements.in