diff --git a/requirements/common.txt b/requirements/common.txt index 73fef04f35..2d7e13ef98 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -149,7 +149,7 @@ django-pipeline==1.6.13 django-webpack-loader==0.5.0 # Needed for iOS push notifications --e git+https://github.com/sharmaeklavya2/PyAPNs.git@remove-simplejson#egg=apns==2.0.1 +apns2==0.3.0 python-twitter==3.3 diff --git a/requirements/dev_lock.txt b/requirements/dev_lock.txt index 46acabfff3..20d7dcd13d 100644 --- a/requirements/dev_lock.txt +++ b/requirements/dev_lock.txt @@ -4,7 +4,6 @@ # # pip-compile --output-file requirements/dev_lock.txt requirements/dev.txt # -git+https://github.com/sharmaeklavya2/PyAPNs.git@remove-simplejson#egg=apns==2.0.1 git+https://github.com/umairwaheed/fakeldap.git@37bc199e9589c31f4bb5bae1445ad1cd7f84e1ac#egg=fakeldap==0.5.1.0zulip1 git+https://github.com/python/mypy.git@d96b2cf22216a4ad6aa55a5726ee35a3fa38c637#egg=mypy==0.530-dev git+https://github.com/rafaelmartins/pyoembed.git@eb9901917c2a44b49e2887c077ead84a722c50dc#egg=pyoembed @@ -13,6 +12,7 @@ git+https://github.com/umairwaheed/virtualenv-clone.git@short-version#egg=virtua git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip==0.3.2&subdirectory=zulip git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip_bots==0.3.2&subdirectory=zulip_bots alabaster==0.7.10 +apns2==0.3.0 argon2-cffi==16.3.0 arrow==0.10.0 # via gitlint asn1crypto==0.22.0 # via cryptography @@ -55,8 +55,12 @@ gitdb==0.6.4 gitlint==0.8.2 google-api-python-client==1.6.2 goslate==1.5.1 # via pydictionary +h2==2.6.2 # via hyper +hpack==3.0.0 # via h2 html2text==2016.9.19 httplib2==0.10.3 +hyper==0.7.0 # via apns2 +hyperframe==3.2.0 # via h2, hyper hyperlink==17.3.1 # via twisted idna==2.6 ijson==2.3 diff --git a/requirements/prod_lock.txt b/requirements/prod_lock.txt index 843456b81d..7c9fe66a28 100644 --- a/requirements/prod_lock.txt +++ b/requirements/prod_lock.txt @@ -4,12 +4,12 @@ # # 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/rafaelmartins/pyoembed.git@eb9901917c2a44b49e2887c077ead84a722c50dc#egg=pyoembed git+https://github.com/umairwaheed/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.11 git+https://github.com/umairwaheed/virtualenv-clone.git@short-version#egg=virtualenv-clone==0.2.6 git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip==0.3.2&subdirectory=zulip git+https://github.com/zulip/python-zulip-api.git@0.3.2#egg=zulip_bots==0.3.2&subdirectory=zulip_bots +apns2==0.3.0 argon2-cffi==16.3.0 asn1crypto==0.22.0 # via cryptography backports-abc==0.5 @@ -37,8 +37,12 @@ fonttools==3.15.0 gitdb==0.6.4 google-api-python-client==1.6.2 goslate==1.5.1 # via pydictionary +h2==2.6.2 # via hyper +hpack==3.0.0 # via h2 html2text==2016.9.19 httplib2==0.10.3 +hyper==0.7.0 # via apns2 +hyperframe==3.2.0 # via h2, hyper idna==2.6 ijson==2.3 ipython-genutils==0.2.0 # via traitlets diff --git a/version.py b/version.py index bdbe094960..a194428ef9 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ ZULIP_VERSION = "1.6.0+git" -PROVISION_VERSION = '9.2' +PROVISION_VERSION = '9.3'