From 8eed333343e4e9e7f11f3aee67299030d6bf2783 Mon Sep 17 00:00:00 2001
From: Michael Merickel <github@m.merickel.org>
Date: Tue, 16 Oct 2018 05:19:45 +0200
Subject: [PATCH] Merge pull request #3390 from mmerickel/whatsnew-1.10

---
 src/pyramid/scaffolds/tests.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pyramid/scaffolds/tests.py b/src/pyramid/scaffolds/tests.py
index cb8842d..8ed2f23 100644
--- a/src/pyramid/scaffolds/tests.py
+++ b/src/pyramid/scaffolds/tests.py
@@ -19,7 +19,7 @@
         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 @@
             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)

--
Gitblit v1.9.3