Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24152 from edx/openedx-chem-upgrade

Browse Source 
Switch the dependencies to use openedx-chem from PyPi
This commit is contained in:
Aarif
2020-06-05 22:04:04 +05:00
committed by GitHub
parent c382237c33 fe5a0cb68c
commit 7763741b0a
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/constraints.txt
View File

@@ -94,6 +94,9 @@ pytest-django<3.9.0
# Upgrading to 2.5.3 on 2020-01-03 triggered "'tzlocal' object has no attribute '_std_offset'" errors in production
python-dateutil==2.4.0
# stevedore 2.0.0 requires python >= 3.6
stevedore<2.0.0
# transifex-client 0.13.5 and 0.13.6 needlessly pin six and urllib3, 0.13.7 does so for python-slugify
# https://github.com/transifex/transifex-client/issues/252
transifex-client==0.13.4
@@ -103,3 +106,4 @@ wrapt==1.11.*
# zipp 2.0.0 requires Python >= 3.6
zipp==1.0.0

2
requirements/edx-sandbox/base.in
View File

@@ -16,6 +16,7 @@
-c ../constraints.txt
-r shared.txt # Dependencies in common with LMS and Studio
chem # A helper library for chemistry calculations
matplotlib==2.2.4 # 2D plotting library
numpy==1.7.2 # Numeric array processing utilities; used by scipy
pyparsing==2.2.0 # Python Parsing module
@@ -23,7 +24,6 @@ random2 # Implementation of random module that works
scipy==0.14.0 # Math, science, and engineering library
sympy==0.7.1 # Symbolic math library
git+https://github.com/edx/openedx-calc.git@e9b698c85ad1152002bc0868f475f153dce88952#egg=calc==0.4
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
# Install these packages from the edx-platform working tree
# NOTE: if you change code in these packages, you MUST change the version

2
requirements/edx/base.in
View File

@@ -35,6 +35,7 @@ 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
chem # A helper library for chemistry calculations
contextlib2 # We need contextlib2.ExitStack so we can stop using contextlib.nested which doesn't exist in python 3
defusedxml
Django # Web application framework
@@ -156,3 +157,4 @@ web-fragments # Provides the ability to render fragments o
XBlock # Courseware component architecture
xblock-utils # Provides utilities used by the Discussion XBlock
xss-utils # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations

6
requirements/edx/base.txt
View File

@@ -38,7 +38,7 @@ celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requi
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
chardet==3.0.4 # via -r requirements/edx/paver.txt, pdfminer.six, pysrt, requests
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/github.in
chem==1.2.0 # via -r requirements/edx/base.in
click==7.1.2 # via -r requirements/edx/../edx-sandbox/shared.txt, code-annotations, nltk, user-util
code-annotations==0.3.4 # via edx-enterprise
contextlib2==0.6.0.post1 # via -r requirements/edx/base.in
@@ -219,7 +219,7 @@ scipy==1.4.1 # via chem, openedx-calc
semantic-version==2.8.5 # via edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/base.in
simplejson==3.17.0 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils
six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, cryptography, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock
six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, cryptography, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock
slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client
social-auth-core==3.3.3 # via -r requirements/edx/base.in, social-auth-app-django
sorl-thumbnail==12.6.3 # via -r requirements/edx/base.in
@@ -227,7 +227,7 @@ sortedcontainers==2.1.0 # via -r requirements/edx/base.in, pdfminer.six
soupsieve==2.0.1 # via beautifulsoup4
sqlparse==0.3.1 # via -r requirements/edx/base.in, django
staff-graded-xblock==0.8 # via -r requirements/edx/base.in
stevedore==1.32.0 # via -r requirements/edx/base.in, -r requirements/edx/paver.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
super-csv==0.9.9 # via -r requirements/edx/base.in, edx-bulk-grades
sympy==1.6 # via symmath
testfixtures==6.14.1 # via edx-enterprise

6
requirements/edx/development.txt
View File

