diff --git a/.travis.yml b/.travis.yml index a94e817..ef286ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ matrix: env: TOX_ENV=py38-django31 - python: "3.9" env: TOX_ENV=py39-django31 + - python: "3.9" + env: TOX_ENV=py39-django32 install: - pip install tox diff --git a/CHANGES b/CHANGES index e1ecba4..d291aa2 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,7 @@ Version 0.9.6 (unreleased) * Test against Python 3.9 (#251, thanks @mondeja) * Upgraded Turkish translation (#253, thanks @realsuayip) * Added support for Google Translation API (#222, thanks @martinsvoboda) +* Test against Django 3.2b1 Version 0.9.5 diff --git a/rosetta/tests/tests.py b/rosetta/tests/tests.py index 31171b6..bdd8e76 100644 --- a/rosetta/tests/tests.py +++ b/rosetta/tests/tests.py @@ -96,8 +96,7 @@ class RosettaTestCase(TestCase): kwargs = {'po_filter': 'third-party', 'lang_id': 'xx', 'idx': 0} url = reverse('rosetta-download-file', kwargs=kwargs) r = self.client.get(url) - self.assertTrue('content-type' in r._headers.keys()) - self.assertTrue('application/x-zip' in r._headers.get('content-type')) + self.assertTrue('application/x-zip' in r['content-type']) @override_settings(ROSETTA_LANGUAGES=(('xx', 'dummy language'),)) def test_4_DoChanges(self): diff --git a/testproject/settings.py b/testproject/settings.py index 4ac4056..8023e14 100644 --- a/testproject/settings.py +++ b/testproject/settings.py @@ -9,7 +9,6 @@ SITE_ID = 1 PROJECT_PATH = os.path.abspath(os.path.dirname(__file__)) PYTHON_VERSION = '%s.%s' % sys.version_info[:2] -DJANGO_VERSION = django.get_version() DATABASES = { 'default': { @@ -18,14 +17,22 @@ DATABASES = { } } -CACHES = { - 'default': { - 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': '127.0.0.1:11211', - 'KEY_PREFIX': 'ROSETTA_TEST', +if django.VERSION[:3] >= (3, 2, 0): + CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache', + 'LOCATION': '127.0.0.1:11211', + 'KEY_PREFIX': 'ROSETTA_TEST', + } + } +else: + CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', + 'LOCATION': '127.0.0.1:11211', + 'KEY_PREFIX': 'ROSETTA_TEST', + } } -} - # CACHES = {'default': {'BACKEND': 'django.core.cache.backends.dummy.DummyCache'}} diff --git a/tox.ini b/tox.ini index e80eb67..578cbf9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] envlist = flake8, - py{36,37,38,39}-django{22,30,31}, + py{36,37,38,39}-django{22,30,31,32}, + gettext, docs @@ -22,8 +23,10 @@ deps = django22: Django>=2.2.17,<=2.2.99 django30: Django>=3.0,<=3.0.99 django31: Django>=3.1,<=3.1.99 + django32: Django>=3.2a1,<=3.2.99 python-memcached + django32: pymemcache requests polib>=1.1.0 six