Merge https://github.com/jaraco/skeleton

6 files changed, 21 insertions, 1 deletions

diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000..e9955e7
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,2 @@
+[flake8]
+ignore = W191,W503
diff --git a/README.rst b/README.rst
index f5cfba7..80247ce 100644
--- a/README.rst
+++ b/README.rst
@@ -6,6 +6,12 @@
 .. image:: https://img.shields.io/travis/pytest-dev/pytest-runner/master.svg
    :target: https://travis-ci.org/pytest-dev/pytest-runner
 
+.. .. image:: https://img.shields.io/appveyor/ci/pytest-dev/pytest-runner/master.svg
+..    :target: https://ci.appveyor.com/project/pytest-dev/pytest-runner/branch/master
+
+.. .. image:: https://readthedocs.org/projects/pytest-runner/badge/?version=latest
+..    :target: https://pytest-runner.readthedocs.io/en/latest/?badge=latest
+
 Setup scripts can use pytest-runner to add setup.py test support for pytest
 runner.
 
diff --git a/appveyor.yml b/appveyor.yml
index 3d55a92..2b7808f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,6 +14,9 @@ install:
 
 build: off
 
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
+
 test_script:
   - "python -m pip install tox tox-venv"
   - "tox"
diff --git a/pytest.ini b/pytest.ini
index 1b2f624..0ba22c3 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
 norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules
+addopts=--doctest-modules --flake8
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
diff --git a/setup.py b/setup.py
index b96db52..9320edb 100644
--- a/setup.py
+++ b/setup.py
@@ -35,15 +35,22 @@ params = dict(
 	],
 	extras_require={
 		'testing': [
+			# upstream
 			'pytest>=2.8',
 			'pytest-sugar>=0.9.1',
 			'collective.checkdocs',
+			'pytest-flake8',
+
+			# local
 			'pytest-virtualenv',
 		],
 		'docs': [
+			# upstream
 			'sphinx',
 			'jaraco.packaging>=3.2',
 			'rst.linker>=1.9',
+
+			# local
 		],
 	},
 	setup_requires=[
diff --git a/tox.ini b/tox.ini
index df1b0ef..c2bac45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,8 @@ minversion = 2.4
 [testenv]
 deps =
 	setuptools>=31.0.1
+	# workaround for yaml/pyyaml#126
+	# git+https://github.com/yaml/pyyaml@master#egg=pyyaml;python_version=="3.7"
 commands =
 	py.test {posargs}
 	python setup.py checkdocs