From ee8d7de7c3410a2411300cbf463ec00ceed9e70d Mon Sep 17 00:00:00 2001 From: "neiljp (Neil Pilgrim)" Date: Mon, 2 Oct 2017 14:32:11 -0700 Subject: [PATCH] mypy: Upgrade mypy to mypy commit on Oct 2 2017. Also fix the fact we apparently forgot to remove fonttools from dev_lock.txt. --- requirements/dev_lock.txt | 3 +-- requirements/mypy.txt | 2 +- version.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/requirements/dev_lock.txt b/requirements/dev_lock.txt index 5075edc37b..72d6dde9c2 100644 --- a/requirements/dev_lock.txt +++ b/requirements/dev_lock.txt @@ -8,7 +8,7 @@ # For details, see requirements/README.md . # 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/python/mypy.git@5ca89e5cc77bbaeffbb5d6310301139cbaaae48f#egg=mypy==0.530-dev 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/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git @@ -54,7 +54,6 @@ django==1.11.4 docopt==0.6.2 docutils==0.14 first==2.0.1 # via pip-tools -fonttools==3.15.1 gitdb==0.6.4 gitlint==0.8.2 google-api-python-client==1.6.3 diff --git a/requirements/mypy.txt b/requirements/mypy.txt index 05aa7db8c4..972053d82e 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -2,6 +2,6 @@ # /tools/update-locked-requirements to update requirements/dev_lock.txt. # See requirements/README.md for more detail. six==1.10.0 --e git+https://github.com/python/mypy.git@d96b2cf22216a4ad6aa55a5726ee35a3fa38c637#egg=mypy==0.530-dev +-e git+https://github.com/python/mypy.git@5ca89e5cc77bbaeffbb5d6310301139cbaaae48f#egg=mypy==0.530-dev typed-ast==1.1.0 typing==3.6.2 diff --git a/version.py b/version.py index 41d5ecc2f3..450a197985 100644 --- a/version.py +++ b/version.py @@ -1,2 +1,2 @@ ZULIP_VERSION = "1.6.0+git" -PROVISION_VERSION = '10.0' +PROVISION_VERSION = '10.1'