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

jaraco · May 21, 2018 · 60afb7d · 60afb7d
2 parents 1eb5a3b + 9f06de2
commit 60afb7d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,2 +1,6 @@
 [flake8]
-ignore = W191,W503
+ignore =
+	# Allow tabs for indentation
+	W191
+	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
+	W503
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel", "setuptools_scm>=1.15"]
diff --git a/setup.py b/setup.py
@@ -49,8 +49,8 @@
     extras_require={
         'testing': [
             # upstream
-            'pytest>=2.8',
-            'pytest-sugar',
+            'pytest>=3.5',
+            'pytest-sugar>=0.9.1',
             'collective.checkdocs',
             'pytest-flake8',
 

diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,7 @@ minversion = 2.4
 deps =
 	setuptools>=31.0.1
 	# workaround for yaml/pyyaml#126
-	# git+https://github.com/yaml/pyyaml@master#egg=pyyaml
+	# git+https://github.com/yaml/pyyaml@master#egg=pyyaml;python_version=="3.7"
 commands =
 	py.test {posargs}
 	python setup.py checkdocs