Merge remote-tracking branch 'origin/develop' into release/2.7

dev-requirements.txt

@@ -4,11 +4,11 @@ flake8-docstrings
 nose
 pep8
 pyflakes
-pydocstyle<4.0
+pydocstyle<7.0
 httmock==1.4.0
 watchdog==0.9.0
 wooper==0.4.4
-requests-mock==1.8.0
+requests-mock==1.11.0
 responses
 pytest
 pytest-env

docs/requirements.txt

@@ -16,21 +16,21 @@ colorama==0.4.6
     # via sphinx-autobuild
 docutils==0.19
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   sphinx
 idna==3.6
     # via requests
 imagesize==1.4.1
     # via sphinx
 jinja2==3.1.3
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   sphinx
 livereload==2.6.3
     # via sphinx-autobuild
 markupsafe==2.0.1
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   jinja2
 packaging==23.2
     # via sphinx
@@ -42,13 +42,13 @@ six==1.16.0
     # via livereload
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==5.1.1
+sphinx==7.2.6
     # via
-    #   -r requirements.in
+    #   -r docs/requirements.in
     #   sphinx-autobuild
     #   sphinxcontrib-plantuml
-sphinx-autobuild==2021.3.14
-    # via -r requirements.in
+sphinx-autobuild==2024.2.4
+    # via -r docs/requirements.in
 sphinxcontrib-applehelp==1.0.8
     # via sphinx
 sphinxcontrib-devhelp==1.0.6
@@ -58,7 +58,7 @@ sphinxcontrib-htmlhelp==2.0.5
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
 sphinxcontrib-plantuml==0.27
-    # via -r requirements.in
+    # via -r docs/requirements.in
 sphinxcontrib-qthelp==1.0.7
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.10

setup.py

@@ -18,20 +18,20 @@
     # (cf. https://github.com/psf/requests/issues/5654
     # and https://github.com/psf/requests/pull/5651)
     "urllib3<1.26",
-    "eve==1.1.2",
+    "eve>=1.1.2,<=2.1.0",
     "eve-elastic>=7.4.0,<7.5.0",
     "elasticsearch<7.14",  # we are using oss version on test server
     "flask>=1.1,<1.2",
     "flask-mail>=0.9,<0.10",
     "flask-script>=2.0.5,<3.0",
-    "flask-babel>=1.0,<1.1",
+    "flask-babel>=1.0,<4.1",
     "pillow>=9.2,<9.3",
     "arrow>=0.4,<=0.13",
     "bcrypt>=3.1.1,<3.2",
     "blinker>=1.3,<1.8",
     "celery[redis]>=5.2.7,<5.3",
     "cerberus>=1.3.2,<1.4",
-    "redis>=4.5.2,<4.6",
+    "redis>=4.5.2,<5.1",
     "kombu>=5.2.4,<5.3",
     "feedparser>=6.0.8,<6.1",
     "hachoir<=3.0a3",

superdesk/default_settings.py

@@ -530,7 +530,6 @@ def local_to_utc_hour(hour):
         "superdesk.places",
         "apps.desk_routing",
         "apps.system_message",
-        "apps.rundowns",
     ]
 )
 

superdesk/tests/__init__.py

@@ -93,7 +93,7 @@ def update_config(conf):
     conf["MACROS_MODULE"] = "superdesk.macros"
     conf["DEFAULT_TIMEZONE"] = "Europe/Prague"
     conf["LEGAL_ARCHIVE"] = True
-    conf["INSTALLED_APPS"].extend(["planning", "superdesk.macros.imperial"])
+    conf["INSTALLED_APPS"].extend(["planning", "superdesk.macros.imperial", "apps.rundowns"])
 
     # limit mongodb connections
     conf["MONGO_CONNECT"] = False