Merge branch 'develop' into pyup-update-sphinx-1.6.3-to-1.6.5

.travis.yml

@@ -1,4 +1,4 @@
-sudo: required
+sudo: false
 language: python
 python:
   - "2.6"

CHANGELOG.rst

@@ -2,6 +2,11 @@
 
 Release history
 ---------------
+0.4.4 (December 27th 2017)
+++++++++++++++++++++++++++
+- fixed: fixed wheel dependency on python 2.6 and 3.3
+- fixed: pep8 related changes, doc fixes
+
 0.4.3 (June 26th 2017)
 ++++++++++++++++++++++
 - fixed: nsupdate URLs

Makefile

@@ -41,11 +41,10 @@ deb:
 
 
 clean:
-	@echo "Cleaning up distutils stuff"
-	rm -rf build
-	rm -rf dist
-	rm -rf deb_dist
-	rm -rf *.egg
-	rm -rf *.egg-info
+	@echo "Cleaning up distutils and tox stuff"
+	rm -rf build dist deb_dist
+	rm -rf *.egg .eggs *.egg-info
+	rm -rf .tox
 	@echo "Cleaning up byte compiled python stuff"
-	find . -type f -regex ".*\.py[co]$$" -delete
+	find . -regex "\(.*__pycache__.*\|*.py[co]\)" -delete
+

README.rst

@@ -46,7 +46,7 @@ Installation
 
 Requirements
 ============
-* Python 2.6, 2.7 or 3.2+
+* Python 2.6, 2.7 or 3.3+
 
 
 Status

docs/user/faq.rst

@@ -15,12 +15,13 @@ supported:
 
 * Python 2.6
 * Python 2.7
-* Python 3.2
 * Python 3.3
 * Python 3.4
-* PyPy 1.9
+* Python 3.5
+* Python 3.6
+* PyPy
 
-Support for Python 2.6 and 3.2 may be dropped at any time.
+Support for Python 2.6 may be dropped at any time.
 
 Is service xyz supported?
 -------------------------

dyndnsc/__init__.py

@@ -2,4 +2,4 @@
 from . import updater
 from .core import getDynDnsClientForConfig, DynDnsClient
 
-__version__ = '0.4.3'
+__version__ = '0.4.4'

setup.py

@@ -41,14 +41,22 @@
     'Programming Language :: Python',
     'Programming Language :: Python :: 2.6',
     'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.2',
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6'
 )
 
 
+def patch_setup_requires(requires):
+    """python version compatibility"""
+    if sys.version_info < (2, 7) or (3, 1) < sys.version_info < (3, 4):
+        #  https://github.com/pypa/wheel/blob/7ca7b3552e55030b5d78cd90d53f1d99c9139f16/CHANGES.txt#L15
+        return requires + ["wheel==0.29.0"]
+    else:
+        return requires
+
+
 def patch_test_requires(requires):
     """python version compatibility"""
     if sys.version_info < (3, 3):
@@ -75,6 +83,7 @@ def patch_install_requires(requires):
         to_add.append("importlib")
     return requires + to_add
 
+
 if sys.version_info < (2, 7, 4):
     # work around python issue http://bugs.python.org/issue15881
     # affects only python2 when using multiprocessing and if nose is installed
@@ -100,6 +109,7 @@ def patch_install_requires(requires):
                 'protocols',
     long_description=README + '\n\n' + CHANGELOG,
     url='https://github.com/infothrill/python-dyndnsc',
+    setup_requires=patch_setup_requires([]),
     install_requires=patch_install_requires(
         ['requests>=2.0.1', 'setuptools', 'netifaces>=0.10.5']),
     entry_points=("""
@@ -111,5 +121,5 @@ def patch_install_requires(requires):
     tests_require=patch_test_requires(['bottle==0.12.7', 'pep8>=1.3']),
     package_data={'dyndnsc/resources': ['dyndnsc/resources/*.ini']},
     include_package_data=True,
-    zip_safe = False
+    zip_safe=False
 )