Merge pull request #264 from openedx/feanil/update_django_pyfs

feanil/update django pyfs

Author: Feanil Patel

requirements/base.in

@@ -5,13 +5,11 @@
 boto
 cookiecutter
 Django
-django-pyfs
 fs-s3fs
 lxml
-lazy
 requests
 pypng
 simplejson
 web-fragments
 webob
-XBlock
+XBlock[django]

requirements/base.txt

@@ -8,23 +8,23 @@ appdirs==1.4.4
     # via fs
 arrow==1.2.3
     # via jinja2-time
-asgiref==3.5.2
+asgiref==3.6.0
     # via django
 binaryornot==0.4.4
     # via cookiecutter
 boto==2.49.0
     # via -r requirements/base.in
-boto3==1.26.27
+boto3==1.26.58
     # via fs-s3fs
-botocore==1.29.27
+botocore==1.29.58
     # via
     #   boto3
     #   s3transfer
 certifi==2022.12.7
     # via requests
 chardet==5.1.0
     # via binaryornot
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
     # via requests
 click==8.1.3
     # via cookiecutter
@@ -34,18 +34,16 @@ django==3.2.16
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
-    #   django-pyfs
-django-pyfs==3.2.0
-    # via -r requirements/base.in
+    #   openedx-django-pyfs
 fs==2.4.16
     # via
-    #   django-pyfs
     #   fs-s3fs
+    #   openedx-django-pyfs
     #   xblock
 fs-s3fs==1.1.1
     # via
     #   -r requirements/base.in
-    #   django-pyfs
+    #   openedx-django-pyfs
 idna==3.4
     # via requests
 jinja2==3.1.2
@@ -59,15 +57,17 @@ jmespath==1.0.1
     #   boto3
     #   botocore
 lazy==1.5
-    # via -r requirements/base.in
-lxml==4.9.1
+    # via xblock
+lxml==4.9.2
     # via
     #   -r requirements/base.in
     #   xblock
-markupsafe==2.1.1
+markupsafe==2.1.2
     # via
     #   jinja2
     #   xblock
+openedx-django-pyfs==3.2.1
+    # via xblock
 pypng==0.20220715.0
     # via -r requirements/base.in
 python-dateutil==2.8.2
@@ -77,21 +77,21 @@ python-dateutil==2.8.2
     #   xblock
 python-slugify==7.0.0
     # via cookiecutter
-pytz==2022.6
+pytz==2022.7.1
     # via
     #   django
     #   xblock
 pyyaml==6.0
     # via
     #   cookiecutter
     #   xblock
-requests==2.28.1
+requests==2.28.2
     # via
     #   -r requirements/base.in
     #   cookiecutter
 s3transfer==0.6.0
     # via boto3
-simplejson==3.18.0
+simplejson==3.18.1
     # via -r requirements/base.in
 six==1.16.0
     # via
@@ -102,7 +102,7 @@ sqlparse==0.4.3
     # via django
 text-unidecode==1.3
     # via python-slugify
-urllib3==1.26.13
+urllib3==1.26.14
     # via
     #   botocore
     #   requests
@@ -114,7 +114,7 @@ webob==1.8.7
     # via
     #   -r requirements/base.in
     #   xblock
-xblock==1.6.1
+xblock[django]==1.6.2
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/ci.txt

@@ -6,42 +6,42 @@
 #
 certifi==2022.12.7
     # via requests
-charset-normalizer==2.1.1
+charset-normalizer==3.0.1
     # via requests
 codecov==2.1.12
     # via -r requirements/ci.in
-coverage==6.5.0
+coverage==7.1.0
     # via codecov
 distlib==0.3.6
     # via virtualenv
-filelock==3.8.2
+filelock==3.9.0
     # via
     #   tox
     #   virtualenv
 idna==3.4
     # via requests
-packaging==22.0
+packaging==23.0
     # via tox
-platformdirs==2.6.0
+platformdirs==2.6.2
     # via virtualenv
 pluggy==1.0.0
     # via tox
 py==1.11.0
     # via tox
-requests==2.28.1
+requests==2.28.2
     # via codecov
 six==1.16.0
     # via tox
 tomli==2.0.1
     # via tox
-tox==3.27.1
+tox==3.28.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/ci.in
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/ci.in
-urllib3==1.26.13
+urllib3==1.26.14
     # via requests
 virtualenv==20.17.1
     # via tox

requirements/common_constraints.txt

@@ -19,13 +19,14 @@ Django<4.0
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 elasticsearch<7.14.0
 
-# setuptools==60.0 had breaking changes and busted several service's pipeline.
-# Details can be found here: https://github.com/pypa/setuptools/issues/2940
-setuptools<60
-
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
 
 # tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
 # Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
 tox<4.0.0
+
+# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version 
+# Pinning Sphinx version unless the compatibility issue gets resolved
+# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
+sphinx<6.0.0