py3: Bump ujson to our own fork to pick up a Python 3 fix.

See my PR upstream: https://github.com/esnme/ultrajson/pull/284 .

Fixes #6332.
This commit is contained in:
Greg Price 2017-08-29 15:58:47 -07:00
parent 1ab89b1d89
commit b0d34b030a
4 changed files with 4 additions and 4 deletions

View File

@ -141,7 +141,7 @@ tornado==4.5.1
typing==3.6.2
# Fast JSON parser
ujson==1.35
-e git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git
uritemplate==3.0.0

View File

@ -8,6 +8,7 @@ git+https://github.com/umairwaheed/fakeldap.git@37bc199e9589c31f4bb5bae1445ad1cd
git+https://github.com/python/mypy.git@d96b2cf22216a4ad6aa55a5726ee35a3fa38c637#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
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@6c47eda92bce0efe0297990965e90e79b54a1cd0#egg=zulip==0.3.2_git&subdirectory=zulip
git+https://github.com/zulip/python-zulip-api.git@6c47eda92bce0efe0297990965e90e79b54a1cd0#egg=zulip_bots==0.3.2+git&subdirectory=zulip_bots
@ -145,7 +146,6 @@ transifex-client==0.12.4
twisted==17.5.0
typed-ast==1.1.0
typing==3.6.2
ujson==1.35
uritemplate==3.0.0
urllib3==1.22
w3lib==1.18.0 # via parsel, scrapy

View File

@ -6,6 +6,7 @@
#
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
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@6c47eda92bce0efe0297990965e90e79b54a1cd0#egg=zulip==0.3.2_git&subdirectory=zulip
git+https://github.com/zulip/python-zulip-api.git@6c47eda92bce0efe0297990965e90e79b54a1cd0#egg=zulip_bots==0.3.2+git&subdirectory=zulip_bots
@ -99,7 +100,6 @@ statsd==2.1.2 # via django-statsd-mozilla
tornado==4.5.1
traitlets==4.3.2 # via ipython
typing==3.6.2
ujson==1.35
uritemplate==3.0.0
urllib3==1.22
uwsgi==2.0.14

View File

@ -1,2 +1,2 @@
ZULIP_VERSION = "1.6.0+git"
PROVISION_VERSION = '9.6'
PROVISION_VERSION = '9.7'