more

Author: muhammad-ammar

.travis.yml

@@ -20,14 +20,15 @@ matrix:
   exclude:
    - python: "2.7"
      env: DJANGO_VERSION=master
-   - python: "pypy"
-     env: DJANGO_VERSION=master
    - python: "2.7"
      env: DJANGO_VERSION=2.2.x
+   - python: "3.4"
+     env: DJANGO_VERSION=master
    - python: "3.4"
      env: DJANGO_VERSION=2.2.x
-   - python: "pypy"
-     env: DJANGO_VERSION=2.2.x
-  include:
    - python: "3.5"
+     env: DJANGO_VERSION=master
+   - python: "pypy"
      env: DJANGO_VERSION=2.2.x
+   - python: "pypy"
+     env: DJANGO_VERSION=master

setup.py

@@ -83,5 +83,8 @@ def read(*parts):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 )

src/django_babel_underscore/__init__.py

@@ -1,10 +1,13 @@
 # -*- coding: utf-8 -*-
 import django
 
-if django.VERSION[:2] >= (1, 8):
-    from django.template.base import Lexer, TOKEN_TEXT
+from django.template.base import Lexer
+try:
+    from django.template.base import TokenType
+except ImportError:  # django < 2.1
+    from django.template.base import TOKEN_TEXT
 else:
-    from django.template import Lexer, TOKEN_TEXT
+    TOKEN_TEXT = TokenType.TEXT
 
 from django.utils.encoding import force_text
 from django_babel.extract import extract_django

tox.ini

@@ -95,10 +95,6 @@ deps = {[testenv]deps110}
 basepython = pypy
 deps = {[testenv]deps111}
 
-[testenv:pypy-2.2.x]
-basepython = pypy
-deps = {[testenv]deps22}
-
 [docs]
 commands =
     pip install -e {toxinidir}