Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-consistent-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- uses: actions/setup-python@v6
if: ${{ env.RELEVANT == 'true' }}
with:
python-version: '3.11'
python-version: '3.12'

- name: "Recompile requirements"
if: ${{ env.RELEVANT == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
python-version:
- "3.11"
- "3.12"
os: ["ubuntu-24.04"]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile-python-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Python environment
uses: actions/setup-python@v6
with:
python-version: "3.11"
python-version: "3.12"

- name: Run make compile-requirements
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/js-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
os: [ubuntu-latest]
node-version: [20]
python-version:
- "3.11"
- "3.12"

steps:
- uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-imports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: "3.11"
python-version: "3.12"

- name: Install system requirements
run: sudo apt update && sudo apt install -y libxmlsec1-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/migrations-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-24.04]
python-version:
- "3.11"
- "3.12"
# 'pinned' is used to install the latest patch version of Django
# within the global constraint i.e. Django==4.2.8 in current case
# because we have global constraint of Django<4.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pylint-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
python-version: 3.11
python-version: 3.12

- name: Get pip cache dir
id: pip-cache-dir
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quality-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
os: [ubuntu-24.04]
python-version:
- "3.11"
- "3.12"
node-version: [20]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
os: ["ubuntu-latest"]
python-version:
- "3.11"
- "3.12"

steps:
- uses: actions/checkout@v6
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/static-assets-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [ubuntu-24.04]
python-version:
- "3.11"
- "3.12"
node-version: [20]
npm-version: [10.7.x]
mongo-version:
Expand Down Expand Up @@ -71,6 +71,13 @@ jobs:

- name: Install Limited Python Deps for Build
run: |
# Install pip-tools.txt first to pin setuptools<82 before installing
# assets.txt. setuptools 82+ removed pkg_resources, which pyfilesystem2
# (fs) still uses for namespace package declarations. The constraints.txt
# pin covers full installs, but this step only installs assets.txt so we
# pre-install pip-tools.txt to ensure setuptools 81.x is in place.
# See: https://github.com/PyFilesystem/pyfilesystem2/issues/577
pip install -r requirements/pip-tools.txt
pip install -r requirements/edx/assets.txt

- name: Add node_modules bin to $Path
Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
strategy:
matrix:
python-version:
- "3.11"
- "3.12"
django-version:
- "pinned"
Expand Down Expand Up @@ -57,18 +56,6 @@ jobs:
#
# We're testing the older version of Ubuntu and running the xmodule tests since those rely on many
# dependent complex libraries and will hopefully catch most issues quickly.
include:
- shard_name: "xmodule-with-cms"
python-version: "3.11"
django-version: "pinned"
mongo-version: "7.0"
os-version: "ubuntu-22.04"
- shard_name: "xmodule-with-lms"
python-version: "3.11"
django-version: "pinned"
mongo-version: "7.0"
os-version: "ubuntu-22.04"

steps:
- name: checkout repo
uses: actions/checkout@v6
Expand Down Expand Up @@ -156,7 +143,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v6
with:
python-version: 3.11
python-version: 3.12

- name: install system requirements
run: |
Expand Down Expand Up @@ -278,7 +265,7 @@ jobs:
strategy:
matrix:
python-version:
- 3.11
- 3.12
steps:
- name: Checkout repo
uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-one-python-dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Set up Python environment
uses: actions/setup-python@v6
with:
python-version: "3.11"
python-version: "3.12"

- name: Update any pinned dependencies
env:
Expand Down
6 changes: 4 additions & 2 deletions cms/envs/devstack.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,9 +344,11 @@ def should_show_debug_toolbar(request): # lint-amnesty, pylint: disable=missing
access token endpoint: `{LMS_ROOT_URL}/oauth2/access_token`.
Please see separately provided documentation.
\n - How to test: You must be logged in as course author for whatever course you want to test with.
You can use the [Swagger UI](https://{CMS_BASE}/authoring-api/ui/) to "Try out" the API with your test course. To do this, you must select the "Local" server.
You can use the [Swagger UI](https://{CMS_BASE}/authoring-api/ui/) to "Try out" the API
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for Reviews: Fix due to a newer version of pylint getting pulled in which is stricter about line lenght and better at detecting this violation.

with your test course. To do this, you must select the "Local" server.
\n - Public vs. Local servers: The "Public" server is where you can reach the API externally. The "Local" server is
for development with a local edx-platform version, and for use via the [Swagger UI](https://{CMS_BASE}/authoring-api/ui/).
for development with a local edx-platform version, and for use via the
[Swagger UI](https://{CMS_BASE}/authoring-api/ui/).
\n - Swaggerfile: [Download link](https://{CMS_BASE}/authoring-api/schema/)''',
'VERSION': '0.1.0',
'SERVE_INCLUDE_SCHEMA': False,
Expand Down
6 changes: 4 additions & 2 deletions cms/envs/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,11 @@ def get_env_setting(setting):
access token endpoint: `{LMS_ROOT_URL}/oauth2/access_token`.
Please see separately provided documentation.
\n - How to test: You must be logged in as course author for whatever course you want to test with.
You can use the [Swagger UI](https://{CMS_BASE}/authoring-api/ui/) to "Try out" the API with your test course. To do this, you must select the "Local" server.
You can use the [Swagger UI](https://{CMS_BASE}/authoring-api/ui/) to "Try out" the API
with your test course. To do this, you must select the "Local" server.
\n - Public vs. Local servers: The "Public" server is where you can reach the API externally. The "Local" server is
for development with a local edx-platform version, and for use via the [Swagger UI](https://{CMS_BASE}/authoring-api/ui/).
for development with a local edx-platform version, and for use via the
[Swagger UI](https://{CMS_BASE}/authoring-api/ui/).
\n - Swaggerfile: [Download link](https://{CMS_BASE}/authoring-api/schema/)''',
'VERSION': '0.1.0',
'SERVE_INCLUDE_SCHEMA': False,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,7 @@ def test_copy_container(self) -> None:
# Test the actual OLX in the clipboard:
olx_data = staging_api.get_staged_content_olx(clipboard_data.content.id)
assert olx_data is not None
# pylint: disable=line-too-long
assert olx_data == textwrap.dedent(f"""\
<chapter copied_from_block="{self.section_with_subsections["id"]}" copied_from_version="2" display_name="Section with subsections">
<sequential copied_from_block="{self.subsection["id"]}" copied_from_version="1" display_name="Subsection Alpha"/>
Expand All @@ -858,6 +859,7 @@ def test_copy_container(self) -> None:
<sequential copied_from_block="{self.subsection_3["id"]}" copied_from_version="1" display_name="Test Subsection 3"/>
</chapter>
""")
# pylint: enable=line-too-long

def test_publish_subsection(self) -> None:
"""
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "openedx-platform"
version = "0.13"
requires-python = ">=3.11"
requires-python = ">=3.12"
dependencies = ["setuptools"]

[tool.setuptools]
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx-sandbox/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/assets.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand Down
22 changes: 11 additions & 11 deletions requirements/edx/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
Expand Down Expand Up @@ -68,14 +68,14 @@ bleach[css]==6.3.0
# ora2
# xblock-drag-and-drop-v2
# xblock-poll
boto3==1.42.64
boto3==1.42.66
# via
# -r requirements/edx/kernel.in
# django-ses
# fs-s3fs
# ora2
# snowflake-connector-python
botocore==1.42.64
botocore==1.42.66
# via
# -r requirements/edx/kernel.in
# boto3
Expand Down Expand Up @@ -115,7 +115,7 @@ cffi==2.0.0
# via
# cryptography
# pynacl
chardet==7.0.1
chardet==7.1.0
# via pysrt
charset-normalizer==3.4.5
# via
Expand Down Expand Up @@ -417,7 +417,7 @@ edx-api-doc-tools==2.1.2
# via
# -r requirements/edx/kernel.in
# openedx-authz
edx-auth-backends==4.6.2
edx-auth-backends==5.0.0
# via -r requirements/edx/kernel.in
edx-bulk-grades==1.2.0
# via
Expand All @@ -443,7 +443,7 @@ edx-django-release-util==1.5.0
# -r requirements/edx/kernel.in
# edx-submissions
# edxval
edx-django-sites-extensions==5.1.0
edx-django-sites-extensions==6.0.0
# via -r requirements/edx/kernel.in
edx-django-utils==8.0.1
# via
Expand Down Expand Up @@ -484,7 +484,7 @@ edx-enterprise==6.6.9
# -r requirements/edx/kernel.in
edx-event-bus-kafka==6.1.0
# via -r requirements/edx/kernel.in
edx-event-bus-redis==0.6.1
edx-event-bus-redis==1.0.0
# via -r requirements/edx/kernel.in
edx-i18n-tools==2.0.0
# via
Expand Down Expand Up @@ -581,7 +581,7 @@ event-tracking==3.3.0
# edx-search
fastavro==1.12.1
# via openedx-events
filelock==3.25.1
filelock==3.25.2
# via snowflake-connector-python
firebase-admin==7.2.0
# via edx-ace
Expand Down Expand Up @@ -1110,7 +1110,7 @@ shapely==2.1.2
# via
# -r requirements/edx/kernel.in
# xblocks-contrib
simpleeval==1.0.3
simpleeval==1.0.4
# via pycasbin
simplejson==3.20.2
# via
Expand Down Expand Up @@ -1292,9 +1292,9 @@ xblock[django]==5.3.0
# xblock-google-drive
# xblock-utils
# xblocks-contrib
xblock-drag-and-drop-v2==5.0.3
xblock-drag-and-drop-v2==5.0.4
# via -r requirements/edx/bundled.in
xblock-google-drive==0.8.1
xblock-google-drive==0.8.2
# via -r requirements/edx/bundled.in
xblock-poll==1.15.1
# via -r requirements/edx/bundled.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/edx/coverage.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
#
chardet==7.0.1
chardet==7.1.0
# via diff-cover
coverage==7.13.4
# via -r requirements/edx/coverage.in
Expand Down
Loading
Loading