From 1fcf2a0bd715c4c5e8421f9a2df0d9914fbfa661 Mon Sep 17 00:00:00 2001 From: Farhanah Sheets Date: Mon, 10 Sep 2018 15:59:09 -0400 Subject: [PATCH 1/2] Bump RecommenderXBlock version --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/github.in | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index ff1098aa2a..cd16b8cd4e 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -30,7 +30,7 @@ git+https://github.com/edx/edx-ora2.git@2.1.18#egg=ora2==2.1.18 -e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -git+https://github.com/edx/RecommenderXBlock.git@1.3.2#egg=recommender-xblock==1.3.2 +git+https://github.com/edx/RecommenderXBlock.git@1.3.3#egg=recommender-xblock==1.3.3 -e common/lib/safe_lxml -e common/lib/sandbox-packages -e common/lib/symmath diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5a19bd0a6f..4b1e458c6a 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -33,7 +33,7 @@ git+https://github.com/edx/edx-ora2.git@2.1.18#egg=ora2==2.1.18 -e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -git+https://github.com/edx/RecommenderXBlock.git@1.3.2#egg=recommender-xblock==1.3.2 +git+https://github.com/edx/RecommenderXBlock.git@1.3.3#egg=recommender-xblock==1.3.3 -e common/lib/safe_lxml -e common/lib/sandbox-packages -e common/lib/symmath diff --git a/requirements/edx/github.in b/requirements/edx/github.in index dc739c7299..a5c5404589 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -90,7 +90,7 @@ -e git+https://github.com/edx/codejail.git@a320d43ce6b9c93b17636b2491f724d9e433be47#egg=codejail -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e git+https://github.com/edx/edx-ora2.git@2.1.18#egg=ora2==2.1.18 --e git+https://github.com/edx/RecommenderXBlock.git@1.3.2#egg=recommender-xblock==1.3.2 +-e git+https://github.com/edx/RecommenderXBlock.git@1.3.3#egg=recommender-xblock==1.3.3 -e git+https://github.com/solashirai/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1 -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -e git+https://github.com/edx/DoneXBlock.git@01a14f3bd80ae47dd08cdbbe2f88f3eb88d00fba#egg=done-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 7f42879833..f2896d5279 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -31,7 +31,7 @@ git+https://github.com/edx/edx-ora2.git@2.1.18#egg=ora2==2.1.18 -e git+https://github.com/appliedsec/pygeoip.git@95e69341cebf5a6a9fbf7c4f5439d458898bdc3b#egg=pygeoip -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -git+https://github.com/edx/RecommenderXBlock.git@1.3.2#egg=recommender-xblock==1.3.2 +git+https://github.com/edx/RecommenderXBlock.git@1.3.3#egg=recommender-xblock==1.3.3 -e common/lib/safe_lxml -e common/lib/sandbox-packages -e common/lib/symmath From 5c3c0f0fcb742fbde6eff3a3ce98c7ee96d0edf6 Mon Sep 17 00:00:00 2001 From: Farhanah Sheets Date: Mon, 10 Sep 2018 20:21:56 -0400 Subject: [PATCH 2/2] Edit test value to be valid URL format --- openedx/tests/xblock_integration/test_recommender.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openedx/tests/xblock_integration/test_recommender.py b/openedx/tests/xblock_integration/test_recommender.py index 2b64a4fcef..dc188504dd 100644 --- a/openedx/tests/xblock_integration/test_recommender.py +++ b/openedx/tests/xblock_integration/test_recommender.py @@ -250,7 +250,7 @@ class TestRecommenderResourceBase(TestRecommender): """ resource = {"id": resource_id} edited_recommendations = { - key: value + " edited" for key, value in self.test_recommendations[self.resource_id].iteritems() + key: value + "edited" for key, value in self.test_recommendations[self.resource_id].iteritems() } resource.update(edited_recommendations) return resource