Merge pull request #21186 from edx/ammar/upgrade-edx-enterprise-and-edx-rbac

unpin edx-rbac
2019-07-24 16:02:49 +05:00
parent 7731b0e172 3b1a35ee39
commit 9525dafde0
4 changed files with 3 additions and 6 deletions
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -55,9 +55,6 @@ scipy<=1.2.1
 # xmodule.tests.test_resource_templates.ResourceTemplatesTests See TE-2391 for details.
 pytest<4.6.0

-# Pinning to older version of edx-rbac until ENT-2002 is resolved.
-edx-rbac==0.2.1
-
 # transifex-client 0.13.6 requires python-slugify 1.2.6, but the latest version is 3.0.2
 python-slugify==1.2.6

--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -114,7 +114,7 @@ edx-opaque-keys[django]==1.0.1
 edx-organizations==2.1.0
 edx-proctoring-proctortrack==1.0.5
 edx-proctoring==2.0.6
-edx-rbac==0.2.1           # via edx-enterprise
+edx-rbac==1.0.2           # via edx-enterprise
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
 git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -135,7 +135,7 @@ edx-opaque-keys[django]==1.0.1
 edx-organizations==2.1.0
 edx-proctoring-proctortrack==1.0.5
 edx-proctoring==2.0.6
-edx-rbac==0.2.1
+edx-rbac==1.0.2
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
 git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -131,7 +131,7 @@ edx-opaque-keys[django]==1.0.1
 edx-organizations==2.1.0
 edx-proctoring-proctortrack==1.0.5
 edx-proctoring==2.0.6
-edx-rbac==0.2.1
+edx-rbac==1.0.2
 edx-rest-api-client==1.9.2
 edx-search==1.2.2
 git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3