Replace bridgekeeper fork with upstream

and make upgrade.
This commit is contained in:
Diana Huang
2020-05-21 13:44:15 -04:00
parent 53d2e24258
commit e3d85bcd74
5 changed files with 4 additions and 8 deletions

View File

@@ -33,6 +33,7 @@ bleach # Allowed-list-based HTML sanitizing library
boto==2.39.0 # Deprecated version of the AWS SDK; we should stop using this
boto3==1.4.8 # Amazon Web Services SDK for Python
botocore==1.8.17 # via boto3, s3transfer
bridgekeeper # Used for determining permissions for courseware.
celery # Asynchronous task execution library
contextlib2 # We need contextlib2.ExitStack so we can stop using contextlib.nested which doesn't exist in python 3
defusedxml

View File

@@ -34,7 +34,7 @@ bleach==3.1.5 # via -r requirements/edx/base.in, edx-enterprise, lti
boto3==1.4.8 # via -r requirements/edx/base.in, fs-s3fs
boto==2.39.0 # via -r requirements/edx/base.in, django-ses, edxval, ora2
botocore==1.8.17 # via -r requirements/edx/base.in, boto3, s3transfer
git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0 # via -r requirements/edx/github.in
bridgekeeper==0.8 # via -r requirements/edx/base.in
celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise
certifi==2020.4.5.1 # via -r requirements/edx/paver.txt, requests
cffi==1.14.0 # via -r requirements/edx/../edx-sandbox/shared.txt, cryptography

View File

@@ -38,7 +38,7 @@ bok-choy==1.1.1 # via -r requirements/edx/testing.txt
boto3==1.4.8 # via -r requirements/edx/testing.txt, fs-s3fs
boto==2.39.0 # via -r requirements/edx/testing.txt, django-ses, edxval, ora2
botocore==1.8.17 # via -r requirements/edx/testing.txt, boto3, s3transfer
git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0 # via -r requirements/edx/testing.txt
bridgekeeper==0.8 # via -r requirements/edx/testing.txt
celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise
certifi==2020.4.5.1 # via -r requirements/edx/testing.txt, requests
cffi==1.14.0 # via -r requirements/edx/testing.txt, cryptography

View File

@@ -78,11 +78,6 @@ git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248e
# Why install sorl-thumbnail directly from github? To use a Django 2.2 compatible version before Python 3.5 support was dropped
git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef79318a6fa80ac2#egg=sorl-thumbnail
# Forked to fix predicate inversion and keep support for Django 1.1 alive
# Once https://github.com/excitedleigh/bridgekeeper/pull/10 is merged, and we get to django 2, we can
# remove this fork
git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0
# 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

View File

@@ -37,7 +37,7 @@ bok-choy==1.1.1 # via -r requirements/edx/testing.in
boto3==1.4.8 # via -r requirements/edx/base.txt, fs-s3fs
boto==2.39.0 # via -r requirements/edx/base.txt, django-ses, edxval, ora2
botocore==1.8.17 # via -r requirements/edx/base.txt, boto3, s3transfer
git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0 # via -r requirements/edx/base.txt
bridgekeeper==0.8 # via -r requirements/edx/base.txt
celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-celery, django-user-tasks, edx-celeryutils, edx-enterprise
certifi==2020.4.5.1 # via -r requirements/edx/base.txt, requests
cffi==1.14.0 # via -r requirements/edx/base.txt, cryptography