diff --git a/requirements/common.in b/requirements/common.in index 630e3b91d6..5fd9e4019a 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -172,7 +172,7 @@ pyoembed==0.1.2 # these tightly, including fetching content not included in the normal # release tarballs (which is a bug). So we need to pin it makes sense # to pin a version from Git rather than a release. --e "git+https://github.com/zulip/python-zulip-api.git@0.5.2#egg=zulip==0.5.2_git&subdirectory=zulip" +-e "git+https://github.com/zulip/python-zulip-api.git@7dfecf557743dc0bed6a20cdd50f5e825beac4ce#egg=zulip==0.5.2_git&subdirectory=zulip" -e "git+https://github.com/zulip/python-zulip-api.git@7dfecf557743dc0bed6a20cdd50f5e825beac4ce#egg=zulip_bots==0.5.2+git&subdirectory=zulip_bots" # Used for Hesiod lookups, etc. diff --git a/requirements/dev.txt b/requirements/dev.txt index b15d1b9a61..f4b5dcefa0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,7 +12,7 @@ git+https://github.com/zulip/django-bitfield@0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38#egg=django-bitfield==1.9.3+dev.0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38 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.5.2#egg=zulip==0.5.2_git&subdirectory=zulip +git+https://github.com/zulip/python-zulip-api.git@7dfecf557743dc0bed6a20cdd50f5e825beac4ce#egg=zulip==0.5.2_git&subdirectory=zulip git+https://github.com/zulip/python-zulip-api.git@7dfecf557743dc0bed6a20cdd50f5e825beac4ce#egg=zulip_bots==0.5.2+git&subdirectory=zulip_bots alabaster==0.7.11 apns2==0.4.1 @@ -93,6 +93,7 @@ lxml==4.2.3 markdown-include==0.5.1 markdown==2.6.11 markupsafe==1.0 +matrix-client==0.3.2 mock==2.0.0 moto==1.3.3 mypy==0.620 @@ -146,7 +147,7 @@ recommonmark==0.4.0 redis==2.10.6 regex==2017.11.9 requests-oauthlib==0.8.0 -requests[security]==2.18.4 # via aws-xray-sdk, docker, moto, premailer, pyoembed, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, responses, social-auth-core, sphinx, stripe, twilio +requests[security]==2.18.4 # via aws-xray-sdk, docker, matrix-client, moto, premailer, pyoembed, python-digitalocean, python-gcm, python-twitter, requests-oauthlib, responses, social-auth-core, sphinx, stripe, twilio responses==0.9.0 # via moto rsa==3.4.2 s3transfer==0.1.11 # via boto3 diff --git a/requirements/prod.txt b/requirements/prod.txt index 26a560ce20..4844ba7150 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -12,7 +12,7 @@ git+https://github.com/zulip/django-bitfield@0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38#egg=django-bitfield==1.9.3+dev.0d2b15cdb5af5ddec88d41cac19c0f2ce1b1ad38 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.5.2#egg=zulip==0.5.2_git&subdirectory=zulip +git+https://github.com/zulip/python-zulip-api.git@7dfecf557743dc0bed6a20cdd50f5e825beac4ce#egg=zulip==0.5.2_git&subdirectory=zulip git+https://github.com/zulip/python-zulip-api.git@7dfecf557743dc0bed6a20cdd50f5e825beac4ce#egg=zulip_bots==0.5.2+git&subdirectory=zulip_bots apns2==0.4.1 argon2-cffi==18.1.0 @@ -67,6 +67,7 @@ lxml==4.2.3 markdown-include==0.5.1 markdown==2.6.11 markupsafe==1.0 +matrix-client==0.3.2 mock==2.0.0 mypy_extensions==0.3.0 ndg-httpsclient==0.5.1 @@ -106,7 +107,7 @@ qrcode==4.0.4 # via django-two-factor-auth redis==2.10.6 regex==2017.11.9 requests-oauthlib==0.8.0 -requests[security]==2.18.4 # via premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio +requests[security]==2.18.4 # via matrix-client, premailer, pyoembed, python-gcm, python-twitter, requests-oauthlib, social-auth-core, stripe, twilio rsa==3.4.2 simplegeneric==0.8.1 # via ipython six==1.11.0 diff --git a/version.py b/version.py index 5113e26ec0..ad0c809579 100644 --- a/version.py +++ b/version.py @@ -8,4 +8,4 @@ ZULIP_VERSION = "1.9.0-rc1+git" # Typically, adding a dependency only requires a minor version bump, and # removing a dependency requires a major version bump. -PROVISION_VERSION = '26.2' +PROVISION_VERSION = '26.3'