From 7d3b41b03946112d18334ff5829cb14540c89e08 Mon Sep 17 00:00:00 2001 From: Vishnu Ks Date: Wed, 21 Feb 2018 07:08:30 +0000 Subject: [PATCH] requirements: Upgrade psycopg2 to 2.7.3.4. psycopg2 package contains both binary and source currently.The binary would soon be only available in psycopg2-binary. So currently installing psycopg2 will show a warning about the future migration of binary. To avoid the warning we should only install the source. https://www.postgresql.org/message-id/CA%2Bmi_8bd6kJHL TGkuyHSnqcgDrJ1uHgQWvXCKQFD3tPQBUa2Bw%40mail.gmail.com --- requirements/common.in | 2 +- requirements/dev.txt | 4 +++- requirements/prod.txt | 4 +++- version.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/requirements/common.in b/requirements/common.in index b6168b06a3..8526afb39f 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -98,7 +98,7 @@ ndg-httpsclient==0.4.4 pika==0.11.0 # Needed to access our database -psycopg2==2.7.3.2 +psycopg2==2.7.4 --no-binary psycopg2 pyasn1==0.4.2 pyasn1-modules==0.2.1 diff --git a/requirements/dev.txt b/requirements/dev.txt index 1ab32f0dc4..1f2e0d6607 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -7,6 +7,8 @@ # # For details, see requirements/README.md . # +--no-binary psycopg2 + 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/virtualenv-clone.git@44e831da39ffb6b9bb5c7d103d98babccdca0456#egg=virtualenv-clone==0.2.6.zulip1 @@ -106,7 +108,7 @@ polib==1.1.0 premailer==3.1.1 prompt-toolkit==1.0.15 # via ipython psutil==5.4.1 # via mypy -psycopg2==2.7.3.2 +psycopg2==2.7.4 ptyprocess==0.5.2 # via pexpect py3dns==3.1.0 pyaml==17.10.0 # via moto diff --git a/requirements/prod.txt b/requirements/prod.txt index 9ba07f5ce1..409ab8bd83 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -7,6 +7,8 @@ # # For details, see requirements/README.md . # +--no-binary psycopg2 + 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/virtualenv-clone.git@44e831da39ffb6b9bb5c7d103d98babccdca0456#egg=virtualenv-clone==0.2.6.zulip1 @@ -74,7 +76,7 @@ pillow==5.0.0 polib==1.1.0 premailer==3.1.1 prompt-toolkit==1.0.15 # via ipython -psycopg2==2.7.3.2 +psycopg2==2.7.4 ptyprocess==0.5.2 # via pexpect py3dns==3.1.0 pyasn1-modules==0.2.1 diff --git a/version.py b/version.py index b520084530..8cd0167669 100644 --- a/version.py +++ b/version.py @@ -8,4 +8,4 @@ ZULIP_VERSION = "1.7.1+git" # Typically, adding a dependency only requires a minor version bump, and # removing a dependency requires a major version bump. -PROVISION_VERSION = '15.0' +PROVISION_VERSION = '15.1'