Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to support isort 5.0 #70

Merged
merged 5 commits into from
Jul 14, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion flags/jinja2tags.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
1 change: 1 addition & 0 deletions flags/panels.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions flags/state.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import absolute_import

from django.apps import apps
from django.core.exceptions import AppRegistryNotReady

Expand Down
1 change: 1 addition & 0 deletions flags/tests/test_panels.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from django.test import RequestFactory, TestCase, override_settings

from debug_toolbar.toolbar import DebugToolbar

from flags.state import flag_state


Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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 = [
Expand All @@ -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=[
Expand All @@ -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",
],
)
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -52,9 +52,8 @@ 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
known_future_library=future
cwdavies marked this conversation as resolved.
Show resolved Hide resolved
default_section=THIRDPARTY
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER