Merge branch 'next'

This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.

A few conflicts had to be resolved:

 - In the DEVELOPERS file, because Fabrice Fontaine was added as a
   developer for libupnp in master, and for libupnp18 in
   next. Resolution is simple: add him for both.

 - linux/Config.in, because we updated the 4.13.x release used by
   default in master, while we moved to 4.14 in next. Resolution: use
   4.14.

 - package/libupnp/libupnp.hash: a hash for the license file was added
   in master, while the package was bumped into next. Resolution: keep
   the hash for the license file, and keep the hash for the newest
   version of libupnp.

 - package/linux-headers/Config.in.host: default version of the kernel
   headers for 4.13 was bumped to the latest 4.13.x in master, but was
   changed to 4.14 in next. Resolution: use 4.14.

 - package/samba4/: samba was bumped to 4.6.11 in master for security
   reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

1 files changed, 43 insertions, 0 deletions

diff --git a/package/python-mwclient/0001-setup.py-require-pytest-runner-only-when-necessary.patch b/package/python-mwclient/0001-setup.py-require-pytest-runner-only-when-necessary.patch
new file mode 100644
index 0000000000..124236c0b8
--- /dev/null
+++ b/package/python-mwclient/0001-setup.py-require-pytest-runner-only-when-necessary.patch
@@ -0,0 +1,43 @@
+From a6ff9745f56b776f244c2c412685f5c10ff0f09d Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Fri, 24 Nov 2017 20:44:53 +0100
+Subject: [PATCH] setup.py: require pytest-runner only when necessary
+
+This optimizes setup.py for cases when pytest-runner is not needed,
+using the approach that is suggested upstream:
+
+https://pypi.python.org/pypi/pytest-runner#conditional-requirement
+
+Patch sent upstream: https://github.com/mwclient/mwclient/pull/180
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ setup.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index a32cbde..660d93b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -8,6 +8,9 @@ from setuptools import setup
+ here = os.path.abspath(os.path.dirname(__file__))
+ README = open(os.path.join(here, 'README.rst')).read()
+ 
++needs_pytest = set(['pytest', 'test', 'ptr']).intersection(sys.argv)
++pytest_runner = ['pytest-runner'] if needs_pytest else []
++
+ setup(name='mwclient',
+       version='0.8.6',  # Use bumpversion to update
+       description='MediaWiki API client',
+@@ -27,7 +30,7 @@ setup(name='mwclient',
+       license='MIT',
+       packages=['mwclient'],
+       install_requires=['requests_oauthlib', 'six'],
+-      setup_requires=['pytest-runner'],
++      setup_requires=pytest_runner,
+       tests_require=['pytest', 'pytest-pep8', 'pytest-cache', 'pytest-cov',
+                      'responses>=0.3.0', 'responses!=0.6.0', 'mock'],
+       zip_safe=True
+-- 
+2.11.0
+