Merge pull request #127 from toastdriven/release-2.2.0

Release restless 2.2.0

.travis.yml

@@ -1,18 +1,20 @@
 language: python
-dist: xenial
 
 python:
-  - "2.7"
-  - "3.5"
   - "3.6"
   - "3.7"
-  - "pypy2.7-6.0" # CPython 2.7
+  - "3.8"
+  - "3.9"
+  - "pypy3"
 
 env:
-  - DJANGO="1.8"
-  - DJANGO="1.9"
-  - DJANGO="1.10"
-  - DJANGO="1.11"
+  - DJANGO="2.2"
+  - DJANGO="3.0"
+  - DJANGO="3.1"
+  - DJANGO="3.2"
+  - FLASK="1.0"
+  - FLASK="1.1"
+  - FLASK="2.0"
 
 # command to install dependencies
 install:

README.rst

@@ -32,8 +32,8 @@ Features
 * Small, fast codebase
 * JSON output by default, but overridable
 * RESTful
-* Python 3.5+ (with shims to make broke-ass Python 2.7 work)
-* Django 1.8+
+* Python 3.6+
+* Django 2.2+
 * Flexible
 
 
@@ -157,11 +157,11 @@ Running the Tests
 The test suite uses tox_ for simultaneous support of multiple versions of both
 Python and Django. The current versions of Python supported are:
 
-* CPython 2.7
-* CPython 3.5
 * CPython 3.6
 * CPython 3.7
-* PyPy (Python 2.7)
+* CPython 3.8
+* CPython 3.9
+* PyPy
 
 You just need to install the Python interpreters above and the `tox` package
 (available via `pip`), then run the `tox` command.

docs/releasenotes/v2.2.0.rst

@@ -0,0 +1,12 @@
+restless v2.2.0
+===============
+
+:date: 2021-08-04
+
+
+Changes
+-------
+
+* Added pagination to DjangoResource
+* Added support to python 3.7+
+* Removed support to python < 3.5

restless/__init__.py

@@ -1,6 +1,6 @@
 __author__ = 'Daniel Lindsley'
 __license__ = 'BSD'
-__version__ = (2, 1, 1)
+__version__ = (2, 2, 0)
 VERSION = '.'.join(map(str, __version__))
 
 

setup.py

@@ -26,7 +26,7 @@
         'mock',
         'tox',
     ],
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
+    python_requires='!=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -37,12 +37,11 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Utilities'
     ],
 )

tox.ini

@@ -1,42 +1,46 @@
 [tox]
 envlist =
-    py{27,35,py2}-{dj18}
-    py{27,35,py2}-{dj19,dj110,dj111}
-    py{36}-{dj111}
+    py{36,37,38,39,py}-{dj22,dj30,dj31,dj32}-{fl10,fl11,fl20}
 
 [testenv]
 basepython =
-    py27: python2.7
-    py35: python3.5
     py36: python3.6
     py37: python3.7
-    pypy2: pypy
+    py38: python3.8
+    py39: python3.9
+    pypy: pypy
 deps =
     six
     pytest
     pytest-cov
     WebOb>=1.3.1,<1.7
     Pyramid<1.8
     tornado
-    py{27,35}: Flask>=0.10
-    dj18: Django>=1.8,<1.9
-    dj19: Django>=1.9,<1.10
-    dj110: Django>=1.10,<1.11
-    dj111: Django>=1.11,<1.12
+    fl10: Flask>=1.0
+    fl11: Flask>=1.1
+    fl20: Flask>=2.0
+    dj22: Django>=2.2,<2.3
+    dj30: Django>=3.0,<3.1
+    dj31: Django>=3.1,<3.2
+    dj32: Django>=3.2,<3.3
 commands =
     pytest --cov=restless
 
 [travis]
 python =
-    2.7: py27
-    3.5: py35
     3.6: py36
     3.7: py37
-    pypy: pypy2
+    3.8: py38
+    3.9: py39
+    pypy: pypy
 
 [travis:env]
 DJANGO =
-    1.8: dj18
-    1.9: dj19
-    1.10: dj110
-    1.11: dj111
+    2.2: dj22
+    3.0: dj30
+    3.1: dj31
+    3.2: dj32
+FLASK =
+    1.0: fl10
+    1.1: fl11
+    2.0: fl20