From 9633e3cd1abe5a87d123ad982664d82669fe6ce8 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 20 Sep 2019 09:13:46 -0400 Subject: [PATCH 1/2] Pull the recommender xblock from PyPI. --- requirements/edx/base.in | 1 + requirements/edx/github.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 53ec488bf8..c557c6dee8 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -128,6 +128,7 @@ python-Levenshtein python3-openid ; python_version>='3' python3-saml pyuca==1.1 # For more accurate sorting of translated country names in django-countries +recommender-xblock # https://github.com/edx/RecommenderXBlock reportlab # 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. diff --git a/requirements/edx/github.in b/requirements/edx/github.in index de3ab28850..e0ab7f0bcc 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -82,7 +82,6 @@ git+https://github.com/edx/bridgekeeper.git@4e34894e4ac5d0467ed1901811a81fd87ee0 -e git+https://github.com/edx/codejail.git@ed3d36c27913254a23273da95ad627a1bbbffa44#egg=codejail -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock git+https://github.com/edx/edx-ora2.git@2.3.1#egg=ora2==2.3.1 -git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1 git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2 -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock -e git+https://github.com/edx/DoneXBlock.git@01a14f3bd80ae47dd08cdbbe2f88f3eb88d00fba#egg=done-xblock From 35cb40859d40fb0e2606f9d5d159e2eb7659387f Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 20 Sep 2019 10:38:14 -0400 Subject: [PATCH 2/2] Update dependencies to pull in python3 fixes. --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e0df8b36d1..9054659341 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -206,7 +206,7 @@ python3-saml==1.5.0 pytz==2019.2 pyuca==1.1 pyyaml==5.1.2 -git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1 +recommender-xblock==1.4.4 redis==2.10.6 reportlab==3.5.26 requests-oauthlib==1.1.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index fbc5de20c2..3fe4495132 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -280,7 +280,7 @@ pytz==2019.2 pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 -git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1 +recommender-xblock==1.4.4 recommonmark==0.6.0 redis==2.10.6 reportlab==3.5.26 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9b30ec6d72..aafa5aa941 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -271,7 +271,7 @@ pytz==2019.2 pyuca==1.1 pyyaml==5.1.2 radon==4.0.0 -git+https://github.com/edx/RecommenderXBlock.git@1.4.1#egg=recommender-xblock==1.4.1 +recommender-xblock==1.4.4 redis==2.10.6 reportlab==3.5.26 requests-oauthlib==1.1.0