summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2018-10-15 22:19:45 -0500
committerGitHub <noreply@github.com>2018-10-15 22:19:45 -0500
commit8eed333343e4e9e7f11f3aee67299030d6bf2783 (patch)
tree50564e48ee677c8f88c6d117463e3a9a2c10ed03 /src
parenta8b10ea3cb18143bb995a7637fc381c702c92d00 (diff)
parent0080e96a8b1fb6087599693f22b2a7e09fa85a03 (diff)
downloadpyramid-8eed333343e4e9e7f11f3aee67299030d6bf2783.tar.gz
pyramid-8eed333343e4e9e7f11f3aee67299030d6bf2783.tar.bz2
pyramid-8eed333343e4e9e7f11f3aee67299030d6bf2783.zip
Merge pull request #3390 from mmerickel/whatsnew-1.10
prep 1.10a1
Diffstat (limited to 'src')
-rw-r--r--src/pyramid/scaffolds/tests.py4
1 files changed, 2 insertions, 2 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)