Browse Source

py38: Django 2.0 (#25894)

josh 3 years ago
parent
commit
5f6d6eb10d

+ 2 - 0
pyproject.toml

@@ -33,6 +33,8 @@ filterwarnings = [
     # TODO(joshuarli): Enable this and address all after Django 2.0 lands.
     "ignore::django.utils.deprecation.RemovedInDjango21Warning",
 
+    "ignore::django.utils.deprecation.RemovedInDjango30Warning",
+
     # DeprecationWarnings from Python 3.6's sre_parse are just so painful,
     # and I haven't found a way to ignore it specifically from a module.
     # This one in particular is from the "cookies" packages as depended

+ 1 - 1
requirements-base.txt

@@ -10,7 +10,7 @@ dataclasses==0.8; python_version <= '3.6'
 datadog==0.29.3
 django-crispy-forms==1.7.2
 django-picklefield==1.0.0
-Django==1.11.29
+Django==2.0.13
 djangorestframework==3.11.2
 email-reply-parser==0.5.12
 google-api-core==1.25.1

+ 0 - 3
src/sentry/runner/commands/upgrade.py

@@ -54,9 +54,6 @@ def _upgrade(interactive, traceback, verbosity, repair, with_nodestore):
                 interactive=interactive,
                 traceback=traceback,
                 verbosity=verbosity,
-                migrate=True,
-                merge=True,
-                ignore_ghost_migrations=True,
             )
 
     if with_nodestore:

+ 3 - 1
src/sentry/runner/settings.py

@@ -92,12 +92,14 @@ def configure(ctx, py, yaml, skip_service_validation=False):
     # Make sure that our warnings are always displayed.
     warnings.filterwarnings("default", "", Warning, r"^sentry")
 
-    from django.utils.deprecation import RemovedInDjango21Warning
+    from django.utils.deprecation import RemovedInDjango21Warning, RemovedInDjango30Warning
 
     # While we're on Django 1.9, we only care about RemovedInDjango20Warning.
     # TODO(joshuarli): Remove this after RemovedInDjango21Warnings are fixed in testing.
     warnings.filterwarnings(action="ignore", category=RemovedInDjango21Warning)
 
+    warnings.filterwarnings(action="ignore", category=RemovedInDjango30Warning)
+
     # Add in additional mimetypes that are useful for our static files
     # which aren't common in default system registries
     import mimetypes

+ 4 - 0
src/sentry/utils/pytest/sentry.py

@@ -15,6 +15,10 @@ TEST_ROOT = os.path.normpath(
 def pytest_configure(config):
     import warnings
 
+    from django.utils.deprecation import RemovedInDjango30Warning
+
+    warnings.filterwarnings(action="ignore", category=RemovedInDjango30Warning)
+
     # This is just to filter out an obvious warning before the pytest session starts.
     warnings.filterwarnings(
         action="ignore",

+ 1 - 1
tests/sentry/api/endpoints/test_organization_code_mapping_codeowners.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from sentry.models import Integration, Repository
 from sentry.testutils import APITestCase

+ 1 - 1
tests/sentry/api/endpoints/test_project_metrics.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from sentry.models import ApiToken
 from sentry.testutils import APITestCase