From 0ddf46894a9535b27c4089aae28f77c611d14d24 Mon Sep 17 00:00:00 2001 From: Clinton Blackburn <cblackburn@edx.org> Date: Wed, 27 Jan 2016 13:12:56 -0500 Subject: [PATCH] Resolved ccx-keys dependency on edx-opaque-keys ccx-keys has been updated to use the edx-opaque-keys library from PyPI, rather than simply expect the package to be pre-installed. The edx-opaque-keys version has been bumped as it was updated to export test packages needed by ccx-keys. --- requirements/edx/base.txt | 2 +- requirements/edx/github.txt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index cb445a99d3d..b4a3ae5a55f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -32,7 +32,7 @@ django-method-override==0.1.0 #djangorestframework>=3.1,<3.2 git+https://github.com/edx/django-rest-framework.git@3c72cb5ee5baebc4328947371195eae2077197b0#egg=djangorestframework==3.2.3 django==1.8.7 -edx-opaque-keys==0.2.0 +edx-opaque-keys==0.2.1 edx-organizations==0.3.1 edx-rest-api-client==1.2.1 edx-search==0.1.1 diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 38c2f90cda0..d101995fa71 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -63,8 +63,10 @@ git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b # The officially released version of django-debug-toolbar-mongo doesn't support DJDT 1.x. This commit does. git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c4aee6e76b9abe61cc808 -# custom opaque-key implementations for ccx --e git+https://github.com/jazkarta/ccx-keys.git@e6b03704b1bb97c1d2f31301ecb4e3a687c536ea#egg=ccx-keys + +# custom opaque-key implementations for CCX +git+https://github.com/edx/ccx-keys.git@0.1.1#egg=ccx-keys==0.1.1 + git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx # Used for testing git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 -- GitLab