paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

requirements: Lock prod.txt instead of its py3_common dependency.

Browse Source 
`py3_common.txt` is no longer locked.
This commit is contained in:
rht
2017-08-22 06:26:59 +02:00
committed by Tim Abbott
parent 6a5869ec8d
commit 0a469fd4c8
4 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/prod.txt
View File

@@ -1,4 +1,4 @@
-r py3_common_lock.txt -r py3_common.txt
netifaces==0.10.5 netifaces==0.10.5
python-dateutil==2.6.1 python-dateutil==2.6.1
uWSGI==2.0.14 uWSGI==2.0.14

24
requirements/py3_common_lock.txt → requirements/prod_lock.txt
View File

@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile # This file is autogenerated by pip-compile
# To update, run: # To update, run:
# #
# pip-compile --output-file requirements/py3_common_lock.txt requirements/py3_common.txt # pip-compile --output-file requirements/prod_lock.txt requirements/prod.txt
# #
git+https://github.com/sharmaeklavya2/PyAPNs.git@remove-simplejson#egg=apns==2.0.1 git+https://github.com/sharmaeklavya2/PyAPNs.git@remove-simplejson#egg=apns==2.0.1
git+https://github.com/rafaelmartins/pyoembed.git@eb9901917c2a44b49e2887c077ead84a722c50dc#egg=pyoembed git+https://github.com/rafaelmartins/pyoembed.git@eb9901917c2a44b49e2887c077ead84a722c50dc#egg=pyoembed
@@ -23,7 +23,7 @@ chardet==3.0.4
click==6.7 # via pydictionary click==6.7 # via pydictionary
cryptography==2.0.3 cryptography==2.0.3
cssselect==1.0.1 cssselect==1.0.1
decorator==4.0.11 # via ipython, traitlets decorator==4.1.2 # via ipython, traitlets
defusedxml==0.5.0 defusedxml==0.5.0
diff-match-patch==20121119 diff-match-patch==20121119
django-auth-ldap==1.2.12 django-auth-ldap==1.2.12
@@ -31,8 +31,9 @@ django-bitfield==1.9.3
django-pipeline==1.6.13 django-pipeline==1.6.13
django-statsd-mozilla==0.3.16 django-statsd-mozilla==0.3.16
django-webpack-loader==0.5.0 django-webpack-loader==0.5.0
django==1.11.4 django==1.11.4 # via django-auth-ldap, django-bitfield
docopt==0.6.2 docopt==0.6.2
flup==1.0.3.dev20161029
fonttools==3.15.0 fonttools==3.15.0
gitdb==0.6.4 gitdb==0.6.4
google-api-python-client==1.6.2 google-api-python-client==1.6.2
@@ -48,32 +49,34 @@ jinja2==2.9.6
lxml==3.8.0 lxml==3.8.0
markdown-include==0.5.1 markdown-include==0.5.1
markdown==2.6.9 # via markdown-include markdown==2.6.9 # via markdown-include
markupsafe==1.0 markupsafe==1.0 # via jinja2
mock==2.0.0 mock==2.0.0
ndg-httpsclient==0.4.2 ndg-httpsclient==0.4.2
netifaces==0.10.5
oauth2client==4.1.2 oauth2client==4.1.2
oauthlib==2.0.2 oauthlib==2.0.2
olefile==0.44 # via pillow olefile==0.44 # via pillow
pbr==3.0.0 # via mock pbr==3.1.1 # via mock
pexpect==4.2.1 # via ipython pexpect==4.2.1 # via ipython
pickleshare==0.7.4 # via ipython pickleshare==0.7.4 # via ipython
pika==0.10.0 pika==0.10.0
pillow==4.2.1 pillow==4.2.1
polib==1.0.8 polib==1.0.8
prompt-toolkit==1.0.14 # via ipython prompt-toolkit==1.0.15 # via ipython
psycopg2==2.7.3 psycopg2==2.7.3
ptyprocess==0.5.1 # via pexpect ptyprocess==0.5.2 # via pexpect
py3dns==3.1.0 py3dns==3.1.0
pyasn1-modules==0.0.11 pyasn1-modules==0.0.11
pyasn1==0.3.2 pyasn1==0.3.2
pycparser==2.17 # via cffi pycparser==2.18 # via cffi
pycrypto==2.6.1 pycrypto==2.6.1
pydictionary==1.5.2 pydictionary==1.5.2
pygments==2.2.0 # via ipython pygments==2.2.0 # via ipython
pyjwt==1.5.2 pyjwt==1.5.2 # via social-auth-core
pyldap==2.4.37 pyldap==2.4.37
pylibmc==1.5.2 pylibmc==1.5.2
pyopenssl==17.0.0 # via ndg-httpsclient pyopenssl==17.2.0 # via ndg-httpsclient
python-dateutil==2.6.1
python-gcm==0.4 python-gcm==0.4
python-twitter==3.3 python-twitter==3.3
python3-openid==3.1.0 python3-openid==3.1.0
@@ -99,4 +102,5 @@ typing==3.6.2
ujson==1.35 ujson==1.35
uritemplate==3.0.0 uritemplate==3.0.0
urllib3==1.22 urllib3==1.22
uwsgi==2.0.14
wcwidth==0.1.7 # via prompt-toolkit wcwidth==0.1.7 # via prompt-toolkit

