Add support of Python 3.7 and Django 2.1

Author: const-cloudinary

.travis.yml

@@ -2,27 +2,41 @@ language: python
 matrix:
   include:
   - python: 2.7
-    env: TOXENV=py27
+    env: TOXENV=py27-core
   - python: 3.5
-    env: TOXENV=py35
+    env: TOXENV=py35-core
   - python: 3.6
-    env: TOXENV=py36
+    env: TOXENV=py36-core
+  - python: 3.7
+    dist: xenial
+    sudo: true
+    env: TOXENV=py37-core
   - python: 2.7
-    env: TOXENV=py27-django8
+    env: TOXENV=py27-django18
   - python: 3.5
-    env: TOXENV=py35-django8
+    env: TOXENV=py35-django18
   - python: 2.7
-    env: TOXENV=py27-django9
+    env: TOXENV=py27-django19
   - python: 3.5
-    env: TOXENV=py35-django9
+    env: TOXENV=py35-django19
   - python: 2.7
-    env: TOXENV=py27-django10
+    env: TOXENV=py27-django110
   - python: 3.6
-    env: TOXENV=py36-django10
+    env: TOXENV=py36-django110
   - python: 2.7
-    env: TOXENV=py27-django11
+    env: TOXENV=py27-django111
   - python: 3.6
-    env: TOXENV=py36-django11
+    env: TOXENV=py36-django111
+  - python: 3.5
+    env: TOXENV=py35-django20
+  - python: 3.7
+    dist: xenial
+    sudo: true
+    env: TOXENV=py37-django20
+  - python: 3.7
+    dist: xenial
+    sudo: true
+    env: TOXENV=py37-django21
 install:
 - pip install tox
 script:

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Please be aware that the package is used in a wide variety of environments and t
 - Make sure that your code works both with and without Django
 - The code should support:
   - Python >= 2.7
-  - Django >= 1.4
+  - Django >= 1.8
 
 ## Code contribution
 
@@ -75,7 +75,7 @@ Make sure that your code works both with and without Django
 The code should support:
 
   - Python >= 2.7
-  - Django >= 1.4
+  - Django >= 1.8
 
 Make sure that tests completes without errors.
 
@@ -93,7 +93,7 @@ This only runs the tests for the current environment.
 Travis-CI will run the full suite when you submit your pull request.
 
 The full test suite takes a long time to run because it tests multiple combinations of Python and Django.
-You need to have Python 2.7, 3.3, 3.4, 3.5, 3.6 installed to run all of the environments. Then run::
+You need to have Python 2.7, 3.4, 3.5, 3.6, 3.7 installed to run all of the environments. Then run::
 
     CLOUDINARY_URL=cloudinary://apikey:apisecret@cloudname tox
 
@@ -147,4 +147,4 @@ It's likely that your change will not be merged and that the nitpicky maintainer
 
 #### Thank You
 
-Please do know that we really appreciate and value your time and work. We love you, really.
+Please do know that we really appreciate and value your time and work. We love you, really.

setup.py

@@ -19,24 +19,22 @@
           "Development Status :: 5 - Production/Stable",
           "Environment :: Web Environment",
           "Framework :: Django",
-          "Framework :: Django :: 1.4",
-          "Framework :: Django :: 1.5",
-          "Framework :: Django :: 1.6",
-          "Framework :: Django :: 1.7",
           "Framework :: Django :: 1.8",
           "Framework :: Django :: 1.9",
           "Framework :: Django :: 1.10",
           "Framework :: Django :: 1.11",
+          "Framework :: Django :: 2.0",
+          "Framework :: Django :: 2.1",
           "Intended Audience :: Developers",
           "License :: OSI Approved :: MIT License",
           "Programming Language :: Python",
           "Programming Language :: Python :: 2",
           "Programming Language :: Python :: 2.7",
           "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",
           "Topic :: Internet :: WWW/HTTP",
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
           "Topic :: Multimedia :: Graphics",

test/test_uploader.py

@@ -134,7 +134,8 @@ def test_upload_file_io_without_filename(self):
     def test_upload_async(self, mocker):
         """should pass async value """
         mocker.return_value = MOCK_RESPONSE
-        uploader.upload(TEST_IMAGE, tags=[UNIQUE_TAG], async=True)
+        async_option = {"async": True}
+        uploader.upload(TEST_IMAGE, tags=[UNIQUE_TAG], **async_option)
         params = mocker.call_args[0][2]
         self.assertTrue(params['async'])
 

tox.ini

@@ -1,31 +1,21 @@
 [tox]
 envlist =
-  py{27,33,34,35,36}
-  py{27}-django{4}
-  py{27,33}-django{5,6}
-  py{27,33,34}-django{7}
-  py{27,33,34,35}-django{8}
-  py{27,34,35}-django{9,10}
-  py{27,34,35,36}-django{11}
+  py{27,34,35,36,37}-core
+  py{27,34,35}-django{18,19,110}
+  py{27,34,35,36}-django{111}
+  py{36,37}-django{20,21}
 [testenv]
 usedevelop = True
 commands =
-  py{27,33,34,35,36}: python setup.py test {env:P_ARGS:}
-  py{27}-django{4}: django-admin.py test -v2 django_tests {env:D_ARGS:}
-  py{27,33}-django{5,6}: django-admin.py test -v2 django_tests {env:D_ARGS:}
-  py{27,33,34}-django{7}: django-admin.py test -v2 django_tests {env:D_ARGS:}
-  py{27,33,34,35}-django{8}: django-admin.py test -v2 django_tests {env:D_ARGS:}
-  py{27,34,35}-django{9,10}: django-admin.py test -v2 django_tests {env:D_ARGS:}
-  py{27,34,35,36}-django{11}: django-admin.py test -v2 django_tests {env:D_ARGS:}
-passenv = * 
+  py{27,34,35,36,37}-core: python setup.py test {env:P_ARGS:}
+  py{27,34,35,36,37}-django{18,19,110,111,20,21}: django-admin.py test -v2 django_tests {env:D_ARGS:}
+passenv = *
 deps =
-  django4: Django>=1.4,<1.5
-  django5: Django>=1.5,<1.6
-  django6: Django>=1.6,<1.7
-  django7: Django>=1.7,<1.8
-  django8: Django>=1.8,<1.9
-  django9: Django>=1.9,<1.10
-  django10: Django>=1.10,<1.11
-  django11: Django>=1.11,<1.12
+  django18: Django>=1.8,<1.9
+  django19: Django>=1.9,<1.10
+  django110: Django>=1.10,<1.11
+  django111: Django>=1.11,<1.12
+  django20: Django>=2.0,<2.1
+  django21: Django>=2.1,<2.2
 setenv =
   DJANGO_SETTINGS_MODULE=django_tests.settings