diff options
| author | Michael Merickel <michael@merickel.org> | 2016-05-10 00:34:08 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-05-10 00:34:08 -0500 |
| commit | aa52c5f60dd329216b1ef459d53c2710bbaf5b50 (patch) | |
| tree | 8848e4195687b1e0626a6d9679c147129f7bf65e | |
| parent | 56cf0f4155ac9ad570c96870f8966d8d722dd539 (diff) | |
| download | pyramid-aa52c5f60dd329216b1ef459d53c2710bbaf5b50.tar.gz pyramid-aa52c5f60dd329216b1ef459d53c2710bbaf5b50.tar.bz2 pyramid-aa52c5f60dd329216b1ef459d53c2710bbaf5b50.zip | |
execute scaffolds using pip and py.test
| -rw-r--r-- | pyramid/scaffolds/tests.py | 11 | ||||
| -rw-r--r-- | tox.ini | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pyramid/scaffolds/tests.py b/pyramid/scaffolds/tests.py index 49358c1cf..44680a464 100644 --- a/pyramid/scaffolds/tests.py +++ b/pyramid/scaffolds/tests.py @@ -29,19 +29,18 @@ class TemplateTest(object): self.make_venv(self.directory) here = os.path.abspath(os.path.dirname(__file__)) os.chdir(os.path.dirname(os.path.dirname(here))) - subprocess.check_call( - [os.path.join(self.directory, 'bin', 'python'), - 'setup.py', 'develop']) + pip = os.path.join(self.directory, 'bin', 'pip') + subprocess.check_call([pip, 'install', '-e', '.']) os.chdir(self.directory) subprocess.check_call(['bin/pcreate', '-s', tmpl_name, 'Dingle']) os.chdir('Dingle') - py = os.path.join(self.directory, 'bin', 'python') - subprocess.check_call([py, 'setup.py', 'install']) + subprocess.check_call([pip, 'install', '.[testing]']) if tmpl_name == 'alchemy': populate = os.path.join(self.directory, 'bin', 'initialize_Dingle_db') subprocess.check_call([populate, 'development.ini']) - subprocess.check_call([py, 'setup.py', 'test']) + subprocess.check_call([ + os.path.join(self.directory, 'bin', 'py.test')]) pserve = os.path.join(self.directory, 'bin', 'pserve') for ininame, hastoolbar in (('development.ini', True), ('production.ini', False)): @@ -39,6 +39,12 @@ commands = python pyramid/scaffolds/tests.py deps = virtualenv +[testenv:py35-scaffolds] +basepython = python3.5 +commands = + python pyramid/scaffolds/tests.py +deps = virtualenv + [testenv:pypy-scaffolds] basepython = pypy commands = |