chore: add back openedx-django-pyfs

open-craft · Aug 8, 2023 · 9ea3c3e · 9ea3c3e
1 parent e3874a3
commit 9ea3c3e
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 9 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -2,5 +2,6 @@
 -c constraints.txt
 
 xblock-utils
+xblock[django]  # xblock-utils is not installing openedx-django-pyfs
 bleach[css]
 Django
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -10,11 +10,29 @@ asgiref==3.7.2
     # via django
 bleach[css]==6.0.0
     # via -r requirements/base.in
+boto3==1.28.21
+    # via fs-s3fs
+botocore==1.31.21
+    # via
+    #   boto3
+    #   s3transfer
 django==3.2.20
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
+    #   openedx-django-pyfs
 fs==2.4.16
+    # via
+    #   fs-s3fs
+    #   openedx-django-pyfs
+    #   xblock
+fs-s3fs==1.1.1
+    # via openedx-django-pyfs
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+lazy==1.5
     # via xblock
 lxml==4.9.3
     # via xblock
@@ -24,27 +42,36 @@ markupsafe==2.1.3
     # via
     #   mako
     #   xblock
-python-dateutil==2.8.2
+openedx-django-pyfs==3.4.0
     # via xblock
+python-dateutil==2.8.2
+    # via
+    #   botocore
+    #   xblock
 pytz==2023.3
     # via
     #   django
     #   xblock
 pyyaml==6.0.1
     # via xblock
+s3transfer==0.6.1
+    # via boto3
 simplejson==3.19.1
     # via xblock-utils
 six==1.16.0
     # via
     #   bleach
     #   fs
+    #   fs-s3fs
     #   python-dateutil
 sqlparse==0.4.4
     # via django
 tinycss2==1.1.1
     # via bleach
 typing-extensions==4.7.1
     # via asgiref
+urllib3==1.26.16
+    # via botocore
 web-fragments==2.1.0
     # via
     #   xblock
@@ -55,8 +82,10 @@ webencodings==0.5.1
     #   tinycss2
 webob==1.8.7
     # via xblock
-xblock==1.7.0
-    # via xblock-utils
+xblock[django]==1.7.0
+    # via
+    #   -r requirements/base.in
+    #   xblock-utils
 xblock-utils==3.4.0
     # via -r requirements/base.in
 

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -90,6 +90,7 @@ django==3.2.20
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/quality.txt
     #   edx-i18n-tools
+    #   openedx-django-pyfs
     #   xblock-sdk
 edx-i18n-tools==1.1.0
     # via -r requirements/quality.txt
@@ -108,10 +109,12 @@ fs==2.4.16
     # via
     #   -r requirements/quality.txt
     #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==1.1.1
     # via
     #   -r requirements/quality.txt
+    #   openedx-django-pyfs
     #   xblock-sdk
 idna==3.4
     # via
@@ -135,6 +138,10 @@ jmespath==1.0.1
     #   -r requirements/quality.txt
     #   boto3
     #   botocore
+lazy==1.5
+    # via
+    #   -r requirements/quality.txt
+    #   xblock
 lazy-object-proxy==1.9.0
     # via
     #   -r requirements/quality.txt
@@ -168,6 +175,10 @@ mdurl==0.1.2
     #   markdown-it-py
 mock==5.1.0
     # via -r requirements/quality.txt
+openedx-django-pyfs==3.4.0
+    # via
+    #   -r requirements/quality.txt
+    #   xblock
 packaging==23.1
     # via
     #   -r requirements/ci.txt
@@ -385,7 +396,7 @@ wrapt==1.15.0
     # via
     #   -r requirements/quality.txt
     #   astroid
-xblock==1.7.0
+xblock[django]==1.7.0
     # via
     #   -r requirements/quality.txt
     #   xblock-sdk

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -75,6 +75,7 @@ django==3.2.20
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/test.txt
     #   edx-i18n-tools
