From 4035b9c8271e14a3b0dcfa080f54c806cfd097ce Mon Sep 17 00:00:00 2001 From: Paul Kremer Date: Fri, 29 Dec 2017 09:19:06 +0100 Subject: [PATCH] Remove support for python 2.6 #71 --- .travis.yml | 1 - CHANGELOG.rst | 3 ++- README.rst | 2 +- docs/user/faq.rst | 3 --- dyndnsc/tests/detector/test_iface.py | 4 +--- setup.py | 5 +---- tox.ini | 2 +- 7 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 060cb65..cf30e48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: python python: - - "2.6" - "2.7" - "3.3" - "3.4" diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4bbe910..d145676 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,8 +2,9 @@ Release history --------------- -0.4.x (unreleased) +0.5.0 (unreleased) ++++++++++++++++++ +- removed support for python 2.6 - improved: updated list of external urls for IP discovery - improved: install documentation - added: new command line option -v to control verbosity diff --git a/README.rst b/README.rst index 28cc0ed..cb3cbc3 100644 --- a/README.rst +++ b/README.rst @@ -52,7 +52,7 @@ Installation Requirements ============ -* Python 2.6, 2.7 or 3.3+ +* Python 2.7 or 3.3+ Status diff --git a/docs/user/faq.rst b/docs/user/faq.rst index 7422fb3..9d437ce 100644 --- a/docs/user/faq.rst +++ b/docs/user/faq.rst @@ -13,15 +13,12 @@ versions from a security and performance point of view. Here's a list of Python platforms that are officially supported: -* Python 2.6 * Python 2.7 * Python 3.3 * Python 3.4 * Python 3.5 * Python 3.6 -* PyPy -Support for Python 2.6 may be dropped at any time. Is service xyz supported? ------------------------- diff --git a/dyndnsc/tests/detector/test_iface.py b/dyndnsc/tests/detector/test_iface.py index bc88531..39d8458 100644 --- a/dyndnsc/tests/detector/test_iface.py +++ b/dyndnsc/tests/detector/test_iface.py @@ -64,9 +64,7 @@ def test_iface_detector(self): self.assertEqual(None, detector.get_current_value()) self.assertTrue(isinstance(detector.detect(), (type(None), string_type))) # empty interface name must not fail construction - # broken in python2.6 - # self.assertIsInstance(iface.IPDetector_Iface(iface=None), iface.IPDetector_Iface) - self.assertEqual(type(iface.IPDetector_Iface(iface=None)), iface.IPDetector_Iface) + self.assertIsInstance(iface.IPDetector_Iface(iface=None), iface.IPDetector_Iface) # invalid netmask must fail construction self.assertRaises(ValueError, iface.IPDetector_Iface, netmask='fubar') # unknown address family must fail construction diff --git a/setup.py b/setup.py index 287dc15..b3a5da5 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,6 @@ 'Operating System :: POSIX :: Linux', 'Operating System :: POSIX :: BSD :: FreeBSD', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', @@ -50,7 +49,7 @@ def patch_setup_requires(requires): """python version compatibility""" - if sys.version_info < (2, 7) or (3, 1) < sys.version_info < (3, 4): + if (3, 2) < sys.version_info < (3, 4): # https://github.com/pypa/wheel/blob/7ca7b3552e55030b5d78cd90d53f1d99c9139f16/CHANGES.txt#L15 return requires + ["wheel==0.29.0"] else: @@ -79,8 +78,6 @@ def patch_install_requires(requires): to_add.append("pyOpenSSL") to_add.append("ndg-httpsclient") to_add.append("pyasn1") - if sys.version_info < (2, 7): # continue support for python 2.6 - to_add.append("importlib") return requires + to_add diff --git a/tox.ini b/tox.ini index bd54863..e500134 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ [tox] minversion = 2.0 -envlist = pypy, py26, py27, py32, py33, py34, py35, py36, docs +envlist = pypy, py27, py32, py33, py34, py35, py36, docs skipsdist=True [testenv]