Merging Tim Graham's branch and fixing conflicts.

.travis.yml

+dist: xenial
 language: python
 python:
   - 2.7
   - 3.5
   - 3.6
+  - 3.7
 env:
   - DJANGO_VERSION='>=1.11,<2.0'
   - DJANGO_VERSION='>=2.0,<2.1'
   - DJANGO_VERSION='>=2.1,<2.2'
+  - DJANGO_VERSION='>=2.2a1,<3.0'
 matrix:
   exclude:
     - python: 2.7
       env: DJANGO_VERSION='>=2.0,<2.1'
     - python: 2.7
       env: DJANGO_VERSION='>=2.1,<2.2'
+    - python: 2.7
+      env: DJANGO_VERSION>=2.2a1,<3.0'
+    - python: 3.4
+      env: DJANGO_VERSION='>=2.1,<2.2'
+    - python: 3.4
+      env: DJANGO_VERSION='>=2.2a1,<3.0'
 # command to run tests
 install: ./install_redis.sh
 script: make test DJANGO_VERSION=$DJANGO_VERSION

Makefile

 SHELL := /bin/bash
 
 PACKAGE_NAME=redis_cache
-DJANGO_VERSION?=>=1.11,<2.2
+DJANGO_VERSION?=>=1.11,<3.0
 
 .PHONY: install_requirements
 install_requirements: requirements*.txt

README.rst

@@ -29,6 +29,7 @@ Changelog
 * Drops support for Python 3.4.
 * Removes custom ``expire`` method in lieu of Django's ``touch``.
 * Removes ``CacheKey`` in favor of string literals.
+* Adds testing for Django 2.2 and Python 3.7 (no code changes required).
 
 
 1.8.0

requirements-dev.txt

@@ -2,4 +2,4 @@ hiredis==0.2.0
 django-nose==1.4.4
 nose==1.3.6
 msgpack-python==0.4.6
-pyyaml>=4.2b1
+pyyaml==3.13

setup.py

@@ -16,6 +16,7 @@ setup(
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Topic :: Software Development :: Libraries",
@@ -25,5 +26,6 @@ setup(
         "Framework :: Django :: 1.11",
         "Framework :: Django :: 2.0",
         "Framework :: Django :: 2.1",
+        "Framework :: Django :: 2.2",
     ],
 )