Update copyright notices to 2018; Re-add Py2.6 and Py3.3 support; Update credits

Jordan Adler · Jordan Adler · commit bce91cef408f · 2018-10-23T16:20:32.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,12 @@ cache: pip
 
 matrix:
   include:
+    - python: 2.6
+      env: TOXENV=py26
     - python: 2.7
       env: TOXENV=py27
+    - python: 3.3
+      env: TOXENV=py33
     - python: 3.4
       env: TOXENV=py34
     - python: 3.5
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Python Charmers Pty Ltd, Australia
+Copyright (c) 2013-2018 Python Charmers Pty Ltd, Australia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.rst b/README.rst
@@ -266,7 +266,7 @@ Licensing
 
 :Author:  Ed Schofield, Jordan M. Adler, et al
 
-:Copyright: 2013-2016 Python Charmers Pty Ltd, Australia.
+:Copyright: 2013-2018 Python Charmers Pty Ltd, Australia.
 
 :Sponsors: Python Charmers Pty Ltd, Australia, and Python Charmers Pte
            Ltd, Singapore. http://pythoncharmers.com
diff --git a/docs/compatible_idioms.rst b/docs/compatible_idioms.rst
@@ -3,7 +3,7 @@
 Cheat Sheet: Writing Python 2-3 compatible code
 ===============================================
 
--  **Copyright (c):** 2013-2016 Python Charmers Pty Ltd, Australia.
+-  **Copyright (c):** 2013-2018 Python Charmers Pty Ltd, Australia.
 -  **Author:** Ed Schofield.
 -  **Licence:** Creative Commons Attribution.
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -51,7 +51,7 @@
 
 # General information about the project.
 project = u'Python-Future'
-copyright = u'2013-2016, Python Charmers Pty Ltd, Australia'
+copyright = u'2013-2018, Python Charmers Pty Ltd, Australia'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/docs/credits.rst b/docs/credits.rst
@@ -8,7 +8,7 @@ Licence
 The software is distributed under an MIT licence. The text is as follows
 (from ``LICENSE.txt``)::
 
-    Copyright (c) 2013-2016 Python Charmers Pty Ltd, Australia
+    Copyright (c) 2013-2018 Python Charmers Pty Ltd, Australia
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -39,20 +39,13 @@ Pinterest https://opensource.pinterest.com/
 
 .. _authors:
 
+Maintainer
+----------
+Python-Future is currently maintained by Jordan M. Adler <jordan.m.adler@gmail.com>.
+
 Authors
 -------
-
-Python-Future is written and maintained by Ed Schofield and Jordan M. Adler
-with the help of various contributors:
-
-Development Leads
-~~~~~~~~~~~~~~~~~
-
-- Ed Schofield <ed@pythoncharmers.com>
-- Jordan M. Adler <jordan.m.adler@gmail.com>
-
-Patches
-~~~~~~~
+Python-Future is largely written by Ed Schofield <ed@pythoncharmers.com> with the help of various contributors:
 
 - Grant Bakker
 - Jacob Beck
diff --git a/docs/notebooks/Writing Python 2-3 compatible code.ipynb b/docs/notebooks/Writing Python 2-3 compatible code.ipynb
@@ -11,7 +11,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "- **Copyright (c):** 2013-2016 Python Charmers Pty Ltd, Australia.\n",
+    "- **Copyright (c):** 2013-2018 Python Charmers Pty Ltd, Australia.\n",
     "- **Author:** Ed Schofield.\n",
     "- **Licence:** Creative Commons Attribution.\n",
     "\n",
diff --git a/docs/whatsnew.rst b/docs/whatsnew.rst
@@ -23,11 +23,6 @@ This is a major bug-fix release, including:
 As well as a number of corrections to a variety of documentation, and updates to
 test infrastructure.
 
-In this release, we also drop official support for Py2.6 and Py3.3. They should
-still work, but support is no longer guaranteed, and breaking changes will be
-introduced in subsequent versions.
-
-
 What's new in version 0.16.0 (2016-10-27)
 ==========================================
 
diff --git a/futurize.py b/futurize.py
@@ -13,7 +13,7 @@
 
 Licensing
 ---------
-Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
+Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
 The software is distributed under an MIT licence. See LICENSE.txt.
 """
 
diff --git a/pasteurize.py b/pasteurize.py
@@ -12,7 +12,7 @@
 
 Licensing
 ---------
-Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
+Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
 The software is distributed under an MIT licence. See LICENSE.txt.
 """
 
diff --git a/setup.py b/setup.py
@@ -96,8 +96,10 @@
 CLASSIFIERS = [
     "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.3",
     "Programming Language :: Python :: 3.4",
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
@@ -174,7 +176,7 @@
       packages=PACKAGES,
       package_data=PACKAGE_DATA,
       include_package_data=True,
-      python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
+      python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*",
       classifiers=CLASSIFIERS,
       **setup_kwds
      )
diff --git a/src/future/__init__.py b/src/future/__init__.py
@@ -76,15 +76,15 @@
 
 Licensing
 ---------
-Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
+Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
 The software is distributed under an MIT licence. See LICENSE.txt.
 
 """
 
 __title__ = 'future'
 __author__ = 'Ed Schofield'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2013-2016 Python Charmers Pty Ltd'
+__copyright__ = 'Copyright 2013-2018 Python Charmers Pty Ltd'
 __ver_major__ = 0
 __ver_minor__ = 17
 __ver_patch__ = 0
diff --git a/src/past/__init__.py b/src/past/__init__.py
@@ -80,7 +80,7 @@
 
 Licensing
 ---------
-Copyright 2013-2016 Python Charmers Pty Ltd, Australia.
+Copyright 2013-2018 Python Charmers Pty Ltd, Australia.
 The software is distributed under an MIT licence. See LICENSE.txt.
 """
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,py37
+envlist = py26,py27,py33,py34,py35,py36,py37
 
 [testenv]
 deps = pytest

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2013-2016 Python Charmers Pty Ltd, Australia`
	`1`	`+Copyright (c) 2013-2018 Python Charmers Pty Ltd, Australia`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`