Merge 6a48d5a into db1f1d5

flags/jinja2tags.py

@@ -1,7 +1,8 @@
-from flags.templatetags.feature_flags import flag_disabled, flag_enabled
 from jinja2 import contextfunction
 from jinja2.ext import Extension
 
+from flags.templatetags.feature_flags import flag_disabled, flag_enabled
+
 
 class FlagsExtension(Extension):
     def __init__(self, environment):

flags/panels.py

@@ -3,6 +3,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar.panels import Panel
+
 from flags import state
 from flags.sources import get_flags
 

flags/state.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from django.apps import apps
 from django.core.exceptions import AppRegistryNotReady
 

flags/tests/test_panels.py

@@ -2,6 +2,7 @@
 from django.test import RequestFactory, TestCase, override_settings
 
 from debug_toolbar.toolbar import DebugToolbar
+
 from flags.state import flag_state
 
 

setup.py

@@ -1,8 +1,6 @@
 from setuptools import find_packages, setup
 
 
-long_description = open("README.md", "r").read()
-
 install_requires = ["Django>=1.11,<3.1"]
 
 testing_extras = [
@@ -23,12 +21,13 @@
     author="CFPB",
     author_email="tech@cfpb.gov",
     description="Feature flags for Django projects",
-    long_description=long_description,
+    long_description=open("README.md", "r", encoding="utf-8").read(),
     long_description_content_type="text/markdown",
     license="CC0",
     version="5.0.0",
     include_package_data=True,
     packages=find_packages(),
+    python_requires=">=3.6",
     install_requires=install_requires,
     extras_require={"testing": testing_extras, "docs": docs_extras},
     classifiers=[
@@ -39,8 +38,5 @@
         "License :: Public Domain",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
     ],
 )

tox.ini

@@ -28,7 +28,7 @@ deps=
 commands=
     black --check flags setup.py
     flake8 flags setup.py
-    isort --check-only --diff --recursive flags
+    isort --check-only --diff flags
 
 [testenv:docs]
 basepython=python3.6
@@ -52,7 +52,6 @@ lines_after_imports=2
 include_trailing_comma=1
 multi_line_output=3
 skip=.tox,migrations
-not_skip=__init__.py
 use_parentheses=1
 known_django=django
 known_future_library=future,six