diff --git a/requirements/common.in b/requirements/common.in index 33ef52854f..7fdbd4130f 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -168,8 +168,10 @@ pyoembed==0.1.2 # The Zulip API bindings, from its own repository. # We integrate with these tightly, so often it makes sense 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==0.4.4_git&subdirectory=zulip" --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" +# -e "git+https://github.com/zulip/python-zulip-api.git@0.4.4#egg=zulip_bots==0.4.4+git&subdirectory=zulip_bots" +zulip==0.4.4 +zulip_bots==0.4.4 # Used for Hesiod lookups, etc. py3dns==3.1.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index b895fe003e..a53dcafc15 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -11,8 +11,6 @@ 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/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 apns2==0.3.0 argon2-cffi==18.1.0 @@ -140,7 +138,7 @@ recommonmark==0.4.0 redis==2.10.6 regex==2017.11.9 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 +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 rsa==3.4.2 s3transfer==0.1.11 # via boto3 scrapy==1.5.0 @@ -179,3 +177,5 @@ werkzeug==0.12.2 # via moto wrapt==1.10.11 # via aws-xray-sdk xmltodict==0.11.0 # via moto zope.interface==4.4.3 # via twisted +zulip==0.4.4 +zulip_bots==0.4.4 diff --git a/requirements/prod.txt b/requirements/prod.txt index e19b70f794..279fa7fba9 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -11,8 +11,6 @@ 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/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 argon2-cffi==18.1.0 asn1crypto==0.23.0 # via cryptography @@ -100,7 +98,7 @@ qrcode==4.0.4 # via django-two-factor-auth redis==2.10.6 regex==2017.11.9 requests-oauthlib==0.8.0 -requests==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio +requests==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio, zulip rsa==3.4.2 simplegeneric==0.8.1 # via ipython six==1.11.0 @@ -121,3 +119,5 @@ urllib3==1.22 # via requests uwsgi==2.0.17 virtualenv-clone==0.3.0 wcwidth==0.1.7 # via prompt-toolkit +zulip==0.4.4 +zulip_bots==0.4.4