summaryrefslogtreecommitdiff
path: root/tox
diff options
context:
space:
mode:
authorSelim Belhaouane <selim.belhaouane@gmail.com>2017-03-09 15:55:16 -0500
committerSelim Belhaouane <selim.belhaouane@gmail.com>2017-03-16 14:16:37 -0400
commitcb6ca79442fe59067dba82ea2668ee2303d71fa2 (patch)
treea1593699e4970d56de0fc5d426150d0b8e0bf8ad /tox
parent5df724f06f6dda3b9b5f3e4e80a7f9dcaa1c823b (diff)
downloadtox-git-cb6ca79442fe59067dba82ea2668ee2303d71fa2.tar.gz
Tests to show issue #464
Diffstat (limited to 'tox')
-rw-r--r--tox/_pytestplugin.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tox/_pytestplugin.py b/tox/_pytestplugin.py
index 129678a2..047df716 100644
--- a/tox/_pytestplugin.py
+++ b/tox/_pytestplugin.py
@@ -290,7 +290,7 @@ class LineMatcher:
@pytest.fixture
def initproj(request, tmpdir):
""" create a factory function for creating example projects. """
- def initproj(nameversion, filedefs=None):
+ def initproj(nameversion, filedefs=None, src_root="."):
if filedefs is None:
filedefs = {}
if _istext(nameversion) or _isbytes(nameversion):
@@ -304,18 +304,20 @@ def initproj(request, tmpdir):
create_files(base, filedefs)
if 'setup.py' not in filedefs:
create_files(base, {'setup.py': '''
- from setuptools import setup
+ from setuptools import setup, find_packages
setup(
name='%(name)s',
description='%(name)s project',
version='%(version)s',
license='MIT',
platforms=['unix', 'win32'],
- packages=['%(name)s', ],
+ packages=find_packages('%(src_root)s'),
+ package_dir={'':'%(src_root)s'},
)
''' % locals()})
if name not in filedefs:
- create_files(base, {
+ src_dir = base.ensure(src_root, dir=1)
+ create_files(src_dir, {
name: {'__init__.py': '__version__ = %r' % version}
})
manifestlines = []