diff --git a/.travis.yml b/.travis.yml index cfd0895..9b6bdcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ addons: - python-enchant - graphviz python: - - "2.7" - "3.5" - "3.6" env: @@ -30,14 +29,8 @@ matrix: allow_failures: - env: DJANGO=master exclude: - - env: DJANGO=master - python: "2.7" - - env: TOXENV=qa - python: "2.7" - env: TOXENV=qa python: "3.5" - - env: TOXENV=docs - python: "2.7" - env: TOXENV=docs python: "3.5" install: diff --git a/CHANGELOG.md b/CHANGELOG.md index 158ac0c..4a5c385 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ Changelog Summary ================= +* Drop Python 2 support + ### v5.10.0 * Add support for dependent select fields [321](github.com/applegrew/django-select2/pull/321/). diff --git a/django_select2/__init__.py b/django_select2/__init__.py index 8425278..148b548 100644 --- a/django_select2/__init__.py +++ b/django_select2/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ This is a Django_ integration of Select2_. diff --git a/django_select2/cache.py b/django_select2/cache.py index d817b5e..d69e664 100644 --- a/django_select2/cache.py +++ b/django_select2/cache.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Shared memory across multiple machines to the heavy AJAX lookups. @@ -12,8 +11,6 @@ It is advised to always setup a separate cache server for Select2. .. _django.core.cache: https://docs.djangoproject.com/en/dev/topics/cache/ """ -from __future__ import absolute_import, unicode_literals - from django.core.cache import caches from .conf import settings diff --git a/django_select2/conf.py b/django_select2/conf.py index fd62026..8dfb6f2 100644 --- a/django_select2/conf.py +++ b/django_select2/conf.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- """Settings for Django-Select2.""" -from __future__ import absolute_import, unicode_literals - from appconf import AppConf from django.conf import settings # NOQA diff --git a/django_select2/forms.py b/django_select2/forms.py index b3bb410..4c558cd 100644 --- a/django_select2/forms.py +++ b/django_select2/forms.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Django-Select2 Widgets. @@ -46,8 +45,6 @@ Light widgets are normally named, i.e. there is no :parts: 1 """ -from __future__ import absolute_import, unicode_literals - from functools import reduce from itertools import chain from pickle import PicklingError diff --git a/django_select2/urls.py b/django_select2/urls.py index f0e8673..93123e7 100644 --- a/django_select2/urls.py +++ b/django_select2/urls.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """ Django-Select2 URL configuration. @@ -7,8 +6,6 @@ Add `django_select` to your ``urlconf`` **if** you use any 'Model' fields:: url(r'^select2/', include('django_select2.urls')), """ -from __future__ import absolute_import, unicode_literals - from django.conf.urls import url from .views import AutoResponseView diff --git a/django_select2/views.py b/django_select2/views.py index fb90df5..72704d6 100644 --- a/django_select2/views.py +++ b/django_select2/views.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- """JSONResponse views for model widgets.""" -from __future__ import absolute_import, unicode_literals - from django.core import signing from django.core.signing import BadSignature from django.http import Http404, JsonResponse diff --git a/docs/conf.py b/docs/conf.py index 8588703..bd10a26 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Django-Select2 documentation build configuration file, created by # sphinx-quickstart on Sat Aug 25 10:23:46 2012. diff --git a/setup.py b/setup.py index 875e525..c5f49cf 100755 --- a/setup.py +++ b/setup.py @@ -1,11 +1,8 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import codecs import os -from setuptools import Command, find_packages, setup +from setuptools import find_packages, setup def read(file_name): @@ -40,7 +37,6 @@ setup( "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Programming Language :: Python", - "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", "Framework :: Django", "Framework :: Django :: 1.8", diff --git a/tests/__init__.py b/tests/__init__.py index 74dca93..e69de29 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1 +0,0 @@ -__author__ = 'johannes' diff --git a/tests/conftest.py b/tests/conftest.py index ece33dc..6330a97 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import absolute_import, print_function, unicode_literals - import random import string diff --git a/tests/test_cache.py b/tests/test_cache.py index 8666c41..49c6bb5 100644 --- a/tests/test_cache.py +++ b/tests/test_cache.py @@ -1,7 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import absolute_import, unicode_literals - - def test_default_cache(): from django_select2.cache import cache diff --git a/tests/test_forms.py b/tests/test_forms.py index 5c817ec..b3f29c3 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - import collections import json import os diff --git a/tests/test_views.py b/tests/test_views.py index 857ba98..3adf47a 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import absolute_import, unicode_literals - import json from django.core import signing diff --git a/tests/testapp/forms.py b/tests/testapp/forms.py index d42198f..bffb301 100644 --- a/tests/testapp/forms.py +++ b/tests/testapp/forms.py @@ -1,6 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import absolute_import, unicode_literals - from django import forms from django.utils.encoding import force_text diff --git a/tests/testapp/models.py b/tests/testapp/models.py index 34c0715..13a56c3 100644 --- a/tests/testapp/models.py +++ b/tests/testapp/models.py @@ -1,6 +1,3 @@ -# -*- coding:utf-8 -*- -from __future__ import absolute_import, unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/testapp/urls.py b/tests/testapp/urls.py index 728cf8f..1baaa58 100644 --- a/tests/testapp/urls.py +++ b/tests/testapp/urls.py @@ -1,6 +1,3 @@ -# -*- conding:utf-8 -*- -from __future__ import absolute_import, unicode_literals - from django.conf.urls import include, url from .forms import ( diff --git a/tests/testapp/views.py b/tests/testapp/views.py index 35e97c8..4bf12bf 100644 --- a/tests/testapp/views.py +++ b/tests/testapp/views.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import json from django.http import HttpResponse diff --git a/tox.ini b/tox.ini index 5d54436..ae25f02 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{27,35,36}-dj{18,110,111,master},qa,docs +envlist = py{35,36}-dj{18,110,111,master},qa,docs [testenv] setenv= PYTHONPATH = {toxinidir}