Merge pull request #116 from hugovk/rm-eol

Add support for Python 3.7, drop EOL 3.0-3.4

Author: seocam

.travis.yml

@@ -1,12 +1,12 @@
-sudo: false
-
 language: python
+dist: xenial
 
 python:
   - "2.7"
-  - "3.4"
   - "3.5"
-  - "pypy" # cPython 2.7
+  - "3.6"
+  - "3.7"
+  - "pypy2.7-6.0" # CPython 2.7
 
 env:
   - DJANGO="1.8"

README.rst

@@ -2,27 +2,27 @@
 restless
 ========
 
-.. image:: https://travis-ci.org/toastdriven/restless.png?branch=master
-        :target: https://travis-ci.org/toastdriven/restless
+.. image:: https://travis-ci.org/toastdriven/restless.svg?branch=master
+    :target: https://travis-ci.org/toastdriven/restless
 
 .. image:: https://coveralls.io/repos/github/toastdriven/restless/badge.svg?branch=master
    :target: https://coveralls.io/github/toastdriven/restless?branch=master
 
 
 A lightweight REST miniframework for Python.
 
-Documentation is at http://restless.readthedocs.org/.
+Documentation is at https://restless.readthedocs.io/.
 
 Works great with Django_, Flask_, Pyramid_, Tornado_ & Itty_, but should be useful for
 many other Python web frameworks. Based on the lessons learned from Tastypie_
 & other REST libraries.
 
-.. _Django: http://djangoproject.com/
+.. _Django: https://www.djangoproject.com/
 .. _Flask: http://flask.pocoo.org/
-.. _Pyramid: http://www.pylonsproject.org/
-.. _Itty: https://pypi.python.org/pypi/itty
+.. _Pyramid: https://pylonsproject.org/
+.. _Itty: https://pypi.org/project/itty/
 .. _Tastypie: http://tastypieapi.org/
-.. _Tornado: http://www.tornadoweb.org/
+.. _Tornado: https://www.tornadoweb.org/
 .. _tox: https://tox.readthedocs.io/
 
 
@@ -32,7 +32,7 @@ Features
 * Small, fast codebase
 * JSON output by default, but overridable
 * RESTful
-* Python 3.4+ (with shims to make broke-ass Python 2.6+ work)
+* Python 3.5+ (with shims to make broke-ass Python 2.7 work)
 * Django 1.8+
 * Flexible
 
@@ -158,9 +158,9 @@ 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.4
 * CPython 3.5
 * CPython 3.6
+* CPython 3.7
 * PyPy (Python 2.7)
 
 You just need to install the Python interpreters above and the `tox` package

examples/flask/app.py

@@ -14,7 +14,7 @@ def is_authenticated(self):
         return True
 
     def make_user_key(self, username):
-        return 'user_{0}'.format(username)
+        return 'user_{}'.format(username)
 
     def list(self):
         usernames = self.conn.lrange('users', 0, 100)

examples/pyramid/app.py

@@ -14,7 +14,7 @@ def is_authenticated(self):
         return True
 
     def make_user_key(self, username):
-        return 'user_{0}'.format(username)
+        return 'user_{}'.format(username)
 
     def list(self):
         usernames = self.conn.lrange('users', 0, 100)

restless/dj.py

@@ -105,7 +105,7 @@ def build_url_name(cls, name, name_prefix=None):
         :rtype: string
         """
         if name_prefix is None:
-            name_prefix = 'api_{0}'.format(
+            name_prefix = 'api_{}'.format(
                 cls.__name__.replace('Resource', '').lower()
             )
 

restless/fl.py

@@ -74,7 +74,7 @@ def build_endpoint_name(cls, name, endpoint_prefix=None):
         :rtype: string
         """
         if endpoint_prefix is None:
-            endpoint_prefix = 'api_{0}'.format(
+            endpoint_prefix = 'api_{}'.format(
                 cls.__name__.replace('Resource', '').lower()
             )
 

restless/pyr.py

@@ -56,7 +56,7 @@ def build_routename(cls, name, routename_prefix=None):
         :rtype: string
         """
         if routename_prefix is None:
-            routename_prefix = 'api_{0}'.format(
+            routename_prefix = 'api_{}'.format(
                 cls.__name__.replace('Resource', '').lower()
             )
 

restless/resources.py

@@ -272,7 +272,7 @@ def handle(self, endpoint, *args, **kwargs):
             # ``endpoint`` errors as well.
             if not method in self.http_methods.get(endpoint, {}):
                 raise MethodNotImplemented(
-                    "Unsupported method '{0}' for {1} endpoint.".format(
+                    "Unsupported method '{}' for {} endpoint.".format(
                         method,
                         endpoint
                     )

restless/tnd.py

@@ -154,7 +154,7 @@ def handle(self, endpoint, *args, **kwargs):
         try:
             if not method in self.http_methods.get(endpoint, {}):
                 raise MethodNotImplemented(
-                    "Unsupported method '{0}' for {1} endpoint.".format(
+                    "Unsupported method '{}' for {} endpoint.".format(
                         method,
                         endpoint
                     )

setup.py

@@ -11,7 +11,7 @@
     description='A lightweight REST miniframework for Python.',
     author='Daniel Lindsley',
     author_email='[email protected]',
-    url='http://github.com/toastdriven/restless/',
+    url='https://github.com/toastdriven/restless/',
     long_description=open('README.rst', 'r').read(),
     packages=[
         'restless',
@@ -26,6 +26,7 @@
         'mock',
         'tox',
     ],
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -37,7 +38,11 @@
         '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',
         'Topic :: Utilities'
     ],
 )