From daef2429745558c1b1f7e65203780dc058e1500a Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Fri, 24 Aug 2018 08:54:52 +0200 Subject: [PATCH] Fix pep8, dropped Django 1.8, 1.9, 1.10 from the test config --- .travis.yml | 12 ------------ rosetta/poutil.py | 3 +-- rosetta/templatetags/rosetta.py | 1 - tox.ini | 5 +---- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 463d3b7..42fb4ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,20 +3,8 @@ services: memcached matrix: include: - - python: "3.6" - env: TOX_ENV=py36-django18 - - python: "3.6" - env: TOX_ENV=py36-django19 - - python: "3.6" - env: TOX_ENV=py36-django110 - python: "3.6" env: TOX_ENV=py36-django111 - - python: "2.7" - env: TOX_ENV=py27-django18 - - python: "2.7" - env: TOX_ENV=py27-django19 - - python: "2.7" - env: TOX_ENV=py27-django110 - python: "2.7" env: TOX_ENV=py27-django111 - python: "3.6" diff --git a/rosetta/poutil.py b/rosetta/poutil.py index dde6e29..a910545 100644 --- a/rosetta/poutil.py +++ b/rosetta/poutil.py @@ -3,8 +3,7 @@ from django.conf import settings from rosetta.conf import settings as rosetta_settings import django import os -import inspect -from django.apps import AppConfig, apps +from django.apps import apps from django.utils import timezone from django.core.cache import caches cache = caches[rosetta_settings.ROSETTA_CACHE_NAME] diff --git a/rosetta/templatetags/rosetta.py b/rosetta/templatetags/rosetta.py index 6f581c2..3d34291 100644 --- a/rosetta/templatetags/rosetta.py +++ b/rosetta/templatetags/rosetta.py @@ -65,4 +65,3 @@ class IncrNode(template.Node): def is_fuzzy(message): return message and hasattr(message, 'flags') and 'fuzzy' in message.flags is_fuzzy = register.filter(is_fuzzy) - diff --git a/tox.ini b/tox.ini index dff05d4..e4527bb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = flake8, - {py27,py36}-django{18,19,110,111}, + {py27,py36}-django111, py36-django{20,21}, gettext,docs @@ -17,9 +17,6 @@ setenv = PYTHONDONTWRITEBYTECODE=1 deps = - django18: Django==1.8.* - django19: Django==1.9.* - django110: Django==1.10.* django111: Django==1.11.* django20: Django==2.0.* django21: Django>=2.1a1,<=2.1.99