From db953d89a6def81ce1d1b7976492a3dc9cfd4db2 Mon Sep 17 00:00:00 2001 From: "M. Zulqarnain" Date: Fri, 19 Jun 2020 15:44:36 +0500 Subject: [PATCH] upgrade ora2 to install from PyPI (#24236) --- requirements/edx/base.in | 1 + requirements/edx/base.txt | 4 ++-- requirements/edx/development.txt | 4 ++-- requirements/edx/github.in | 1 - requirements/edx/testing.txt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index f2749757cd..6e97df7a2d 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -114,6 +114,7 @@ newrelic # New Relic agent for performance monitoring nodeenv # Utility for managing Node.js environments; we use this for deployments and testing oauthlib # OAuth specification support for authenticating via LTI or other Open edX services openedx-calc # Library supporting mathematical calculations for Open edX +ora2 pdfminer.six # Used in shoppingcart for extracting/parsing pdf text piexif # Exif image metadata manipulation, used in the profile_images app Pillow # Image manipulation library; used for course assets, profile images, invoice PDFs, etc. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1008dadba9..565b59031b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -49,7 +49,7 @@ cryptography==2.9.2 # via -r requirements/edx/../edx-sandbox/shared.txt, d cssutils==1.0.2 # via pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via pycontracts -defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.7.0rc1 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n django-celery==3.3.1 # via -r requirements/edx/base.in django-classy-tags==1.0.0 # via django-sekizai @@ -167,7 +167,7 @@ nodeenv==1.4.0 # via -r requirements/edx/base.in numpy==1.18.5 # via chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/base.in -git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/github.in +ora2==2.8.5 # via -r requirements/edx/base.in packaging==20.4 # via bleach, drf-yasg path.py==12.4.0 # via edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5e64173911..c11d04fd57 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -58,7 +58,7 @@ cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts -defusedxml==0.6.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.7.0rc1 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==3.0.1 # via -r requirements/edx/testing.txt distlib==0.3.0 # via -r requirements/edx/testing.txt, virtualenv django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n @@ -202,7 +202,7 @@ nodeenv==1.4.0 # via -r requirements/edx/testing.txt numpy==1.18.5 # via -r requirements/edx/testing.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/testing.txt -git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/testing.txt +ora2==2.8.5 # via -r requirements/edx/testing.txt packaging==20.4 # via -r requirements/edx/testing.txt, bleach, drf-yasg, pytest, sphinx, tox path.py==12.4.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, path.py diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 6fee8dceed..d71b3e601c 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -68,7 +68,6 @@ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752 # 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 -git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 -e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock -e git+https://github.com/edx/DoneXBlock.git@2.0.2#egg=done-xblock -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 052a370c02..ca7e0ab006 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -57,7 +57,7 @@ cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts -defusedxml==0.6.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core +defusedxml==0.7.0rc1 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==3.0.1 # via -r requirements/edx/coverage.txt distlib==0.3.0 # via virtualenv django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n @@ -194,7 +194,7 @@ nodeenv==1.4.0 # via -r requirements/edx/base.txt numpy==1.18.5 # via -r requirements/edx/base.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/base.txt -git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/base.txt +ora2==2.8.5 # via -r requirements/edx/base.txt packaging==20.4 # via -r requirements/edx/base.txt, bleach, drf-yasg, pytest, tox path.py==12.4.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-i18n-tools, ora2, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, path.py