diff options
| author | Michael Merickel <michael@merickel.org> | 2018-10-15 21:38:14 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-10-15 21:45:02 -0500 |
| commit | 2d369c6482fa940121462f7574bfc7985201520e (patch) | |
| tree | c707193ed4ef9ffafc12bb4208480a1104c7b318 | |
| parent | 4a5504787f376255fa50f50de273595ce03d1d77 (diff) | |
| download | pyramid-2d369c6482fa940121462f7574bfc7985201520e.tar.gz pyramid-2d369c6482fa940121462f7574bfc7985201520e.tar.bz2 pyramid-2d369c6482fa940121462f7574bfc7985201520e.zip | |
fix scaffold tests
| -rw-r--r-- | src/pyramid/scaffolds/tests.py | 4 | ||||
| -rw-r--r-- | tox.ini | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/pyramid/scaffolds/tests.py b/src/pyramid/scaffolds/tests.py index cb8842dbe..8ed2f2348 100644 --- a/src/pyramid/scaffolds/tests.py +++ b/src/pyramid/scaffolds/tests.py @@ -19,7 +19,7 @@ class TemplateTest(object): logger = Logger([(Logger.level_for_integer(2), sys.stdout)]) virtualenv.logger = logger virtualenv.create_environment( - directory, site_packages=False, clear=False, unzip_setuptools=True + directory, site_packages=False, clear=False ) def install(self, tmpl_name): # pragma: no cover @@ -28,7 +28,7 @@ class TemplateTest(object): self.directory = tempfile.mkdtemp() self.make_venv(self.directory) here = os.path.abspath(os.path.dirname(__file__)) - os.chdir(os.path.dirname(os.path.dirname(here))) + os.chdir(os.path.dirname(os.path.dirname(os.path.dirname(here)))) pip = os.path.join(self.directory, 'bin', 'pip') subprocess.check_call([pip, 'install', '-e', '.']) os.chdir(self.directory) @@ -28,37 +28,37 @@ extras = [testenv:py27-scaffolds] basepython = python2.7 commands = - python pyramid/scaffolds/tests.py + python src/pyramid/scaffolds/tests.py deps = virtualenv [testenv:py34-scaffolds] basepython = python3.4 commands = - python pyramid/scaffolds/tests.py + python src/pyramid/scaffolds/tests.py deps = virtualenv [testenv:py35-scaffolds] basepython = python3.5 commands = - python pyramid/scaffolds/tests.py + python src/pyramid/scaffolds/tests.py deps = virtualenv [testenv:py36-scaffolds] basepython = python3.6 commands = - python pyramid/scaffolds/tests.py + python src/pyramid/scaffolds/tests.py deps = virtualenv [testenv:py37-scaffolds] basepython = python3.7 commands = - python pyramid/scaffolds/tests.py + python src/pyramid/scaffolds/tests.py deps = virtualenv [testenv:pypy-scaffolds] basepython = pypy commands = - python pyramid/scaffolds/tests.py + python src/pyramid/scaffolds/tests.py deps = virtualenv [testenv:lint] |