From db1e090c6a2aa759fc01f819e8ba3126038fd0c2 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Thu, 22 Feb 2018 12:32:21 +0500 Subject: [PATCH] django-auth-ldap: Bump version to 1.3.0. The name of _get_user_attrs was changed to attrs in https://bitbucket.org/illocution/django-auth-ldap/commits/152d40a2a02f6cd5a18360af877f8ef98018eb4a Fixes #8380 --- requirements/common.in | 2 +- requirements/dev.txt | 2 +- requirements/prod.txt | 2 +- version.py | 2 +- zerver/tests/test_auth_backends.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/common.in b/requirements/common.in index 8526afb39f..87e8a38539 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -52,7 +52,7 @@ cryptography==2.1.4 defusedxml==0.5.0 # Needed for LDAP support -django-auth-ldap==1.2.16 +django-auth-ldap==1.3.0 # Django extension providing bitfield support django-bitfield==1.9.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index 1f2e0d6607..866319f793 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -43,7 +43,7 @@ cssselect==1.0.1 # via parsel, premailer, scrapy cssutils==1.0.2 # via premailer decorator==4.1.2 # via ipython, traitlets defusedxml==0.5.0 -django-auth-ldap==1.2.16 +django-auth-ldap==1.3.0 django-bitfield==1.9.3 django-formtools==2.1 # via django-two-factor-auth django-otp==0.4.1.1 # via django-two-factor-auth diff --git a/requirements/prod.txt b/requirements/prod.txt index 409ab8bd83..903f1a72d2 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -31,7 +31,7 @@ cssselect==1.0.1 # via premailer cssutils==1.0.2 # via premailer decorator==4.1.2 # via ipython, traitlets defusedxml==0.5.0 -django-auth-ldap==1.2.16 +django-auth-ldap==1.3.0 django-bitfield==1.9.3 django-formtools==2.1 # via django-two-factor-auth django-otp==0.4.1.1 # via django-two-factor-auth diff --git a/version.py b/version.py index 8cd0167669..d76d29c07f 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.1' +PROVISION_VERSION = '15.2' diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py index 6b2ad6889b..d5064d9b65 100644 --- a/zerver/tests/test_auth_backends.py +++ b/zerver/tests/test_auth_backends.py @@ -266,13 +266,13 @@ class AuthBackendTest(ZulipTestCase): with mock.patch('django_auth_ldap.backend._LDAPUser._authenticate_user_dn', side_effect=_LDAPUser.AuthenticationFailed("Failed")), ( mock.patch('django_auth_ldap.backend._LDAPUser._check_requirements')), ( - mock.patch('django_auth_ldap.backend._LDAPUser._get_user_attrs', + mock.patch('django_auth_ldap.backend._LDAPUser.attrs', return_value=dict(full_name=['Hamlet']))): self.assertIsNone(backend.authenticate(email, password, realm=get_realm("zulip"))) with mock.patch('django_auth_ldap.backend._LDAPUser._authenticate_user_dn'), ( mock.patch('django_auth_ldap.backend._LDAPUser._check_requirements')), ( - mock.patch('django_auth_ldap.backend._LDAPUser._get_user_attrs', + mock.patch('django_auth_ldap.backend._LDAPUser.attrs', return_value=dict(full_name=['Hamlet']))): self.verify_backend(backend, bad_kwargs=dict(username=username,