From a96c218553dc57a5ba11c268f6bf833ac263e99b Mon Sep 17 00:00:00 2001 From: Luis Moreno Date: Wed, 1 Jul 2020 14:11:48 -0400 Subject: [PATCH] Use PyPi release of django-ratelimit --- requirements/edx/base.in | 1 + requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/github.in | 3 --- requirements/edx/testing.txt | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 321756cef3..fbec039203 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -57,6 +57,7 @@ django-mysql django-oauth-toolkit # Provides oAuth2 capabilities for Django django-pipeline django-pyfs +django-ratelimit django-ratelimit-backend django-require django-sekizai diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 29325fae43..31763cf622 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -7,7 +7,6 @@ -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock # via -r requirements/edx/github.in -e common/lib/capa # via -r requirements/edx/local.in -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail # via -r requirements/edx/github.in --e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit # via -r requirements/edx/github.in -e git+https://github.com/edx/django-wiki.git@0.0.27#egg=django-wiki # via -r requirements/edx/github.in -e git+https://github.com/edx/DoneXBlock.git@2.0.2#egg=done-xblock # via -r requirements/edx/github.in -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/github.in @@ -71,6 +70,7 @@ django-object-actions==2.0.0 # via edx-enterprise django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in django-pyfs==2.1 # via -r requirements/edx/base.in django-ratelimit-backend==2.0 # via -r requirements/edx/base.in +django-ratelimit==3.0.0 # via -r requirements/edx/base.in django-require==1.0.11 # via -r requirements/edx/base.in django-sekizai==1.1.0 # via -r requirements/edx/base.in, django-wiki django-ses==0.8.14 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index e17ce22ec6..dbab932b75 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -7,7 +7,6 @@ -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock # via -r requirements/edx/testing.txt -e common/lib/capa # via -r requirements/edx/testing.txt -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail # via -r requirements/edx/testing.txt --e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit # via -r requirements/edx/testing.txt -e git+https://github.com/edx/django-wiki.git@0.0.27#egg=django-wiki # via -r requirements/edx/testing.txt -e git+https://github.com/edx/DoneXBlock.git@2.0.2#egg=done-xblock # via -r requirements/edx/testing.txt -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/testing.txt @@ -83,6 +82,7 @@ django-object-actions==2.0.0 # via -r requirements/edx/testing.txt, edx-enterpr django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt django-pyfs==2.1 # via -r requirements/edx/testing.txt django-ratelimit-backend==2.0 # via -r requirements/edx/testing.txt +django-ratelimit==3.0.0 # via -r requirements/edx/testing.txt django-require==1.0.11 # via -r requirements/edx/testing.txt django-sekizai==1.1.0 # via -r requirements/edx/testing.txt, django-wiki django-ses==0.8.14 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 20f609d803..767e19f786 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -58,9 +58,6 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme -# The latest 2.0.0 release doesn't yet support Django 2.2, this commit from master does --e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit - # Our libraries: -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index fa92bf1420..0d30d7be2d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -7,7 +7,6 @@ -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock # via -r requirements/edx/base.txt -e common/lib/capa # via -r requirements/edx/base.txt -e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail # via -r requirements/edx/base.txt --e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit # via -r requirements/edx/base.txt -e git+https://github.com/edx/django-wiki.git@0.0.27#egg=django-wiki # via -r requirements/edx/base.txt -e git+https://github.com/edx/DoneXBlock.git@2.0.2#egg=done-xblock # via -r requirements/edx/base.txt -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/base.txt @@ -81,6 +80,7 @@ django-object-actions==2.0.0 # via -r requirements/edx/base.txt, edx-enterprise django-pipeline==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt django-pyfs==2.1 # via -r requirements/edx/base.txt django-ratelimit-backend==2.0 # via -r requirements/edx/base.txt +django-ratelimit==3.0.0 # via -r requirements/edx/base.txt django-require==1.0.11 # via -r requirements/edx/base.txt django-sekizai==1.1.0 # via -r requirements/edx/base.txt, django-wiki django-ses==0.8.14 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt