summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-10-14 23:17:20 -0500
committerMichael Merickel <michael@merickel.org>2018-10-14 23:46:11 -0500
commitf9da0b676f29444b7d3628d0340b081fb02d4aa2 (patch)
tree031fbef2abec8e6f7ebb1e7bcb4a91ec9cca685f
parentdd3cc81f75dcb5ff96e0751653071722a15f46c2 (diff)
downloadpyramid-f9da0b676f29444b7d3628d0340b081fb02d4aa2.tar.gz
pyramid-f9da0b676f29444b7d3628d0340b081fb02d4aa2.tar.bz2
pyramid-f9da0b676f29444b7d3628d0340b081fb02d4aa2.zip
fix tests to run from the tests folder
-rw-r--r--appveyor.yml2
-rw-r--r--setup.cfg6
-rw-r--r--setup.py5
3 files changed, 8 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml
index f3ea0b8bd..8c9d158e1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,8 @@ environment:
TOXENV: "py36"
- PYTHON: "C:\\Python35"
TOXENV: "py35"
+ - PYTHON: "C:\\Python34"
+ TOXENV: "py34"
- PYTHON: "C:\\Python27"
TOXENV: "py27"
diff --git a/setup.cfg b/setup.cfg
index cb74bd24c..59f2f9a2f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,9 +2,9 @@
zip_ok = false
[nosetests]
-match=^test
-where=pyramid
-nocapture=1
+match = ^test
+tests = src/pyramid,tests,docs
+nocapture = 1
[aliases]
dev = develop easy_install pyramid[testing]
diff --git a/setup.py b/setup.py
index aa7e3ab60..a49dc6a6a 100644
--- a/setup.py
+++ b/setup.py
@@ -81,7 +81,8 @@ setup(name='pyramid',
author_email="pylons-discuss@googlegroups.com",
url="https://trypyramid.com",
license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
- packages=find_packages(),
+ packages=find_packages('src', exclude=['tests']),
+ package_dir={'': 'src'},
include_package_data=True,
zip_safe=False,
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
@@ -92,7 +93,7 @@ setup(name='pyramid',
'docs': docs_extras,
},
tests_require=tests_require,
- test_suite="pyramid.tests",
+ test_suite="tests",
entry_points="""\
[pyramid.scaffold]
starter=pyramid.scaffolds:StarterProjectTemplate