From dfa6c5bbd2588462d5e9225281edb5c93c4eb688 Mon Sep 17 00:00:00 2001 From: Bernd Schlapsi Date: Thu, 17 Dec 2020 14:31:31 +0100 Subject: [PATCH] Require at least Python 3.6 --- .travis.yml | 2 +- conftest.py | 2 -- sentry_auth_oauth2/__init__.py | 2 -- sentry_auth_oauth2/apps.py | 1 - sentry_auth_oauth2/client.py | 2 -- sentry_auth_oauth2/constants.py | 2 -- sentry_auth_oauth2/provider.py | 2 -- sentry_auth_oauth2/views.py | 2 -- setup.py | 1 + tests/test_views.py | 2 -- 10 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index a19bbdb..e2a4c70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: - postgresql - redis-server python: - - '2.7' + - '3.6' cache: directories: - node_modules diff --git a/conftest.py b/conftest.py index 5ba8cab..921a8ad 100644 --- a/conftest.py +++ b/conftest.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import sys import os.path diff --git a/sentry_auth_oauth2/__init__.py b/sentry_auth_oauth2/__init__.py index 676d763..5abdb41 100644 --- a/sentry_auth_oauth2/__init__.py +++ b/sentry_auth_oauth2/__init__.py @@ -1,3 +1 @@ -from __future__ import absolute_import - default_app_config = "sentry_auth_oauth2.apps.Config" diff --git a/sentry_auth_oauth2/apps.py b/sentry_auth_oauth2/apps.py index c277f6b..d2c5118 100644 --- a/sentry_auth_oauth2/apps.py +++ b/sentry_auth_oauth2/apps.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from django.apps import AppConfig diff --git a/sentry_auth_oauth2/client.py b/sentry_auth_oauth2/client.py index aae2e3c..663bdf7 100644 --- a/sentry_auth_oauth2/client.py +++ b/sentry_auth_oauth2/client.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - from requests.exceptions import RequestException from sentry import http from sentry.utils import json diff --git a/sentry_auth_oauth2/constants.py b/sentry_auth_oauth2/constants.py index 04e80a1..6ff1a59 100644 --- a/sentry_auth_oauth2/constants.py +++ b/sentry_auth_oauth2/constants.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - from django.conf import settings CLIENT_ID = getattr(settings, 'OAUTH2_APP_ID', None) diff --git a/sentry_auth_oauth2/provider.py b/sentry_auth_oauth2/provider.py index 11e736f..04ca55a 100644 --- a/sentry_auth_oauth2/provider.py +++ b/sentry_auth_oauth2/provider.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - from sentry.auth.exceptions import IdentityNotValid from sentry.auth.providers.oauth2 import ( OAuth2Callback, OAuth2Provider, OAuth2Login diff --git a/sentry_auth_oauth2/views.py b/sentry_auth_oauth2/views.py index 08477e9..b99ac50 100644 --- a/sentry_auth_oauth2/views.py +++ b/sentry_auth_oauth2/views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - from django import forms from sentry.auth.view import AuthView, ConfigureView from sentry.models import AuthIdentity diff --git a/setup.py b/setup.py index c86eb22..81ca594 100644 --- a/setup.py +++ b/setup.py @@ -43,4 +43,5 @@ 'Operating System :: OS Independent', 'Topic :: Software Development' ], + python_requires='>=3.6', ) diff --git a/tests/test_views.py b/tests/test_views.py index e719b48..fa0bef7 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import, print_function - import pytest from sentry_auth_oauth2.views import _get_name_from_email