From f0a730856bcf1f7244f178ee61c65b092489d12c Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 18 Oct 2016 19:11:28 +0000 Subject: [PATCH] Added a pip config file to support virtualenvs created with option --system-site-packages. The recommended way of creating a virtualenv for the datatracker is now '$ virtualenv --system-site-packages env', placing the virtualenv libs and binaries under env/bin/ and env/lib/. Also updated the ietf/wsgi.py file to use this. - Legacy-Id: 12172 --- env/pip.conf | 3 +++ ietf/wsgi.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 env/pip.conf diff --git a/env/pip.conf b/env/pip.conf new file mode 100644 index 000000000..212621844 --- /dev/null +++ b/env/pip.conf @@ -0,0 +1,3 @@ +[install] +ignore-installed = true + diff --git a/ietf/wsgi.py b/ietf/wsgi.py index 28c5b2b21..3a4cb3edb 100644 --- a/ietf/wsgi.py +++ b/ietf/wsgi.py @@ -44,7 +44,7 @@ import sys path = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Virtualenv support -virtualenv_activation = os.path.join(path, "bin", "activate_this.py") +virtualenv_activation = os.path.join(path, "env", "bin", "activate_this.py") if os.path.exists(virtualenv_activation): execfile(virtualenv_activation, dict(__file__=virtualenv_activation))