From ceaff54fcb7c88cf1e754c5a9f2bab7a7a49b997 Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Wed, 18 Nov 2015 13:53:53 -0500 Subject: [PATCH 01/23] updated edx-organizations with django 1.8 release tag --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 851cbfb875..920675110b 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -57,7 +57,7 @@ git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive -e git+https://github.com/edx/edx-reverification-block.git@ned/upgrade-django-1.8#egg=edx-reverification-block==0.0.5 -e git+https://github.com/edx/edx-user-state-client.git@30c0ad4b9f57f8d48d6943eb585ec8a9205f4469#egg=edx-user-state-client -git+https://github.com/edx/edx-organizations.git@ned/django-18#egg=edx-organizations==0.1.7 +git+https://github.com/edx/edx-organizations.git@release-2015-11-17#egg=edx-organizations==0.1.7 git+https://github.com/edx/edx-proctoring.git@django1.8-upgrade#egg=edx-proctoring==0.11.2 # Third Party XBlocks From e3bb5137ea4ae1dce2f5b3cd8565cfde54d455b5 Mon Sep 17 00:00:00 2001 From: John Eskew Date: Wed, 18 Nov 2015 13:57:00 -0500 Subject: [PATCH 02/23] django-oauth2-provider --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 920675110b..6f34a64f06 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -10,7 +10,7 @@ # Third-party: -e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline git+https://github.com/edx/django-wiki.git@ned/dj18#egg=django-wiki==0.0.4 --e git+https://github.com/edx/django-oauth2-provider.git@will/django-1.8-upgrade#egg=django-oauth2-provider==0.2.7-fork-edx-6 +-e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-6#egg=django-oauth2-provider git+https://github.com/edx/django-openid-auth.git@django1.8-upgrade#egg=django-openid-auth==0.8 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth==1.0.1 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 From 8594896621b2065e52dc4b7bd0e4cabaed84d53c Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Wed, 18 Nov 2015 14:12:25 -0500 Subject: [PATCH 03/23] updated edx-reverification tag --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 6f34a64f06..e3d57be26b 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -55,7 +55,7 @@ git+https://github.com/edx/edx-val.git@ammar/upgrade-django-1.8#egg=edxval==0.0. git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx/xblock-utils.git@213a97a50276d6a2504d8133650b2930ead357a0#egg=xblock-utils -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive --e git+https://github.com/edx/edx-reverification-block.git@ned/upgrade-django-1.8#egg=edx-reverification-block==0.0.5 +-e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5 -e git+https://github.com/edx/edx-user-state-client.git@30c0ad4b9f57f8d48d6943eb585ec8a9205f4469#egg=edx-user-state-client git+https://github.com/edx/edx-organizations.git@release-2015-11-17#egg=edx-organizations==0.1.7 git+https://github.com/edx/edx-proctoring.git@django1.8-upgrade#egg=edx-proctoring==0.11.2 From 41e9fd187b3afe65110d43d748d9c92ea0c0aef0 Mon Sep 17 00:00:00 2001 From: John Eskew Date: Wed, 18 Nov 2015 14:16:52 -0500 Subject: [PATCH 04/23] django-oauth-provider take 2 --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index e3d57be26b..b3918d3058 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -10,7 +10,7 @@ # Third-party: -e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline git+https://github.com/edx/django-wiki.git@ned/dj18#egg=django-wiki==0.0.4 --e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-6#egg=django-oauth2-provider +-e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-7#egg=django-oauth2-provider git+https://github.com/edx/django-openid-auth.git@django1.8-upgrade#egg=django-openid-auth==0.8 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth==1.0.1 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 From 647c1257dd36be7052e75ba889449f600b654042 Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Wed, 18 Nov 2015 14:31:25 -0500 Subject: [PATCH 05/23] updated edx-milestones to tag release-2015-11-17 --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index b3918d3058..44957772ee 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -51,7 +51,7 @@ git+https://github.com/edx/edx-val.git@ammar/upgrade-django-1.8#egg=edxval==0.0. -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -e git+https://github.com/edx/edx-search.git@ammar/upgrade-django-1.8#egg=edx-search==0.1.1 --e git+https://github.com/edx/edx-milestones.git@django1.8-upgrade#egg=edx-milestones==0.1.5 +-e git+https://github.com/edx/edx-milestones.git@release-2015-11-17#egg=edx-milestones==0.1.5 git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx/xblock-utils.git@213a97a50276d6a2504d8133650b2930ead357a0#egg=xblock-utils -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive From ecd0b5f24467bfb27f71f8e392609211ca210053 Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Wed, 18 Nov 2015 14:41:32 -0500 Subject: [PATCH 06/23] set tag for edx-search --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 44957772ee..31fcb9800b 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -50,7 +50,7 @@ git+https://github.com/edx/edx-oauth2-provider.git@django1.8-upgrade#egg=edx-oau git+https://github.com/edx/edx-val.git@ammar/upgrade-django-1.8#egg=edxval==0.0.8 -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock --e git+https://github.com/edx/edx-search.git@ammar/upgrade-django-1.8#egg=edx-search==0.1.1 +-e git+https://github.com/edx/edx-search.git@release-2015-11-17#egg=edx-search==0.1.1 -e git+https://github.com/edx/edx-milestones.git@release-2015-11-17#egg=edx-milestones==0.1.5 git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx/xblock-utils.git@213a97a50276d6a2504d8133650b2930ead357a0#egg=xblock-utils From ece43db41133bd3c4e6b2a4ca4fd16836cf264bd Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Wed, 18 Nov 2015 14:55:43 -0500 Subject: [PATCH 07/23] Updated edx-oauth2-provider tag --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 31fcb9800b..fd928f1b3b 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -46,7 +46,7 @@ git+https://github.com/edx/lettuce.git@django1.8/upgrade#egg=lettuce==0.2.20.002 -e git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3 git+https://github.com/edx/i18n-tools.git@v0.1.3#egg=i18n-tools==v0.1.3 -git+https://github.com/edx/edx-oauth2-provider.git@django1.8-upgrade#egg=edx-oauth2-provider==0.5.8 +git+https://github.com/edx/edx-oauth2-provider.git@0.5.8#egg=edx-oauth2-provider==0.5.8 git+https://github.com/edx/edx-val.git@ammar/upgrade-django-1.8#egg=edxval==0.0.8 -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock From 2977419fa6d5d66aa4e3d5cd673ce1e3c717e32e Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Wed, 18 Nov 2015 14:57:35 -0500 Subject: [PATCH 08/23] Updated edx-val tag --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index fd928f1b3b..bab09b12ac 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -47,7 +47,7 @@ git+https://github.com/edx/lettuce.git@django1.8/upgrade#egg=lettuce==0.2.20.002 git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3 git+https://github.com/edx/i18n-tools.git@v0.1.3#egg=i18n-tools==v0.1.3 git+https://github.com/edx/edx-oauth2-provider.git@0.5.8#egg=edx-oauth2-provider==0.5.8 -git+https://github.com/edx/edx-val.git@ammar/upgrade-django-1.8#egg=edxval==0.0.8 +git+https://github.com/edx/edx-val.git@0.0.8#egg=edxval==0.0.8 -e git+https://github.com/pmitros/RecommenderXBlock.git@518234bc354edbfc2651b9e534ddb54f96080779#egg=recommender-xblock -e git+https://github.com/pmitros/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -e git+https://github.com/edx/edx-search.git@release-2015-11-17#egg=edx-search==0.1.1 From 73bf93eefd33c72818505dab2e96f58bfc0fc18c Mon Sep 17 00:00:00 2001 From: John Eskew Date: Wed, 18 Nov 2015 15:26:50 -0500 Subject: [PATCH 09/23] django-openid-auth --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index bab09b12ac..f9619142c1 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -11,7 +11,7 @@ -e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline git+https://github.com/edx/django-wiki.git@ned/dj18#egg=django-wiki==0.0.4 -e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-7#egg=django-oauth2-provider -git+https://github.com/edx/django-openid-auth.git@django1.8-upgrade#egg=django-openid-auth==0.8 +git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth==1.0.1 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6 From 2408c0f0c7d7ac944930c3f69215136dc3ebac9e Mon Sep 17 00:00:00 2001 From: John Eskew Date: Wed, 18 Nov 2015 15:50:01 -0500 Subject: [PATCH 10/23] django-pyfs --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index f9619142c1..7f4c6ff32d 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -19,7 +19,7 @@ git+https://github.com/edx/nltk.git@2.0.6#egg=nltk==2.0.6 -e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk -e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip -e git+https://github.com/jazkarta/edx-jsme.git@c5bfa5d361d6685d8c643838fc0055c25f8b7999#egg=edx-jsme -git+https://github.com/edx/django-pyfs.git@ned/update-django-18#egg=django-pyfs==1.0.3 +git+https://github.com/edx/django-pyfs.git@1.0.3#egg=django-pyfs==1.0.3 git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a0c695#egg=django-cas -e git+https://github.com/dgrtwo/ParsePy.git@7949b9f754d1445eff8e8f20d0e967b9a6420639#egg=parse_rest # Master pyfs has a bug working with VPC auth. This is a fix. We should switch From a160f107979a55d6964abd5488cfcd84a03eb8d8 Mon Sep 17 00:00:00 2001 From: John Eskew Date: Wed, 18 Nov 2015 15:54:31 -0500 Subject: [PATCH 11/23] Add version back to django-oauth2-provider --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 7f4c6ff32d..6c81d9e1ac 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -10,7 +10,7 @@ # Third-party: -e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline git+https://github.com/edx/django-wiki.git@ned/dj18#egg=django-wiki==0.0.4 --e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-7#egg=django-oauth2-provider +-e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-7#egg=django-oauth2-provider==0.2.7-fork-edx-6 git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth==1.0.1 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 From 2ab255a304afed06c14e9e894371ee6881b0000c Mon Sep 17 00:00:00 2001 From: Usman Khalid <2200617@gmail.com> Date: Thu, 19 Nov 2015 18:07:06 +0500 Subject: [PATCH 12/23] Tag event-tracking. --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 6c81d9e1ac..49f2a96b1b 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -38,7 +38,7 @@ git+https://github.com/edx/lettuce.git@django1.8/upgrade#egg=lettuce==0.2.20.002 -e git+https://github.com/edx/XBlock.git@django1.8-upgrade#egg=XBlock -e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail -e git+https://github.com/edx/js-test-tool.git@v0.1.6#egg=js_test_tool --e git+https://github.com/edx/event-tracking.git@django1.8-upgrade#egg=event-tracking==0.2.1 +-e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1 -e git+https://github.com/edx/django-splash.git@ammar/upgrade-to-django1.8#egg=django-splash==0.2 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e git+https://github.com/edx/edx-ora2.git@mzfr/django18-from-release#egg=ora2==0.2.2 From 6eda0f34107852d9d2710505ab9720278d2a3764 Mon Sep 17 00:00:00 2001 From: John Eskew Date: Thu, 19 Nov 2015 09:29:30 -0500 Subject: [PATCH 13/23] Change django-oauth2-provider to match version --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 49f2a96b1b..0972f0fe4b 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -10,7 +10,7 @@ # Third-party: -e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline git+https://github.com/edx/django-wiki.git@ned/dj18#egg=django-wiki==0.0.4 --e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-7#egg=django-oauth2-provider==0.2.7-fork-edx-6 +-e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-6a#egg=django-oauth2-provider==0.2.7-fork-edx-6 git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth==1.0.1 git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 From 705bdaaace1b6e0a977b9be090aa38bd330b07df Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Thu, 19 Nov 2015 09:31:39 -0500 Subject: [PATCH 14/23] updated edx-proctoring tag --- requirements/edx/github.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 0972f0fe4b..a70f19844c 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -41,7 +41,7 @@ git+https://github.com/edx/lettuce.git@django1.8/upgrade#egg=lettuce==0.2.20.002 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1 -e git+https://github.com/edx/django-splash.git@ammar/upgrade-to-django1.8#egg=django-splash==0.2 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock --e git+https://github.com/edx/edx-ora2.git@mzfr/django18-from-release#egg=ora2==0.2.2 +-e git+https://github.com/edx/edx-ora2.git@release-2015-11-17#egg=ora2==0.2.2 -e git+https://github.com/edx/edx-submissions.git@django-upgrade/1.8#egg=edx-submissions==0.1.2 -e git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3 @@ -58,7 +58,7 @@ git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5 -e git+https://github.com/edx/edx-user-state-client.git@30c0ad4b9f57f8d48d6943eb585ec8a9205f4469#egg=edx-user-state-client git+https://github.com/edx/edx-organizations.git@release-2015-11-17#egg=edx-organizations==0.1.7 -git+https://github.com/edx/edx-proctoring.git@django1.8-upgrade#egg=edx-proctoring==0.11.2 +git+https://github.com/edx/edx-proctoring.git@0.11.2#egg=edx-proctoring==0.11.2 # Third Party XBlocks -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga From 219a2083ad456ea4d0e730477af8a586f2d877b4 Mon Sep 17 00:00:00 2001 From: Usman Khalid <2200617@gmail.com> Date: Thu, 19 Nov 2015 19:32:05 +0500 Subject: [PATCH 15/23] Tag lettuce --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index a70f19844c..4df8011de8 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -32,7 +32,7 @@ git+https://github.com/hmarr/django-debug-toolbar-mongo.git@b0686a76f1ce3532088c -e git+https://github.com/jazkarta/ccx-keys.git@e6b03704b1bb97c1d2f31301ecb4e3a687c536ea#egg=ccx-keys 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@django1.8/upgrade#egg=lettuce==0.2.20.002 +git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 # Our libraries: -e git+https://github.com/edx/XBlock.git@django1.8-upgrade#egg=XBlock From 0eabdcbfdeeb4f9ebba1ee1ebfa8d5ce4e1e8826 Mon Sep 17 00:00:00 2001 From: Brian Beggs Date: Thu, 19 Nov 2015 10:24:55 -0500 Subject: [PATCH 16/23] reverting ora2 tag in github.txt --- requirements/edx/github.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 4df8011de8..539c142949 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -25,7 +25,7 @@ git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a # Master pyfs has a bug working with VPC auth. This is a fix. We should switch # back to master when and if this fix is merged back. # fs==0.4.0 -git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0b +git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0band is # 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 @@ -41,7 +41,7 @@ git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1 -e git+https://github.com/edx/django-splash.git@ammar/upgrade-to-django1.8#egg=django-splash==0.2 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock --e git+https://github.com/edx/edx-ora2.git@release-2015-11-17#egg=ora2==0.2.2 +-e git+https://github.com/edx/edx-ora2.git@mzfr/django18-from-release#egg=ora2==0.2.2 -e git+https://github.com/edx/edx-submissions.git@django-upgrade/1.8#egg=edx-submissions==0.1.2 -e git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3 From 11a183855c502f895c751019f2fc70467661cef2 Mon Sep 17 00:00:00 2001 From: Muhammad Ammar Date: Thu, 19 Nov 2015 20:56:52 +0500 Subject: [PATCH 17/23] update submissions and ora2 versions --- requirements/edx/github.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 539c142949..f54fae0fcd 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -41,8 +41,8 @@ git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1 -e git+https://github.com/edx/django-splash.git@ammar/upgrade-to-django1.8#egg=django-splash==0.2 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock --e git+https://github.com/edx/edx-ora2.git@mzfr/django18-from-release#egg=ora2==0.2.2 --e git+https://github.com/edx/edx-submissions.git@django-upgrade/1.8#egg=edx-submissions==0.1.2 +-e git+https://github.com/edx/edx-ora2.git@0.2.2#egg=ora2==0.2.2 +-e git+https://github.com/edx/edx-submissions.git@0.1.2#egg=edx-submissions==0.1.2 -e git+https://github.com/edx/opaque-keys.git@27dc382ea587483b1e3889a3d19cbd90b9023a06#egg=opaque-keys git+https://github.com/edx/ease.git@release-2015-07-14#egg=ease==0.1.3 git+https://github.com/edx/i18n-tools.git@v0.1.3#egg=i18n-tools==v0.1.3 @@ -62,4 +62,4 @@ git+https://github.com/edx/edx-proctoring.git@0.11.2#egg=edx-proctoring==0.11.2 # Third Party XBlocks -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga --e git+https://github.com/open-craft/xblock-poll@e7a6c95c300e95c51e42bfd1eba70489c05a6527#egg=xblock-poll \ No newline at end of file +-e git+https://github.com/open-craft/xblock-poll@e7a6c95c300e95c51e42bfd1eba70489c05a6527#egg=xblock-poll From 66cbc6a6d107ce05d68e12cbe26a9347243d9528 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 19 Nov 2015 11:17:09 -0500 Subject: [PATCH 18/23] Update django-wiki reference --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index f54fae0fcd..f1b8793787 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -9,7 +9,7 @@ # Third-party: -e git+https://github.com/cyberdelia/django-pipeline.git@1.5.3#egg=django-pipeline -git+https://github.com/edx/django-wiki.git@ned/dj18#egg=django-wiki==0.0.4 +git+https://github.com/edx/django-wiki.git@v0.0.4#egg=django-wiki==0.0.4 -e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-6a#egg=django-oauth2-provider==0.2.7-fork-edx-6 git+https://github.com/edx/django-openid-auth.git@0.8#egg=django-openid-auth==0.8 -e git+https://github.com/edx/django-rest-framework-oauth.git@f0b503fda8c254a38f97fef802ded4f5fe367f7a#egg=djangorestframework-oauth==1.0.1 From 6a58a9c120dfe87112a02d30ff5529ce69b49098 Mon Sep 17 00:00:00 2001 From: John Eskew Date: Thu, 19 Nov 2015 11:16:30 -0500 Subject: [PATCH 19/23] edx-organizations --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index f1b8793787..3cedd6a20a 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -57,7 +57,7 @@ git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5 -e git+https://github.com/edx/edx-user-state-client.git@30c0ad4b9f57f8d48d6943eb585ec8a9205f4469#egg=edx-user-state-client -git+https://github.com/edx/edx-organizations.git@release-2015-11-17#egg=edx-organizations==0.1.7 +git+https://github.com/edx/edx-organizations.git@release-2015-11-17-plus-django-18#egg=edx-organizations==0.1.7 git+https://github.com/edx/edx-proctoring.git@0.11.2#egg=edx-proctoring==0.11.2 # Third Party XBlocks From 698cea3f87d7a12f297af7723bcbf841c02a59ab Mon Sep 17 00:00:00 2001 From: John Eskew Date: Thu, 19 Nov 2015 11:27:07 -0500 Subject: [PATCH 20/23] Remove errant 'and is' --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 3cedd6a20a..213bc69ce2 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -25,7 +25,7 @@ git+https://github.com/mitocw/django-cas.git@60a5b8e5a62e63e0d5d224a87f0b489201a # Master pyfs has a bug working with VPC auth. This is a fix. We should switch # back to master when and if this fix is merged back. # fs==0.4.0 -git+https://github.com/pmitros/pyfs.git@96e1922348bfe6d99201b9512a9ed946c87b7e0band is +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 From a65d599fae323d2e2ae9349660d13230edd8b634 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 19 Nov 2015 11:43:12 -0500 Subject: [PATCH 21/23] Update XBlock version --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 213bc69ce2..972c35b0fa 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -35,7 +35,7 @@ git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 # Our libraries: --e git+https://github.com/edx/XBlock.git@django1.8-upgrade#egg=XBlock +-e git+https://github.com/edx/XBlock.git@xblock-0.4.1#egg=XBlock==0.4.1 -e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail -e git+https://github.com/edx/js-test-tool.git@v0.1.6#egg=js_test_tool -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1 From e4d8b58412ea013cc21d993b82dd8361bc357b47 Mon Sep 17 00:00:00 2001 From: John Eskew Date: Thu, 19 Nov 2015 11:56:06 -0500 Subject: [PATCH 22/23] Bump tag & version of edx-organizations --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 972c35b0fa..75a3e53fd6 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -57,7 +57,7 @@ git+https://github.com/edx/edx-lint.git@v0.3.2#egg=edx_lint==0.3.2 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5 -e git+https://github.com/edx/edx-user-state-client.git@30c0ad4b9f57f8d48d6943eb585ec8a9205f4469#egg=edx-user-state-client -git+https://github.com/edx/edx-organizations.git@release-2015-11-17-plus-django-18#egg=edx-organizations==0.1.7 +git+https://github.com/edx/edx-organizations.git@release-2015-11-17-with-django-18#egg=edx-organizations==0.1.8 git+https://github.com/edx/edx-proctoring.git@0.11.2#egg=edx-proctoring==0.11.2 # Third Party XBlocks From 26a4670cea39538238ccaa1983b74ba8683afa6b Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 19 Nov 2015 12:34:42 -0500 Subject: [PATCH 23/23] Update version of django-splash --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 75a3e53fd6..5c7f8865aa 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -39,7 +39,7 @@ git+https://github.com/edx/lettuce.git@0.2.20.002#egg=lettuce==0.2.20.002 -e git+https://github.com/edx/codejail.git@6b17c33a89bef0ac510926b1d7fea2748b73aadd#egg=codejail -e git+https://github.com/edx/js-test-tool.git@v0.1.6#egg=js_test_tool -e git+https://github.com/edx/event-tracking.git@0.2.1#egg=event-tracking==0.2.1 --e git+https://github.com/edx/django-splash.git@ammar/upgrade-to-django1.8#egg=django-splash==0.2 +-e git+https://github.com/edx/django-splash.git@v0.2#egg=django-splash==0.2 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e git+https://github.com/edx/edx-ora2.git@0.2.2#egg=ora2==0.2.2 -e git+https://github.com/edx/edx-submissions.git@0.1.2#egg=edx-submissions==0.1.2