Merge pull request #17 from SRautila/master

Switch Django vendored Six to default Six to support Django 3.0

.travis.yml

@@ -1,88 +1,35 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
 env:
-  - DJANGO_VERSION=">=1.4.0,<1.5.0"
-  - DJANGO_VERSION=">=1.5.0,<1.6.0"
-  - DJANGO_VERSION=">=1.6.0,<1.7.0"
-  - DJANGO_VERSION=">=1.7.0,<1.8.0"
-  - DJANGO_VERSION=">=1.8.0,<1.9.0"
-  - DJANGO_VERSION=">=1.9.0,<1.10.0"
-  - DJANGO_VERSION=">=1.10.0,<1.11.0"
   - DJANGO_VERSION=">=1.11.0,<2.0.0"
   - DJANGO_VERSION=">=2.0.0,<2.1.0"
   - DJANGO_VERSION=">=2.1.0,<2.2.0"
+  - DJANGO_VERSION=">=2.2.0,<2.3.0"
+  - DJANGO_VERSION=">=3.0.0,<3.1.0"
 
 matrix:
   exclude:
-    - python: "3.2"
-      env: DJANGO_VERSION=">=1.4.0,<1.5.0"
-    - python: "3.2"
-      env: DJANGO_VERSION=">=1.9.0,<1.10.0"
-    - python: "3.2"
-      env: DJANGO_VERSION=">=1.10.0,<1.11.0"
-    - python: "3.2"
-      env: DJANGO_VERSION=">=1.11.0,<2.0.0"
-    - python: "3.2"
-      env: DJANGO_VERSION=">=2.0.0,<2.1.0"
-    - python: "3.2"
-      env: DJANGO_VERSION=">=2.1.0,<2.2.0"
-    - python: "3.3"
-      env: DJANGO_VERSION=">=1.4.0,<1.5.0"
-    - python: "3.3"
-      env: DJANGO_VERSION=">=1.9.0,<1.10.0"
-    - python: "3.3"
-      env: DJANGO_VERSION=">=1.10.0,<1.11.0"
-    - python: "3.3"
-      env: DJANGO_VERSION=">=1.11.0,<2.0.0"
-    - python: "3.3"
-      env: DJANGO_VERSION=">=2.0.0,<2.1.0"
-    - python: "3.3"
-      env: DJANGO_VERSION=">=2.1.0,<2.2.0"
-    - python: "3.4"
-      env: DJANGO_VERSION=">=1.4.0,<1.5.0"
-    - python: "3.4"
-      env: DJANGO_VERSION=">=2.1.0,<2.2.0"
-    - python: "3.5"
-      env: DJANGO_VERSION=">=1.4.0,<1.5.0"
-    - python: "3.5"
-      env: DJANGO_VERSION=">=1.5.0,<1.6.0"
     - python: "3.5"
-      env: DJANGO_VERSION=">=1.6.0,<1.7.0"
-    - python: "3.5"
-      env: DJANGO_VERSION=">=1.7.0,<1.8.0"
-    - python: "3.6"
-      env: DJANGO_VERSION=">=1.4.0,<1.5.0"
-    - python: "3.6"
-      env: DJANGO_VERSION=">=1.5.0,<1.6.0"
-    - python: "3.6"
-      env: DJANGO_VERSION=">=1.6.0,<1.7.0"
-    - python: "3.6"
-      env: DJANGO_VERSION=">=1.7.0,<1.8.0"
-    - python: "2.6"
-      env: DJANGO_VERSION=">=1.7.0,<1.8.0"
-    - python: "2.6"
-      env: DJANGO_VERSION=">=1.8.0,<1.9.0"
-    - python: "2.6"
-      env: DJANGO_VERSION=">=1.9.0,<1.10.0"
-    - python: "2.6"
-      env: DJANGO_VERSION=">=1.10.0,<1.11.0"
-    - python: "2.6"
+      env: DJANGO_VERSION=">=3.0.0,<3.1.0"
+    - python: "3.8"
       env: DJANGO_VERSION=">=1.11.0,<2.0.0"
-    - python: "2.6"
+    - python: "3.8"
       env: DJANGO_VERSION=">=2.0.0,<2.1.0"
-    - python: "2.6"
+    - python: "3.8"
       env: DJANGO_VERSION=">=2.1.0,<2.2.0"
     - python: "2.7"
       env: DJANGO_VERSION=">=2.0.0,<2.1.0"
     - python: "2.7"
       env: DJANGO_VERSION=">=2.1.0,<2.2.0"
+    - python: "2.7"
+      env: DJANGO_VERSION=">=2.2.0,<2.3.0"
+    - python: "2.7"
+      env: DJANGO_VERSION=">=3.0.0,<3.1.0"
 
 # command to install dependencies
 install:

CHANGELOG.md

@@ -0,0 +1,8 @@
+# CHANGELOG
+
+## 2.0.0 - December 17, 2019
+
+- Stop testing Python 2.6, 3.2, 3.3, 3.5.
+- Stop testing Django < 1.11
+- Start testing Python 3.7, 3.8
+- Start testing Django 2.2, 3.0

CONTRIBUTORS

@@ -4,5 +4,6 @@ Brian Grohe
 Charlie Denton
 Mikhail Porokhovnichenko
 Piper Merriam
+Sebastian Rautila
 Simon Luijk
 Zbigniew Siciarz

README.rst

@@ -13,9 +13,11 @@ Compatible with Django's `storage API <https://docs.djangoproject.com/en/dev/ref
 Supported Versions
 ==================
 
-Python 2.6/2.7 with Django 1.4+
-Python 3.2/3.3/3.4 with Django 1.5+
-Python 3.5/3.6 with Django 1.7+
+- Python 2.7 with Django 1.11
+- Python 3.5/3.6/3.7 with Django 1.11+
+- Python 3.8 with Django 2.2+
+
+In general, we follow `Python's supported versions <https://devguide.python.org/#status-of-python-branches>`_ and `Django's supported versions <https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django>`_. Any major change in version support will be released as a new major version.
 
 =====
 Usage

inmemorystorage/storage.py

@@ -19,8 +19,8 @@
 from django.core.files.storage import Storage
 from django.core.files.base import ContentFile
 from django.utils.encoding import filepath_to_uri
-from django.utils.six.moves.urllib.parse import urljoin
 from django.utils import timezone
+from six.moves.urllib.parse import urljoin
 
 
 class PathDoesNotExist(Exception):

setup.py

@@ -2,13 +2,14 @@
 
 from setuptools import setup
 
-requires = ['Django >= 1.4', 'six>=1.4.1']
+# Six 1.10 is vendored in with Django 1.11 so we require at least that version
+requires = ['Django >= 1.11', 'six>=1.10']
 tests_require = requires
 
 setup(
     name="dj-inmemorystorage",
     description="A non-persistent in-memory data storage backend for Django.",
-    version="1.4.0",
+    version="2.0.0",
     url="https://github.com/waveaccounting/dj-inmemorystorage",
     license=open('LICENSE').read(),
     long_description=open('README.rst').read(),
@@ -29,14 +30,12 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        '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',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Internet :: WWW/HTTP',
     ]
 )