2
scripts/lib/create-production-venv
View File

@@ -28,7 +28,7 @@ os.chdir(ZULIP_PATH)
venv_name = "zulip-venv" if sys.version_info[0] == 2 else "zulip-py3-venv" venv_name = "zulip-venv" if sys.version_info[0] == 2 else "zulip-py3-venv"
cached_venv_path = setup_virtualenv( cached_venv_path = setup_virtualenv(
os.path.join(args.deploy_path, venv_name), os.path.join(args.deploy_path, venv_name),
os.path.join(ZULIP_PATH, "requirements", "prod.txt"), os.path.join(ZULIP_PATH, "requirements", "prod_lock.txt"),
virtualenv_args=['-p', 'python{}'.format(python_version)]) virtualenv_args=['-p', 'python{}'.format(python_version)])
current_venv_path = os.path.join(args.deploy_path, 'zulip-current-venv') current_venv_path = os.path.join(args.deploy_path, 'zulip-current-venv')

8
tools/update-locked-requirements
View File

@@ -9,18 +9,18 @@ if [ ! -d /srv/zulip-py3-venv ]; then
fi fi
source /srv/zulip-py3-venv/bin/activate # Activate python3 virtualenv source /srv/zulip-py3-venv/bin/activate # Activate python3 virtualenv
pip-compile --output-file requirements/py3_common_lock.txt requirements/py3_common.txt pip-compile --output-file requirements/prod_lock.txt requirements/prod.txt
# Add the editable flag to mypy for the purpose of building the lockfile for # Add the editable flag to mypy for the purpose of building the lockfile for
# dev.txt # dev.txt
sed -i 's/git/-e git/' requirements/mypy.txt sed -i 's/git/-e git/' requirements/mypy.txt
pip-compile --output-file requirements/dev_lock.txt requirements/dev.txt pip-compile --output-file requirements/dev_lock.txt requirements/dev.txt
# Remove the editable flag in the lock file for safer build # Remove the editable flag in the lock file for safer build
sed -i 's/-e git/git/' requirements/mypy.txt sed -i 's/-e git/git/' requirements/mypy.txt
sed -i 's/-e //' requirements/py3_common_lock.txt sed -i 's/-e //' requirements/prod_lock.txt
sed -i 's/-e //' requirements/dev_lock.txt sed -i 's/-e //' requirements/dev_lock.txt
# pip-tools bug; future, futures are obsolete in python3 # pip-tools bug; future, futures are obsolete in python3
sed -i '/futures==/d' requirements/py3_common_lock.txt sed -i '/futures==/d' requirements/prod_lock.txt
sed -i '/future==/d' requirements/py3_common_lock.txt sed -i '/future==/d' requirements/prod_lock.txt
sed -i '/futures==/d' requirements/dev_lock.txt sed -i '/futures==/d' requirements/dev_lock.txt
deactivate deactivate