Merge branch '0.16-maintenance'

.gitignore

@@ -6,6 +6,7 @@ build
 env
 *.egg-info
 .cache
+.pytest_cache
 .eggs
 .egg
 .xprocess

.travis.yml

@@ -2,7 +2,8 @@
   "branches": {
     "only": [
       "auto",
-      "master"
+      "master",
+      "/^.*-maintenance$/"
     ]
   },
   "cache": {

CHANGELOG.rst

@@ -16,6 +16,13 @@ Version 0.17.0
   XML. See :gh:`688`.
 - ownCloud and Baikal are no longer tested.
 
+Version 0.16.4
+==============
+
+*released on 05 February 2018*
+
+- Fix tests for new Hypothesis version. (Literally no other change included)
+
 Version 0.16.3
 ==============
 

Makefile

@@ -71,7 +71,7 @@ install-servers:
 	done
 
 install-test: install-servers
-	pip install -r test-requirements.txt
+	pip install -Ur test-requirements.txt
 	set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \
 		pip install -U --force-reinstall \
 			git+https://github.com/DRMacIver/hypothesis \
@@ -81,7 +81,7 @@ install-test: install-servers
 	[ -z "$(TEST_EXTRA_PACKAGES)" ] || pip install $(TEST_EXTRA_PACKAGES)
 
 install-style: install-docs
-	pip install flake8 flake8-import-order 'flake8-bugbear>=17.3.0'
+	pip install -U flake8 flake8-import-order 'flake8-bugbear>=17.3.0'
 
 style:
 	flake8
@@ -94,7 +94,7 @@ travis-conf:
 	python3 scripts/make_travisconf.py > .travis.yml
 
 install-docs:
-	pip install -r docs-requirements.txt
+	pip install -Ur docs-requirements.txt
 
 docs:
 	cd docs && make html
@@ -114,7 +114,7 @@ release-deb:
 
 install-dev:
 	pip install -ve .
-	[ "$(ETESYNC_TESTS)" = "false" ] || pip install -e .[etesync]
+	[ "$(ETESYNC_TESTS)" = "false" ] || pip install -Ue .[etesync]
 	set -xe && if [ "$(REQUIREMENTS)" = "devel" ]; then \
 	    pip install -U --force-reinstall \
 			git+https://github.com/mitsuhiko/click \

scripts/make_travisconf.py

@@ -23,7 +23,7 @@ cfg['git'] = {
 }
 
 cfg['branches'] = {
-    'only': ['auto', 'master']
+    'only': ['auto', 'master', '/^.*-maintenance$/']
 }
 
 cfg['install'] = """