Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "requirements: Use pypi versions of zulip and zulip_bots." 

This reverts commit 6b142b35e6.
This commit is contained in:
Tim Abbott 2018-04-16 16:36:00 -07:00
parent 6b142b35e6
commit 310b451dc2
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
requirements/common.in
View File

@ -165,13 +165,12 @@ ijson==2.3
beautifulsoup4==4.6.0 beautifulsoup4==4.6.0
pyoembed==0.1.2 pyoembed==0.1.2
# The Zulip API bindings, from its own repository. # The Zulip API bindings, from its own repository. We integrate with
# We integrate with these tightly, so often it makes sense to pin a # these tightly, including fetching content not included in the normal
# version from Git rather than a release. # release tarballs (which is a bug). So we need to pin it makes sense
# -e "git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip==0.4.4_git&subdirectory=zulip" # to pin a version from Git rather than a release.
# -e "git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip_bots==0.4.4+git&subdirectory=zulip_bots" -e "git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip==0.4.4_git&subdirectory=zulip"
zulip==0.4.4 -e "git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip_bots==0.4.4+git&subdirectory=zulip_bots"
zulip_bots==0.4.4
# Used for Hesiod lookups, etc. # Used for Hesiod lookups, etc.
py3dns==3.1.0 py3dns==3.1.0

6
requirements/dev.txt
View File

@ -11,6 +11,8 @@
git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1 git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1
git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip==0.4.4_git&subdirectory=zulip
git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip_bots==0.4.4+git&subdirectory=zulip_bots
alabaster==0.7.10 alabaster==0.7.10
apns2==0.3.0 apns2==0.3.0
argon2-cffi==18.1.0 argon2-cffi==18.1.0
@ -138,7 +140,7 @@ recommonmark==0.4.0
redis==2.10.6 redis==2.10.6
regex==2017.11.9 regex==2017.11.9
requests-oauthlib==0.8.0 requests-oauthlib==0.8.0
requests==2.18.4 # via aws-xray-sdk, docker, moto, premailer, pyoembed, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, social-auth-core, sphinx, stripe, twilio, zulip requests==2.18.4 # via aws-xray-sdk, docker, moto, premailer, pyoembed, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, social-auth-core, sphinx, stripe, twilio
rsa==3.4.2 rsa==3.4.2
s3transfer==0.1.11 # via boto3 s3transfer==0.1.11 # via boto3
scrapy==1.5.0 scrapy==1.5.0
@ -177,5 +179,3 @@ werkzeug==0.12.2 # via moto
wrapt==1.10.11 # via aws-xray-sdk wrapt==1.10.11 # via aws-xray-sdk
xmltodict==0.11.0 # via moto xmltodict==0.11.0 # via moto
zope.interface==4.4.3 # via twisted zope.interface==4.4.3 # via twisted
zulip==0.4.4
zulip_bots==0.4.4

6
requirements/prod.txt
View File

@ -11,6 +11,8 @@
git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1 git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1
git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip==0.4.4_git&subdirectory=zulip
git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip_bots==0.4.4+git&subdirectory=zulip_bots
apns2==0.3.0 apns2==0.3.0
argon2-cffi==18.1.0 argon2-cffi==18.1.0
asn1crypto==0.23.0 # via cryptography asn1crypto==0.23.0 # via cryptography
@ -98,7 +100,7 @@ qrcode==4.0.4 # via django-two-factor-auth
redis==2.10.6 redis==2.10.6
regex==2017.11.9 regex==2017.11.9
requests-oauthlib==0.8.0 requests-oauthlib==0.8.0
requests==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio, zulip requests==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio
rsa==3.4.2 rsa==3.4.2
simplegeneric==0.8.1 # via ipython simplegeneric==0.8.1 # via ipython
six==1.11.0 six==1.11.0
@ -119,5 +121,3 @@ urllib3==1.22 # via requests
uwsgi==2.0.17 uwsgi==2.0.17
virtualenv-clone==0.3.0 virtualenv-clone==0.3.0
wcwidth==0.1.7 # via prompt-toolkit wcwidth==0.1.7 # via prompt-toolkit
zulip==0.4.4
zulip_bots==0.4.4