fix tests to run from the tests folder

Pylons · Oct 15, 2018 · f9da0b6 · f9da0b6
1 parent dd3cc81
commit f9da0b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -81,7 +81,8 @@ def readfile(name):
       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 @@ def readfile(name):
           'docs': docs_extras,
       },
       tests_require=tests_require,
-      test_suite="pyramid.tests",
+      test_suite="tests",
       entry_points="""\
         [pyramid.scaffold]
         starter=pyramid.scaffolds:StarterProjectTemplate