consolidate configs

zopefoundation · Feb 8, 2017 · 2877cc0 · 2877cc0
1 parent 7736ab1
commit 2877cc0
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,6 +1,11 @@
 [run]
 branch = True
 source = RestrictedPython
+omit =
+    src/RestrictedPython/tests
+    src/RestrictedPython/tests/*.py
+    tests/*.py
+    bootstrap.py
 
 [report]
 precision = 3
diff --git a/pytest.ini b/pytest.ini
diff --git a/setup.cfg b/setup.cfg
@@ -10,15 +10,31 @@ upload-dir = docs/html
 ignore =
     .travis.yml
     bootstrap-buildout.py
+    bootstrap.py
     buildout.cfg
     jenkins.cfg
     travis.cfg
 
+[aliases]
+test = pytest
+
+[tool:pytest]
+addopts =
+testpaths =
+    tests
+    src/RestrictedPython/tests
+norecursedirs = fixures
+
+isort_ignore =
+    bootstrap.py
+
+
 [isort]
 force_alphabetical_sort = True
 force_single_line = True
 lines_after_imports = 2
 line_length = 200
+skip = bootstrap.py
 not_skip = __init__.py
 
 [flake8]

diff --git a/setup.py b/setup.py
@@ -49,6 +49,13 @@ def read(*rnames):
       package_dir={'': 'src'},
       install_requires=[
           'setuptools',
+
+      ],
+      setup_requires=[
+          'pytest-runner',
+      ],
+      test_requires=[
+          'pytest',
       ],
       extras_require={
           'docs': [

diff --git a/tox.ini b/tox.ini
@@ -8,9 +8,9 @@ envlist =
     py35,
     py36,
     pypy,
-    coverage-report,
     isort,
     docs,
+    coverage-report,
 skip_missing_interpreters = False
 
 [testenv]