[Django 3.0] Adding compatible versions of other libraries according …

apps/jobbrowser/src/jobbrowser/tests.py

@@ -21,6 +21,7 @@
 import json
 import logging
 import re
+import sys
 import time
 import unittest
 
@@ -490,7 +491,10 @@ def test_acls_job(self):
     assert_false(can_modify_job('test3', response.context[0]['job']))
 
     response2 = self.c3.get('/jobbrowser/jobs/job_1356251510842_0054')
-    assert_true(b'don't have permission to access job' in response2.content, response2.content)
+    if sys.version_info[0] < 3:
+      assert_true(b'don&#39;t have permission to access job' in response2.content, response2.content)
+    else:
+      assert_true(b'don&#x27;t have permission to access job' in response2.content, response2.content)
 
   def test_kill_job(self):
     job_id = 'application_1356251510842_0054'

apps/oozie/src/oozie/views/editor.py

@@ -398,7 +398,7 @@ def schedule_workflow(request, workflow):
 
 
 @check_job_access_permission()
-def create_coordinator(request, workflow=None):
+def create_coordinator(request, workflow=None, *args, **kwargs):
   if workflow is not None:
     coordinator = Coordinator(owner=request.user, schema_version="uri:oozie:coordinator:0.2", coordinatorworkflow=workflow)
   else:

desktop/core/requirements.txt

@@ -4,14 +4,13 @@ Babel==2.5.1
 boto==2.46.1
 celery[redis]==4.4.5  # For Python 3.8
 cffi==1.13.2
-channels==2.1.6
-channels-redis==2.3.2
+channels==3.0.3
+channels-redis==3.2.0
 configobj==5.0.6
 cryptography==3.3.2
-django-auth-ldap==1.3.0
-Django==2.2.17
+django-auth-ldap==2.3.0
+Django==3.0.12
 django-axes==5.13.0
-django_babel==0.6.2
 django-celery-beat==1.4.0
 django_celery_results==1.0.4
 django-cors-headers==3.7.0
@@ -64,3 +63,4 @@ sqlparse==0.4.1
 tablib==0.13.0
 thrift==0.13.0
 thrift-sasl==0.4.2
+git+git://github.com/agl29/django-babel.git

desktop/core/src/desktop/ldaptestcmd_tests.py

@@ -21,7 +21,7 @@
 from django.core import management
 from django.core.management import get_commands
 from django.test import SimpleTestCase
-from django.utils.six import StringIO
+from six import StringIO
 
 class CmdTests(SimpleTestCase):
   def checkcmd(self):

desktop/core/src/desktop/management/commands/test.py

@@ -28,7 +28,7 @@
 from django_nose import runner
 
 #import south.management.commands
-from django.utils import six
+import six
 from django.utils.translation import deactivate
 import sys
 import textwrap
@@ -38,57 +38,57 @@
 from desktop.lib import django_mako
 
 if six.PY3:
-    from types import SimpleNamespace
+  from types import SimpleNamespace
 else:
-    class SimpleNamespace(object):
-        pass
+  class SimpleNamespace(object):
+    pass
 
 class _TestState(object):
-    pass
+  pass
 
 
 def setup_test_environment(debug=None):
-    """
-    Perform global pre-test setup, such as installing the instrumented template
-    renderer and setting the email backend to the locmem email backend.
-    """
-    if hasattr(_TestState, 'saved_data'):
-        # Executing this function twice would overwrite the saved values.
-        raise RuntimeError(
-            "setup_test_environment() was already called and can't be called "
-            "again without first calling teardown_test_environment()."
-        )
+  """
+  Perform global pre-test setup, such as installing the instrumented template
+  renderer and setting the email backend to the locmem email backend.
+  """
+  if hasattr(_TestState, 'saved_data'):
+    # Executing this function twice would overwrite the saved values.
+    raise RuntimeError(
+        "setup_test_environment() was already called and can't be called "
+        "again without first calling teardown_test_environment()."
+    )
 
-    if debug is None:
-        debug = settings.DEBUG
+  if debug is None:
+    debug = settings.DEBUG
 
-    saved_data = SimpleNamespace()
-    _TestState.saved_data = saved_data
+  saved_data = SimpleNamespace()
+  _TestState.saved_data = saved_data
 
-    saved_data.allowed_hosts = settings.ALLOWED_HOSTS
-    # Add the default host of the test client.
-    settings.ALLOWED_HOSTS = list(settings.ALLOWED_HOSTS) + ['testserver']
+  saved_data.allowed_hosts = settings.ALLOWED_HOSTS
+  # Add the default host of the test client.
+  settings.ALLOWED_HOSTS = list(settings.ALLOWED_HOSTS) + ['testserver']
 
-    saved_data.debug = settings.DEBUG
-    settings.DEBUG = debug
+  saved_data.debug = settings.DEBUG
+  settings.DEBUG = debug
 
-    django_mako.render_to_string = django_mako.render_to_string_test
+  django_mako.render_to_string = django_mako.render_to_string_test
 
-    deactivate()
+  deactivate()
 
 
 def teardown_test_environment():
-    """
-    Perform any global post-test teardown, such as restoring the original
-    template renderer and restoring the email sending functions.
-    """
-    saved_data = _TestState.saved_data
+  """
+  Perform any global post-test teardown, such as restoring the original
+  template renderer and restoring the email sending functions.
+  """
+  saved_data = _TestState.saved_data
 
-    settings.ALLOWED_HOSTS = saved_data.allowed_hosts
-    settings.DEBUG = saved_data.debug
-    django_mako.render_to_string = django_mako.render_to_string_normal
+  settings.ALLOWED_HOSTS = saved_data.allowed_hosts
+  settings.DEBUG = saved_data.debug
+  django_mako.render_to_string = django_mako.render_to_string_normal
 
-    del _TestState.saved_data
+  del _TestState.saved_data
 
 
 class Command(BaseCommand):
@@ -103,8 +103,8 @@ class Command(BaseCommand):
       specific      Explicitly run specific tests using nose.
                     For example, to run all the filebrower tests or
                     to run a specific test function, use
-                       test specific filebrowser
-                       test specific useradmin.tests:test_user_admin
+                        test specific filebrowser
+                        test specific useradmin.tests:test_user_admin
                     All additional arguments are passed directly to nose.
 
       list_modules  List test modules for all desktop applications and libraries
@@ -141,7 +141,7 @@ def run_from_argv(self, argv):
       sys.exit(1)
 
     nose_args = None
-    all_apps = [ app.module.__name__ for app in appmanager.DESKTOP_MODULES ]
+    all_apps = [app.module.__name__ for app in appmanager.DESKTOP_MODULES]
 
     if args[0] == "all":
       nose_args = args + all_apps