Use python2-specific requirements files.

This commit is contained in:
Eklavya Sharma
2016-07-02 09:21:10 +05:30
committed by Tim Abbott
parent 146dc310a7
commit 0b714ea6c6
3 changed files with 3 additions and 3 deletions

View File

@@ -1105,7 +1105,7 @@ Once you have created and activated a virtualenv, do the following:
``` ```
pip install --upgrade pip # upgrade pip itself because older versions have known issues. pip install --upgrade pip # upgrade pip itself because older versions have known issues.
pip install --no-deps -r requirements/dev.txt # install python packages required for development pip install --no-deps -r requirements/py2_dev.txt # install python packages required for development
./tools/setup/install-phantomjs ./tools/setup/install-phantomjs
./tools/install-mypy ./tools/install-mypy
./tools/setup/download-zxcvbn ./tools/setup/download-zxcvbn

View File

@@ -19,5 +19,5 @@ args = parser.parse_args()
# install dependencies for setting up the virtualenv # install dependencies for setting up the virtualenv
run(["apt-get", "-y", "install"] + VENV_DEPENDENCIES) run(["apt-get", "-y", "install"] + VENV_DEPENDENCIES)
cached_venv_path = setup_virtualenv(args.target, os.path.join(ZULIP_PATH, "requirements", "prod.txt")) cached_venv_path = setup_virtualenv(args.target, os.path.join(ZULIP_PATH, "requirements", "py2_prod.txt"))
# Now the virtualenv has been activated # Now the virtualenv has been activated

View File

@@ -153,7 +153,7 @@ def main():
setup_virtualenv(PY3_VENV_PATH, setup_virtualenv(PY3_VENV_PATH,
os.path.join(ZULIP_PATH, "requirements", "mypy.txt"), os.path.join(ZULIP_PATH, "requirements", "mypy.txt"),
virtualenv_args=['-p', 'python3']) virtualenv_args=['-p', 'python3'])
setup_virtualenv(VENV_PATH, os.path.join(ZULIP_PATH, "requirements", "dev.txt")) setup_virtualenv(VENV_PATH, os.path.join(ZULIP_PATH, "requirements", "py2_dev.txt"))
# Put Python2 virtualenv activation in our .bash_profile. # Put Python2 virtualenv activation in our .bash_profile.
with open(os.path.expanduser('~/.bash_profile'), 'w+') as bash_profile: with open(os.path.expanduser('~/.bash_profile'), 'w+') as bash_profile: