From 48e9fb6ed4dbc551a7276e552fbc90ec1ad2b98f Mon Sep 17 00:00:00 2001 From: "ayush.goyal" Date: Thu, 18 Feb 2021 17:49:08 +0530 Subject: [PATCH 1/2] Fix Compatibility till Django 3.0 --- .travis.yml | 10 +++++++++- django_babel/extract.py | 11 ++++++++++- setup.py | 2 +- tox.ini | 8 +++++++- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ff110a..dcc7612 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,9 @@ env: - TOX_ENV=py35-django18 - TOX_ENV=py35-django111 - TOX_ENV=py35-django20 - - TOX_ENV=py35-djangomaster + - TOX_ENV=py35-django21 + - TOX_ENV=py35-django22 + - TOX_ENV=py35-django30 matrix: include: - env: TOX_ENV=py36-django18 @@ -21,6 +23,12 @@ matrix: python: "3.6" - env: TOX_ENV=py36-django20 python: "3.6" + - env: TOX_ENV=py36-django21 + python: "3.6" + - env: TOX_ENV=py36-django22 + python: "3.6" + - env: TOX_ENV=py36-django30 + python: "3.6" - env: TOX_ENV=py36-djangomaster python: "3.6" install: pip install tox diff --git a/django_babel/extract.py b/django_babel/extract.py index edb42c7..e664a16 100644 --- a/django_babel/extract.py +++ b/django_babel/extract.py @@ -1,5 +1,14 @@ # -*- coding: utf-8 -*- -from django.template.base import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK +try: + from django.template.base import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK +except ImportError: + # Django 2.1+ + from django.template.base import Lexer, TokenType + + TOKEN_TEXT = TokenType.TEXT + TOKEN_VAR = TokenType.VAR + TOKEN_BLOCK = TokenType.BLOCK + from django.utils.translation import trim_whitespace from django.utils.encoding import smart_text diff --git a/setup.py b/setup.py index 9c62fef..e68396a 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def read(*parts): url='https://github.com/python-babel/django-babel/', packages=find_packages(exclude=('tests',)), install_requires=[ - 'django>=1.8,<3.0', + 'django>=1.8,<3.1', 'babel>=1.3', ], classifiers=[ diff --git a/tox.ini b/tox.ini index e763d02..5a07f77 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,8 @@ [tox] -envlist = py{35,36}-djangomaster, py{27,34,35,36}-django{18,111,20}, lint, docs +envlist = py{27,34,35,36}-django{18,111}, + py{35,36,37}-django{20,21,22,30}, + py{36,37}-django{master}, + lint, docs [testenv] deps = @@ -11,6 +14,9 @@ deps = django18: Django>=1.8,<1.9 django111: Django>=1.11,<2.0 django20: Django>=2.0,<2.1 + django21: Django>=2.1,<2.2 + django22: Django>=2.2,<3 + django30: Django>=3.0,<3.1 djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django commands = py.test {posargs} From eda342b4c5a8899557335e520e84abe61f5cafd2 Mon Sep 17 00:00:00 2001 From: "ayush.goyal" Date: Tue, 23 Feb 2021 11:05:57 +0530 Subject: [PATCH 2/2] Fix Compatibility till Django 3.1 --- .travis.yml | 3 +++ setup.py | 2 +- tox.ini | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcc7612..edc1f4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ env: - TOX_ENV=py35-django21 - TOX_ENV=py35-django22 - TOX_ENV=py35-django30 + - TOX_ENV=py35-django31 matrix: include: - env: TOX_ENV=py36-django18 @@ -29,6 +30,8 @@ matrix: python: "3.6" - env: TOX_ENV=py36-django30 python: "3.6" + - env: TOX_ENV=py36-django31 + python: "3.6" - env: TOX_ENV=py36-djangomaster python: "3.6" install: pip install tox diff --git a/setup.py b/setup.py index e68396a..9dcfc6b 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def read(*parts): url='https://github.com/python-babel/django-babel/', packages=find_packages(exclude=('tests',)), install_requires=[ - 'django>=1.8,<3.1', + 'django>=1.8,<3.2', 'babel>=1.3', ], classifiers=[ diff --git a/tox.ini b/tox.ini index 5a07f77..af04d61 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = py{27,34,35,36}-django{18,111}, - py{35,36,37}-django{20,21,22,30}, + py{35,36,37}-django{20,21,22,30,31}, py{36,37}-django{master}, lint, docs @@ -17,6 +17,7 @@ deps = django21: Django>=2.1,<2.2 django22: Django>=2.2,<3 django30: Django>=3.0,<3.1 + django31: Django>=3.1,<3.2 djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django commands = py.test {posargs}