Skip to content

Commit

Permalink
Merge pull request #73 from infothrill/remove_python26
Browse files Browse the repository at this point in the history
Remove support for python 2.6 #71
  • Loading branch information
infothrill authored Dec 29, 2017
2 parents a9a05d1 + 4035b9c commit 6897b86
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 14 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: false
language: python
python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Installation
Requirements
============
* Python 2.6, 2.7 or 3.3+
* Python 2.7 or 3.3+


Status
Expand Down
3 changes: 0 additions & 3 deletions docs/user/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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?
-------------------------
Expand Down
4 changes: 1 addition & 3 deletions dyndnsc/tests/detector/test_iface.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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:
Expand Down Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 6897b86

Please sign in to comment.