From 522349c502b23e9a741331ea786b2e638a291679 Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Thu, 28 Jun 2018 18:12:39 -0400
Subject: [PATCH] Upgrade edx-drf-extensions and add rest_condition

---
 requirements/edx/base.in         | 1 +
 requirements/edx/base.txt        | 4 ++--
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 15b13bc3feb..cd98b89a441 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -125,6 +125,7 @@ python-openid
 python-saml==2.4.0
 pyuca==1.1                          # For more accurate sorting of translated country names in django-countries
 reportlab==3.1.44                   # Used for shopping cart's pdf invoice/receipt generation
+rest-condition                      # DRF's recommendation for supporting complex permissions
 rfc6266-parser                      # Used to generate Content-Disposition headers.
 social-auth-app-django
 social-auth-core
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index d45d8cbec81..820aa36915c 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -115,7 +115,7 @@ edx-completion==0.1.7
 edx-django-oauth2-provider==1.2.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-drf-extensions==1.5.1
+edx-drf-extensions==1.5.2
 edx-enterprise==0.70.1
 edx-i18n-tools==0.4.5
 edx-milestones==0.1.13
@@ -209,7 +209,7 @@ redis==2.10.6
 reportlab==3.1.44
 requests-oauthlib==0.6.1
 requests==2.9.1
-rest-condition==1.0.3     # via edx-drf-extensions
+rest-condition==1.0.3
 rfc6266-parser==0.0.5.post2
 rules==1.3
 s3transfer==0.1.13        # via boto3
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 9469bcb600a..d173ec26bd2 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -135,7 +135,7 @@ edx-completion==0.1.7
 edx-django-oauth2-provider==1.2.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-drf-extensions==1.5.1
+edx-drf-extensions==1.5.2
 edx-enterprise==0.70.1
 edx-i18n-tools==0.4.5
 edx-lint==0.5.5
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index eaac239684b..afcc19a1a8a 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -130,7 +130,7 @@ edx-completion==0.1.7
 edx-django-oauth2-provider==1.2.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-drf-extensions==1.5.1
+edx-drf-extensions==1.5.2
 edx-enterprise==0.70.1
 edx-i18n-tools==0.4.5
 edx-lint==0.5.5
@@ -228,8 +228,8 @@ pluggy==0.6.0             # via pytest, tox
 polib==1.1.0
 psutil==1.2.1
 py2neo==3.1.2
-py==1.5.3                 # via pytest, tox
-pyasn1-modules==0.2.1     # via service-identity
+py==1.5.4                 # via pytest, tox
+pyasn1-modules==0.2.2     # via service-identity
 pyasn1==0.4.3             # via pyasn1-modules, service-identity
 pycodestyle==2.3.1
 pycontracts==1.7.1
-- 
GitLab