From 5fc862da99fa7f5b8ed1d8a97ccb99af7ade16de Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 20 Oct 2023 11:59:54 -0400 Subject: [PATCH 1/3] build: Fix docs build. The `os` setting is now required for builds. --- .readthedocs.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index e093fa93d..1d5323576 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -15,8 +15,13 @@ formats: - pdf - epub +# Set the version of python needed to build these docs. +build: + os: "ubuntu-22.04" + tools: + python: "3.8" + # Optionally set the version of Python and requirements required to build your docs python: - version: "3.8" install: - requirements: requirements/doc.txt From 970d1b84c02bedd4aef98ca03994b35407230b9f Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Fri, 20 Oct 2023 10:43:50 -0400 Subject: [PATCH 2/3] fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery --- requirements/ci.in | 1 - tox.ini | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/ci.in b/requirements/ci.in index 27583971e..e9e93799e 100644 --- a/requirements/ci.in +++ b/requirements/ci.in @@ -4,4 +4,3 @@ coverage # Code coverage reporting tox # Virtualenv management for tests -tox-battery # Makes tox aware of requirements file changes diff --git a/tox.ini b/tox.ini index be9dfe707..16ea4b3d3 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ commands = python -Wd -m pytest {posargs:xblock} python -m coverage xml mv coverage.xml {toxinidir} -whitelist_externals = +allowlist_externals = make mv From 5fa5c2e1a4054aca2f8681a2a3bc6a1bddfa2d4e Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sat, 21 Oct 2023 20:09:49 -0400 Subject: [PATCH 3/3] chore: Updating Python Requirements --- requirements/ci.txt | 3 --- requirements/dev.txt | 12 +++++------- requirements/django.txt | 6 +++--- requirements/doc.txt | 6 +++--- requirements/pip.txt | 2 +- requirements/test.txt | 8 ++++---- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 14f75ed54..ef65eb4d2 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -28,8 +28,5 @@ tox==3.28.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/ci.in - # tox-battery -tox-battery==0.6.2 - # via -r requirements/ci.in virtualenv==20.24.5 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 36b4af643..ffa46842a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -29,11 +29,11 @@ binaryornot==0.4.4 # via # -r requirements/test.txt # cookiecutter -boto3==1.28.63 +boto3==1.28.68 # via # -r requirements/test.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.68 # via # -r requirements/test.txt # boto3 @@ -79,6 +79,7 @@ coverage[toml]==7.3.2 # via # -r requirements/ci.txt # -r requirements/test.txt + # coverage # pytest-cov ddt==1.6.0 # via -r requirements/test.txt @@ -125,7 +126,7 @@ fs-s3fs==1.1.1 # -r requirements/test.txt # openedx-django-pyfs # xblock-sdk -hypothesis==6.87.4 +hypothesis==6.88.1 # via -r requirements/test.txt idna==3.4 # via @@ -372,9 +373,6 @@ tox==3.28.0 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/ci.txt # -r requirements/test.txt - # tox-battery -tox-battery==0.6.2 - # via -r requirements/ci.txt types-python-dateutil==2.8.19.14 # via # -r requirements/test.txt @@ -389,7 +387,7 @@ typing-extensions==4.8.0 # pydantic-core # pylint # rich -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/test.txt # botocore diff --git a/requirements/django.txt b/requirements/django.txt index ed1c87a34..7a4f7ed4a 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -boto3==1.28.63 +boto3==1.28.68 # via fs-s3fs -botocore==1.31.63 +botocore==1.31.68 # via # boto3 # s3transfer @@ -64,7 +64,7 @@ six==1.16.0 # python-dateutil sqlparse==0.4.4 # via django -urllib3==1.26.17 +urllib3==1.26.18 # via botocore web-fragments==2.1.0 # via -r requirements/base.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 8af8dec51..33581161c 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -18,11 +18,11 @@ babel==2.13.0 # sphinx beautifulsoup4==4.12.2 # via pydata-sphinx-theme -boto3==1.28.63 +boto3==1.28.68 # via # -r requirements/django.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.68 # via # -r requirements/django.txt # boto3 @@ -142,7 +142,7 @@ sqlparse==0.4.4 # django typing-extensions==4.8.0 # via pydata-sphinx-theme -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/django.txt # botocore diff --git a/requirements/pip.txt b/requirements/pip.txt index 3e7d8f4a8..0c788d61e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.41.2 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2.1 +pip==23.3.1 # via -r requirements/pip.in setuptools==68.2.2 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 90f156e47..8c9c61a43 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -21,11 +21,11 @@ attrs==23.1.0 # via hypothesis binaryornot==0.4.4 # via cookiecutter -boto3==1.28.63 +boto3==1.28.68 # via # -r requirements/django.txt # fs-s3fs -botocore==1.31.63 +botocore==1.31.68 # via # -r requirements/django.txt # boto3 @@ -88,7 +88,7 @@ fs-s3fs==1.1.1 # -r requirements/django.txt # openedx-django-pyfs # xblock-sdk -hypothesis==6.87.4 +hypothesis==6.88.1 # via -r requirements/test.in idna==3.4 # via requests @@ -272,7 +272,7 @@ typing-extensions==4.8.0 # pydantic-core # pylint # rich -urllib3==1.26.17 +urllib3==1.26.18 # via # -r requirements/django.txt # botocore