@@ -42,7 +42,7 @@ celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requi
certifi==2020.4.5.1 # via -r requirements/edx/testing.txt, requests
cffi==1.14.0 # via -r requirements/edx/testing.txt, cryptography
chardet==3.0.4 # via -r requirements/edx/testing.txt, pdfminer.six, pysrt, requests
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/testing.txt
chem==1.2.0 # via -r requirements/edx/testing.txt
click-log==0.3.2 # via -r requirements/edx/testing.txt, edx-lint
click==7.1.2 # via -r requirements/edx/development.in, -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, click-log, code-annotations, edx-lint, nltk, pip-tools, user-util
code-annotations==0.3.4 # via -r requirements/edx/testing.txt, edx-enterprise
@@ -276,7 +276,7 @@ semantic-version==2.8.5 # via -r requirements/edx/testing.txt, edx-drf-extensi
shapely==1.7.0 # via -r requirements/edx/testing.txt
simplejson==3.17.0 # via -r requirements/edx/testing.txt, sailthru-client, super-csv, xblock-utils
singledispatch==3.4.0.3 # via -r requirements/edx/testing.txt
six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock
six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock
slumber==0.7.1 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client
snowballstemmer==2.0.0 # via sphinx
social-auth-core==3.3.3 # via -r requirements/edx/testing.txt, social-auth-app-django
@@ -294,7 +294,7 @@ sphinxcontrib-qthelp==1.0.3 # via sphinx
sphinxcontrib-serializinghtml==1.1.4 # via sphinx
sqlparse==0.3.1 # via -r requirements/edx/testing.txt, django, django-debug-toolbar
staff-graded-xblock==0.8 # via -r requirements/edx/testing.txt
stevedore==1.32.0 # via -r requirements/edx/testing.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
super-csv==0.9.9 # via -r requirements/edx/testing.txt, edx-bulk-grades
sympy==1.6 # via -r requirements/edx/testing.txt, symmath
testfixtures==6.14.1 # via -r requirements/edx/testing.txt, edx-enterprise

1
requirements/edx/github.in
View File

@@ -52,7 +52,6 @@
# Python libraries to install directly from github
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
# Third-party:
-e git+https://github.com/edx/django-wiki.git@0.0.27#egg=django-wiki

2
requirements/edx/paver.txt
View File

@@ -23,7 +23,7 @@ pymongo==3.9.0 # via -r requirements/edx/paver.in, edx-opaque-keys
python-memcached==1.59 # via -r requirements/edx/paver.in
requests==2.23.0 # via -r requirements/edx/paver.in
six==1.15.0 # via edx-opaque-keys, libsass, mock, paver, python-memcached, stevedore
stevedore==1.32.0 # via -r requirements/edx/paver.in, edx-opaque-keys
stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in, edx-opaque-keys
urllib3==1.25.9 # via requests
watchdog==0.10.2 # via -r requirements/edx/paver.in
wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in

6
requirements/edx/testing.txt
View File

@@ -41,7 +41,7 @@ celery==3.1.26.post2 # via -c requirements/edx/../constraints.txt, -r requi
certifi==2020.4.5.1 # via -r requirements/edx/base.txt, requests
cffi==1.14.0 # via -r requirements/edx/base.txt, cryptography
chardet==3.0.4 # via -r requirements/edx/base.txt, pdfminer.six, pysrt, requests
git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 # via -r requirements/edx/base.txt
chem==1.2.0 # via -r requirements/edx/base.txt
click-log==0.3.2 # via edx-lint
click==7.1.2 # via -r requirements/edx/base.txt, click-log, code-annotations, edx-lint, nltk, user-util
code-annotations==0.3.4 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-enterprise
@@ -265,7 +265,7 @@ semantic-version==2.8.5 # via -r requirements/edx/base.txt, edx-drf-extensions
shapely==1.7.0 # via -r requirements/edx/base.txt
simplejson==3.17.0 # via -r requirements/edx/base.txt, sailthru-client, super-csv, xblock-utils
singledispatch==3.4.0.3 # via -r requirements/edx/testing.in
six==1.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock
six==1.15.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock
slumber==0.7.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client
social-auth-core==3.3.3 # via -r requirements/edx/base.txt, social-auth-app-django
sorl-thumbnail==12.6.3 # via -r requirements/edx/base.txt
@@ -273,7 +273,7 @@ sortedcontainers==2.1.0 # via -r requirements/edx/base.txt, pdfminer.six
soupsieve==2.0.1 # via -r requirements/edx/base.txt, beautifulsoup4
sqlparse==0.3.1 # via -r requirements/edx/base.txt, django
staff-graded-xblock==0.8 # via -r requirements/edx/base.txt
stevedore==1.32.0 # via -r requirements/edx/base.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, code-annotations, edx-ace, edx-enterprise, edx-opaque-keys
super-csv==0.9.9 # via -r requirements/edx/base.txt, edx-bulk-grades
sympy==1.6 # via -r requirements/edx/base.txt, symmath
testfixtures==6.14.1 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-enterprise