From 19ee9f0354f1df9765c855cff1a40ea10c868fe5 Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan <60315450+aht007@users.noreply.github.com> Date: Tue, 29 Nov 2022 13:29:07 +0500 Subject: [PATCH] chore: install django-wiki from pypi (#31271) --- requirements/edx/base.in | 1 + requirements/edx/base.txt | 16 ++++++++-------- requirements/edx/development.txt | 16 ++++++++-------- requirements/edx/github.in | 1 - requirements/edx/pip.txt | 16 ++++++++++++++++ requirements/edx/testing.txt | 16 ++++++++-------- 6 files changed, 41 insertions(+), 25 deletions(-) create mode 100644 requirements/edx/pip.txt diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 56359f5ce4..10444d67f9 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -179,3 +179,4 @@ xss-utils # https://github.com/edx/edx-platform/pull/2 enmerkar-underscore # Implements a underscore extractor for django-babel. xblock-drag-and-drop-v2 # Drag and Drop XBlock xblock-google-drive # XBlock for google docs and calendar +openedx-django-wiki diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 771971190d..f0843c6ea2 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -8,8 +8,6 @@ # via -r requirements/edx/github.in -e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/github.in --e git+https://github.com/openedx/django-wiki.git@1.1.1#egg=django-wiki - # via -r requirements/edx/github.in -e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner # via -r requirements/edx/github.in acid-xblock==0.2.1 @@ -61,9 +59,9 @@ billiard==3.6.4.0 bleach==5.0.1 # via # -r requirements/edx/base.in - # django-wiki # edx-enterprise # lti-consumer-xblock + # openedx-django-wiki # ora2 # xblock-drag-and-drop-v2 # xblock-poll @@ -204,7 +202,6 @@ django==3.2.16 # django-statici18n # django-storages # django-user-tasks - # django-wiki # djangorestframework # drf-jwt # drf-nested-routers @@ -239,6 +236,7 @@ django==3.2.16 # jsonfield # learner-pathway-progress # lti-consumer-xblock + # openedx-django-wiki # openedx-events # openedx-filters # ora2 @@ -321,7 +319,7 @@ django-model-utils==4.2.0 django-mptt==0.14.0 # via # -r requirements/edx/base.in - # django-wiki + # openedx-django-wiki django-multi-email-field==0.6.2 # via edx-enterprise django-mysql==4.7.1 @@ -343,7 +341,7 @@ django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142 django-sekizai==4.0.0 # via # -r requirements/edx/base.in - # django-wiki + # openedx-django-wiki django-ses==3.2.2 # via -r requirements/edx/base.in django-simple-history==3.0.0 @@ -696,7 +694,7 @@ markdown==3.3.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in - # django-wiki + # openedx-django-wiki # staff-graded-xblock # xblock-poll markey==0.8 @@ -758,6 +756,8 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.in +openedx-django-wiki==1.1.4 + # via -r requirements/edx/base.in openedx-events==3.1.0 # via # -r requirements/edx/base.in @@ -1070,7 +1070,7 @@ social-auth-core==4.3.0 sorl-thumbnail==12.9.0 # via # -r requirements/edx/base.in - # django-wiki + # openedx-django-wiki sortedcontainers==2.4.0 # via -r requirements/edx/base.in soupsieve==2.3.2.post1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5763be38ae..9ee443f7aa 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -8,8 +8,6 @@ # via -r requirements/edx/testing.txt -e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/testing.txt --e git+https://github.com/openedx/django-wiki.git@1.1.1#egg=django-wiki - # via -r requirements/edx/testing.txt -e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner # via -r requirements/edx/testing.txt acid-xblock==0.2.1 @@ -96,9 +94,9 @@ billiard==3.6.4.0 bleach==5.0.1 # via # -r requirements/edx/testing.txt - # django-wiki # edx-enterprise # lti-consumer-xblock + # openedx-django-wiki # ora2 # xblock-drag-and-drop-v2 # xblock-poll @@ -296,7 +294,6 @@ django==3.2.16 # django-statici18n # django-storages # django-user-tasks - # django-wiki # djangorestframework # drf-jwt # drf-nested-routers @@ -331,6 +328,7 @@ django==3.2.16 # jsonfield # learner-pathway-progress # lti-consumer-xblock + # openedx-django-wiki # openedx-events # openedx-filters # ora2 @@ -423,7 +421,7 @@ django-model-utils==4.2.0 django-mptt==0.14.0 # via # -r requirements/edx/testing.txt - # django-wiki + # openedx-django-wiki django-multi-email-field==0.6.2 # via # -r requirements/edx/testing.txt @@ -449,7 +447,7 @@ django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142 django-sekizai==4.0.0 # via # -r requirements/edx/testing.txt - # django-wiki + # openedx-django-wiki django-ses==3.2.2 # via -r requirements/edx/testing.txt django-simple-history==3.0.0 @@ -913,7 +911,7 @@ markdown==3.3.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt - # django-wiki + # openedx-django-wiki # staff-graded-xblock # xblock-poll markey==0.8 @@ -996,6 +994,8 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/testing.txt +openedx-django-wiki==1.1.4 + # via -r requirements/edx/testing.txt openedx-events==3.1.0 # via # -r requirements/edx/testing.txt @@ -1473,7 +1473,7 @@ social-auth-core==4.3.0 sorl-thumbnail==12.9.0 # via # -r requirements/edx/testing.txt - # django-wiki + # openedx-django-wiki sortedcontainers==2.4.0 # via -r requirements/edx/testing.txt soupsieve==2.3.2.post1 diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 4eebddcf96..382fbc2cee 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -54,7 +54,6 @@ # Python libraries to install directly from github # Third-party: --e git+https://github.com/openedx/django-wiki.git@1.1.1#egg=django-wiki -e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner git+https://github.com/openedx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 diff --git a/requirements/edx/pip.txt b/requirements/edx/pip.txt new file mode 100644 index 0000000000..fce157f653 --- /dev/null +++ b/requirements/edx/pip.txt @@ -0,0 +1,16 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# make upgrade +# +wheel==0.38.3 + # via -r requirements/edx/pip.in + +# The following packages are considered to be unsafe in a requirements file: +pip==22.3.1 + # via -r requirements/edx/pip.in +setuptools==59.8.0 + # via + # -c requirements/edx/../common_constraints.txt + # -r requirements/edx/pip.in diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 15120ce658..2dd30a3976 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -8,8 +8,6 @@ # via -r requirements/edx/base.txt -e git+https://github.com/openedx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/base.txt --e git+https://github.com/openedx/django-wiki.git@1.1.1#egg=django-wiki - # via -r requirements/edx/base.txt -e git+https://github.com/openedx/olxcleaner.git@2f0d6c7f126cbd69c9724b7b57a0b2565330a297#egg=olxcleaner # via -r requirements/edx/base.txt acid-xblock==0.2.1 @@ -91,9 +89,9 @@ billiard==3.6.4.0 bleach==5.0.1 # via # -r requirements/edx/base.txt - # django-wiki # edx-enterprise # lti-consumer-xblock + # openedx-django-wiki # ora2 # xblock-drag-and-drop-v2 # xblock-poll @@ -279,7 +277,6 @@ distlib==0.3.6 # django-statici18n # django-storages # django-user-tasks - # django-wiki # djangorestframework # drf-jwt # drf-nested-routers @@ -314,6 +311,7 @@ distlib==0.3.6 # jsonfield # learner-pathway-progress # lti-consumer-xblock + # openedx-django-wiki # openedx-events # openedx-filters # ora2 @@ -404,7 +402,7 @@ django-model-utils==4.2.0 django-mptt==0.14.0 # via # -r requirements/edx/base.txt - # django-wiki + # openedx-django-wiki django-multi-email-field==0.6.2 # via # -r requirements/edx/base.txt @@ -430,7 +428,7 @@ django-require @ git+https://github.com/openedx/django-require.git@0c54adb167142 django-sekizai==4.0.0 # via # -r requirements/edx/base.txt - # django-wiki + # openedx-django-wiki django-ses==3.2.2 # via -r requirements/edx/base.txt django-simple-history==3.0.0 @@ -871,7 +869,7 @@ markdown==3.3.7 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt - # django-wiki + # openedx-django-wiki # staff-graded-xblock # xblock-poll markey==0.8 @@ -945,6 +943,8 @@ oauthlib==3.0.1 # social-auth-core openedx-calc==3.0.1 # via -r requirements/edx/base.txt +openedx-django-wiki==1.1.4 + # via -r requirements/edx/base.txt openedx-events==3.1.0 # via # -r requirements/edx/base.txt @@ -1392,7 +1392,7 @@ social-auth-core==4.3.0 sorl-thumbnail==12.9.0 # via # -r requirements/edx/base.txt - # django-wiki + # openedx-django-wiki sortedcontainers==2.4.0 # via -r requirements/edx/base.txt soupsieve==2.3.2.post1