+    #   openedx-django-pyfs
     #   xblock-sdk
 edx-i18n-tools==1.1.0
     # via -r requirements/test.txt
@@ -88,10 +89,12 @@ fs==2.4.16
     # via
     #   -r requirements/test.txt
     #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==1.1.1
     # via
     #   -r requirements/test.txt
+    #   openedx-django-pyfs
     #   xblock-sdk
 idna==3.4
     # via
@@ -115,6 +118,10 @@ jmespath==1.0.1
     #   -r requirements/test.txt
     #   boto3
     #   botocore
+lazy==1.5
+    # via
+    #   -r requirements/test.txt
+    #   xblock
 lazy-object-proxy==1.9.0
     # via astroid
 lxml==4.9.3
@@ -144,6 +151,10 @@ mdurl==0.1.2
     #   markdown-it-py
 mock==5.1.0
     # via -r requirements/test.txt
+openedx-django-pyfs==3.4.0
+    # via
+    #   -r requirements/test.txt
+    #   xblock
 packaging==23.1
     # via
     #   -r requirements/test.txt
@@ -306,7 +317,7 @@ webob==1.8.7
     #   xblock-sdk
 wrapt==1.15.0
     # via astroid
-xblock==1.7.0
+xblock[django]==1.7.0
     # via
     #   -r requirements/test.txt
     #   xblock-sdk

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -18,9 +18,12 @@ binaryornot==0.4.4
     # via cookiecutter
     # via -r requirements/base.txt
 boto3==1.28.21
-    # via fs-s3fs
+    # via
+    #   -r requirements/base.txt
+    #   fs-s3fs
 botocore==1.31.21
     # via
+    #   -r requirements/base.txt
     #   boto3
     #   s3transfer
 certifi==2023.7.22
@@ -43,6 +46,7 @@ coverage[toml]==7.2.7
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.txt
     #   edx-i18n-tools
+    #   openedx-django-pyfs
     #   xblock-sdk
 edx-i18n-tools==1.1.0
     # via -r requirements/test.in
@@ -52,9 +56,13 @@ fs==2.4.16
     # via
     #   -r requirements/base.txt
     #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==1.1.1
-    # via xblock-sdk
+    # via
+    #   -r requirements/base.txt
+    #   openedx-django-pyfs
+    #   xblock-sdk
 idna==3.4
     # via requests
 iniconfig==2.0.0
@@ -65,8 +73,13 @@ jinja2==3.1.2
     #   cookiecutter
 jmespath==1.0.1
     # via
+    #   -r requirements/base.txt
     #   boto3
     #   botocore
+lazy==1.5
+    # via
+    #   -r requirements/base.txt
+    #   xblock
 lxml==4.9.3
     # via
     #   -r requirements/base.txt
@@ -88,6 +101,10 @@ mdurl==0.1.2
     # via markdown-it-py
 mock==5.1.0
     # via -r requirements/test.in
+openedx-django-pyfs==3.4.0
+    # via
+    #   -r requirements/base.txt
+    #   xblock
 packaging==23.1
     # via pytest
 path==16.7.1
@@ -139,7 +156,9 @@ requests==2.31.0
 rich==13.5.2
     # via cookiecutter
 s3transfer==0.6.1
-    # via boto3
+    # via
+    #   -r requirements/base.txt
+    #   boto3
 simplejson==3.19.1
     # via
     #   -r requirements/base.txt
@@ -175,6 +194,7 @@ typing-extensions==4.7.1
     #   rich
 urllib3==1.26.16
     # via
+    #   -r requirements/base.txt
     #   botocore
     #   requests
 web-fragments==2.1.0
@@ -193,7 +213,7 @@ webob==1.8.7
     #   -r requirements/base.txt
     #   xblock
     #   xblock-sdk
-xblock==1.7.0
+xblock[django]==1.7.0
     # via
     #   -r requirements/base.txt
     #   xblock-sdk