From a66a15a51977938e1085d75fce528181f5d4e02c Mon Sep 17 00:00:00 2001
From: sinwar <premsinwar4@gmail.com>
Date: Tue, 3 Apr 2018 11:11:59 +0530
Subject: [PATCH] requirements: Upgrade pyldap to latest version.

The pyldap fork was merged back into python-ldap, and released as
python-ldap 3.0.0; `pyldap` is now just a wrapper package that depends
on python-ldap.

Fixes #8912.
---
 requirements/common.in | 3 ---
 requirements/dev.txt   | 3 ++-
 requirements/prod.txt  | 3 ++-
 version.py             | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/requirements/common.in b/requirements/common.in
index 8359a594bf..4fd277d737 100644
--- a/requirements/common.in
+++ b/requirements/common.in
@@ -173,9 +173,6 @@ pyoembed==0.1.2
 # Used for Hesiod lookups, etc.
 py3dns==3.1.0
 
-# Needed for LDAP integration
-pyldap==2.4.37
-
 # Install Python Social Auth
 social-auth-app-django==2.1.0
 
diff --git a/requirements/dev.txt b/requirements/dev.txt
index cb017f8c2c..c39015d4b8 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -120,7 +120,7 @@ pydispatcher==2.0.5       # via scrapy
 pyflakes==1.6.0
 pygments==2.2.0
 pyjwt==1.6.1
-pyldap==2.4.37
+pyldap==3.0.0.post1       # via django-auth-ldap, fakeldap
 pylibmc==1.5.2
 pyoembed==0.1.2
 pyopenssl==17.3.0         # via ndg-httpsclient, scrapy, service-identity
@@ -129,6 +129,7 @@ pysocks==1.6.7            # via twilio
 python-dateutil==2.6.1
 python-digitalocean==1.13.2
 python-gcm==0.4
+python-ldap==3.0.0        # via pyldap
 python-twitter==3.4.1
 python3-openid==3.1.0     # via social-auth-core
 pytz==2018.3
diff --git a/requirements/prod.txt b/requirements/prod.txt
index c32fd8fd2f..d3e406990f 100644
--- a/requirements/prod.txt
+++ b/requirements/prod.txt
@@ -85,13 +85,14 @@ pycparser==2.18           # via cffi
 pycrypto==2.6.1
 pygments==2.2.0
 pyjwt==1.6.1
-pyldap==2.4.37
+pyldap==3.0.0.post1       # via django-auth-ldap
 pylibmc==1.5.2
 pyoembed==0.1.2
 pyopenssl==17.3.0         # via ndg-httpsclient
 pysocks==1.6.7            # via twilio
 python-dateutil==2.6.1
 python-gcm==0.4
+python-ldap==3.0.0        # via pyldap
 python-twitter==3.4.1
 python3-openid==3.1.0     # via social-auth-core
 pytz==2018.3
diff --git a/version.py b/version.py
index 75b6141269..f831baaf95 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 = '17.8'
+PROVISION_VERSION = '17.9'