From 29abbdaa076bb9d8f815930d5113fd939a453f81 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 26 Aug 2019 13:01:32 -0700 Subject: [PATCH] requirements: Upgrade pip-tools to 4.1.0 and pip to 19.2.3. Closes #13068. Signed-off-by: Anders Kaseorg --- requirements/dev.in | 2 +- requirements/dev.txt | 4 ++-- requirements/pip.txt | 2 +- requirements/prod.txt | 2 +- requirements/unupgradable.json | 6 ------ version.py | 2 +- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/requirements/dev.in b/requirements/dev.in index 196613baae..6b6a824744 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -50,7 +50,7 @@ transifex-client==0.12.5 python-digitalocean==1.14.0 # Needed for updating the locked pip dependencies -pip-tools==3.8.0 +pip-tools==4.1.0 # zulip's linting framework - zulint git+https://github.com/zulip/zulint@aaed679f1ad38b230090eadd3870b7682500f60c#egg=zulint==0.0.1 diff --git a/requirements/dev.txt b/requirements/dev.txt index 7d63ba635e..9bc6dd7870 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -102,7 +102,7 @@ phonenumberslite==8.10.15 pickleshare==0.7.5 # via ipython pika==0.13.0 pillow==6.1.0 -pip-tools==3.8.0 +pip-tools==4.1.0 polib==1.1.0 premailer==3.5.0 prompt-toolkit==1.0.16 # via ipython @@ -191,5 +191,5 @@ git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca60acf650da#egg=zulip_bots==0.6.1+git&subdirectory=zulip_bots # The following packages are considered to be unsafe in a requirements file: -pip==19.1.1 +pip==19.2.3 setuptools==41.0.1 # via cfn-lint, ipython, jsonschema, markdown, pyhamcrest, sphinx, zope.interface diff --git a/requirements/pip.txt b/requirements/pip.txt index 38d68afa0d..0678617c8c 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,4 +1,4 @@ # Dependencies for setting up pip to install our requirements.txt file. -pip==19.1.1 +pip==19.2.3 setuptools==41.0.1 wheel==0.33.4 diff --git a/requirements/prod.txt b/requirements/prod.txt index c10df59d0d..3ca42a3212 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -122,5 +122,5 @@ git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca git+https://github.com/zulip/python-zulip-api.git@804501610b6a205334e71b4e441fca60acf650da#egg=zulip_bots==0.6.1+git&subdirectory=zulip_bots # The following packages are considered to be unsafe in a requirements file: -pip==19.1.1 +pip==19.2.3 setuptools==41.0.1 # via ipython, markdown diff --git a/requirements/unupgradable.json b/requirements/unupgradable.json index bbd10d0a0d..0e67dfc624 100644 --- a/requirements/unupgradable.json +++ b/requirements/unupgradable.json @@ -14,12 +14,6 @@ "transifex-client": { "issue": "https://github.com/zulip/zulip/issues/8914" }, - "pip": { - "issue": "https://github.com/zulip/zulip/issues/13067" - }, - "pip-tools": { - "issue": "https://github.com/zulip/zulip/issues/13067" - }, "defusedxml": { "issue": "https://github.com/zulip/zulip/issues/12191" }, diff --git a/version.py b/version.py index 5c3901c63a..9b2112eac6 100644 --- a/version.py +++ b/version.py @@ -26,4 +26,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2019/03/01/zulip-2-0-relea # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '49.2' +PROVISION_VERSION = '49.3'