fix(deps): bump django from 2.2.18 to 2.2.20 (#1172)

* build(deps): bump django from 2.2.18 to 2.2.20 Bumps [django](https://github.com/django/django) from 2.2.18 to 2.2.20. - [Release notes](https://github.com/django/django/releases) - [Commits](django/django@2.2.18...2.2.20) Signed-off-by: dependabot[bot] <[email protected]> * Merge branch 'master' into dependabot/pip/django-2.2.20 * update Pipfile.lock * disable cookie banner in tests and example
ocadotechnology · Apr 20, 2021 · e59277d · e59277d
1 parent 73f57dd
commit e59277d
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 72 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/example_project/example_project/settings.py b/example_project/example_project/settings.py
@@ -78,6 +78,9 @@
 ALLOWED_HOSTS = ['*']
 PIPELINE_ENABLED = False
 
+# This is used in common to enable/disable the OneTrust cookie management script
+COOKIE_MANAGEMENT_ENABLED = False
+
 try:
     from example_project.local_settings import *  # pylint: disable=E0611
 except ImportError:

diff --git a/rapid_router_test_settings.py b/rapid_router_test_settings.py
@@ -8,9 +8,11 @@
 SELENIUM_WEBDRIVERS = {
     "default": {"callable": webdriver.Chrome, "args": (), "kwargs": {}},
     "chrome": {"callable": webdriver.Firefox, "args": (), "kwargs": {}},
-    "chrome-headless": {"callable": webdriver.Chrome, "args": (), "kwargs": {
-        'options': headless_chrome_options
-    }},
+    "chrome-headless": {
+        "callable": webdriver.Chrome,
+        "args": (),
+        "kwargs": {"options": headless_chrome_options},
+    },
 }
 
 DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3"}}
@@ -24,6 +26,9 @@
 )
 SECRET_KEY = "test"
 
+# This is used in common to enable/disable the OneTrust cookie management script
+COOKIE_MANAGEMENT_ENABLED = False
+
 
 from django_autoconfig.autoconfig import configure_settings
 

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        "django==2.2.18",
+        "django==2.2.20",
         "django-js-reverse==0.9.1",
         "django-foundation-statics==5.4.7",
         "django-pipeline==1.6.14",  # Setting this to 1.6.14 as 1.7 causes issue with compiling SCSS files