From 282a6341d3ad7eb1d22e8a569198db3e0ccd7363 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 20 Nov 2023 16:20:56 +0500 Subject: [PATCH 01/19] chore: checking python 3.9. --- .github/workflows/unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index c3b1086c20eb..5d6227d52bb8 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: python-version: - - "3.8" + - "3.9" django-version: - "pinned" - "4.2" @@ -128,7 +128,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ 3.8 ] + python-version: [ 3.9 ] steps: - name: Checkout repo uses: actions/checkout@v3 From f6c8731f00ccc70f14cd9f1389b2ccc1957646de Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 20 Nov 2023 16:28:31 +0500 Subject: [PATCH 02/19] chore: checking python 3.9. --- .github/workflows/check-consistent-dependencies.yml | 2 +- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/compile-python-requirements.yml | 2 +- .github/workflows/js-tests.yml | 2 +- .github/workflows/lint-imports.yml | 2 +- .github/workflows/migrations-check.yml | 8 ++++---- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/quality-checks.yml | 2 +- .github/workflows/semgrep.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests-gh-hosted.yml | 4 ++-- .github/workflows/upgrade-one-python-dependency.yml | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml index b2466b883070..caa8f0780892 100644 --- a/.github/workflows/check-consistent-dependencies.yml +++ b/.github/workflows/check-consistent-dependencies.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-python@v4 if: ${{ env.RELEVANT == 'true' }} with: - python-version: '3.8' + python-version: '3.9' - name: "Recompile requirements" if: ${{ env.RELEVANT == 'true' }} diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index dd21eb3cac53..375e65a6553d 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8'] + python-version: ['3.9'] os: ['ubuntu-20.04'] steps: diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml index 18e68aa0ad6a..e2633fde17e7 100644 --- a/.github/workflows/compile-python-requirements.yml +++ b/.github/workflows/compile-python-requirements.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.9" - name: Run make compile-requirements env: diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 2ca5f8d45e69..92bc708a5a0a 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ ubuntu-20.04 ] node-version: [ 16 ] - python-version: [ 3.8 ] + python-version: [ 3.9 ] steps: diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index 3bc7d2bf9d56..6dcece2ab2d1 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.9' - name: Install system requirements run: sudo apt update && sudo apt install -y libxmlsec1-dev diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index 3929e7f10e6f..86b194b8c673 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -14,14 +14,14 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.8 ] + python-version: [ 3.9 ] # 'pinned' is used to install the latest patch version of Django # within the global constraint i.e. Django==3.2.21 in current case - # because we have global constraint of Django<4.2 + # because we have global constraint of Django<4.2 django-version: ["pinned", "4.2"] mongo-version: ["4"] mysql-version: ["5.7", "8"] - # excluding mysql5.7 with Django 4.2 since Django 4.2 has + # excluding mysql5.7 with Django 4.2 since Django 4.2 has # dropped support for MySQL<8 exclude: - django-version: "4.2" @@ -120,7 +120,7 @@ jobs: ./manage.py lms migrate echo "Running the CMS migrations." ./manage.py cms migrate - + # This job aggregates test results. It's the required check for branch protection. # https://github.com/marketplace/actions/alls-green#why # https://github.com/orgs/community/discussions/33579 diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 840dc985e3c2..12358e7be95e 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.9 - name: Get pip cache dir id: pip-cache-dir diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index a5e65fb67e94..6e9b820ddb86 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.8 ] + python-version: [ 3.9 ] node-version: [ 16 ] steps: diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index f5ff2f63e5c8..24b71a8cba43 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [ "ubuntu-20.04" ] - python-version: [ "3.8" ] + python-version: [ "3.9" ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index 37c70a5c1362..d692ee7827d9 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.8 ] + python-version: [ 3.9 ] node-version: [ 16 ] npm-version: [ 8.5.x ] diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index 60dabbbecec8..f9a9f08439ed 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.8' ] + python-version: [ '3.9' ] django-version: - "pinned" # When updating the shards, remember to make the same changes in @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [ '3.8' ] + python-version: [ '3.9' ] django-version: - "pinned" steps: diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index dbc7eb94487a..d9fd90b425f5 100644 --- a/.github/workflows/upgrade-one-python-dependency.yml +++ b/.github/workflows/upgrade-one-python-dependency.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.9" - name: Update any pinned dependencies env: From 6dbc922869d779e6f4f09f00a83323c14f456126 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 20 Nov 2023 17:13:05 +0500 Subject: [PATCH 03/19] chore: checking python 3.10. --- .github/workflows/unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 5d6227d52bb8..1bb955c1ef8f 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: python-version: - - "3.9" + - "3.10" django-version: - "pinned" - "4.2" From 1daa2e732c8a9c0b9a12e6d12e23f29977a43b25 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 21 Nov 2023 13:34:55 +0500 Subject: [PATCH 04/19] chore: checking python 3.9. --- .github/workflows/check-consistent-dependencies.yml | 2 +- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/compile-python-requirements.yml | 2 +- .github/workflows/js-tests.yml | 2 +- .github/workflows/lint-imports.yml | 2 +- .github/workflows/migrations-check.yml | 2 +- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/quality-checks.yml | 2 +- .github/workflows/semgrep.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests-gh-hosted.yml | 4 ++-- .github/workflows/unit-tests.yml | 2 +- .github/workflows/upgrade-one-python-dependency.yml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml index caa8f0780892..eb3294116e6d 100644 --- a/.github/workflows/check-consistent-dependencies.yml +++ b/.github/workflows/check-consistent-dependencies.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-python@v4 if: ${{ env.RELEVANT == 'true' }} with: - python-version: '3.9' + python-version: '3.10' - name: "Recompile requirements" if: ${{ env.RELEVANT == 'true' }} diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index 375e65a6553d..e4c1a148ce65 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.9'] + python-version: ['3.10'] os: ['ubuntu-20.04'] steps: diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml index e2633fde17e7..a5bded492633 100644 --- a/.github/workflows/compile-python-requirements.yml +++ b/.github/workflows/compile-python-requirements.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Run make compile-requirements env: diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 92bc708a5a0a..3590a97fd67d 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ ubuntu-20.04 ] node-version: [ 16 ] - python-version: [ 3.9 ] + python-version: [ 3.10 ] steps: diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index 6dcece2ab2d1..d67dd609226b 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.10' - name: Install system requirements run: sudo apt update && sudo apt install -y libxmlsec1-dev diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index 86b194b8c673..a53f78c062e7 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.9 ] + python-version: [ 3.10 ] # 'pinned' is used to install the latest patch version of Django # within the global constraint i.e. Django==3.2.21 in current case # because we have global constraint of Django<4.2 diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 12358e7be95e..b0118512a4ca 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.9 + python-version: 3.10 - name: Get pip cache dir id: pip-cache-dir diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 6e9b820ddb86..1205666ca313 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.9 ] + python-version: [ 3.10 ] node-version: [ 16 ] steps: diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 24b71a8cba43..360da3249c85 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [ "ubuntu-20.04" ] - python-version: [ "3.9" ] + python-version: [ "3.10" ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index d692ee7827d9..e430c70ed258 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.9 ] + python-version: [ 3.10 ] node-version: [ 16 ] npm-version: [ 8.5.x ] diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index f9a9f08439ed..23f4d7668396 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.9' ] + python-version: [ '3.10' ] django-version: - "pinned" # When updating the shards, remember to make the same changes in @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [ '3.9' ] + python-version: [ '3.10' ] django-version: - "pinned" steps: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 1bb955c1ef8f..f9831ffe0a4d 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -128,7 +128,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ 3.9 ] + python-version: [ 3.10 ] steps: - name: Checkout repo uses: actions/checkout@v3 diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index d9fd90b425f5..67db9ebbae5a 100644 --- a/.github/workflows/upgrade-one-python-dependency.yml +++ b/.github/workflows/upgrade-one-python-dependency.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.10" - name: Update any pinned dependencies env: From 88c5a97e6c06aa30cc7a35ee8585d748c24e27a4 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 21 Nov 2023 13:44:38 +0500 Subject: [PATCH 05/19] chore: checking python 3.9. --- .github/workflows/migrations-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index a53f78c062e7..fc36ca049b35 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ 3.10 ] + python-version: [ '3.10' ] # 'pinned' is used to install the latest patch version of Django # within the global constraint i.e. Django==3.2.21 in current case # because we have global constraint of Django<4.2 From d0d83c6ff63f116eaf7f6a1642c42da6ead2f874 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 12 Jan 2024 17:19:13 +0500 Subject: [PATCH 06/19] chore: Update upgrade-python-requirements.yml --- .github/workflows/upgrade-python-requirements.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index fcacf81929af..56530997f46b 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -19,6 +19,7 @@ jobs: team_reviewers: "arbi-bom" email_address: arbi-bom@edx.org send_success_notification: false + python_version: '3.12' secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} From 2018821d78ff2509a242e02e3cf85633b9f483a2 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 12 Jan 2024 17:38:51 +0500 Subject: [PATCH 07/19] chore: Update upgrade-python-requirements.yml --- .github/workflows/upgrade-python-requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index 56530997f46b..c730f5b972f4 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -19,7 +19,7 @@ jobs: team_reviewers: "arbi-bom" email_address: arbi-bom@edx.org send_success_notification: false - python_version: '3.12' + python_version: '3.9' secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} From 37902a4effba45a674097dcea3eea7104b0a6634 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 12 Jan 2024 17:52:52 +0500 Subject: [PATCH 08/19] Update base.in --- requirements/edx/base.in | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index de968171d03f..6bf5a5fcca67 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -1,2 +1,3 @@ -r kernel.in # Core dependencies required for the platform to run. -r bundled.in # Additional packages usually bundled with the platform +backports.zoneinfo;python_version<"3.9" From 893fbc819fe842db8e95d14a0b2d1340e06d71bc Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Fri, 12 Jan 2024 17:57:24 +0500 Subject: [PATCH 09/19] Update upgrade-python-requirements.yml --- .github/workflows/upgrade-python-requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index c730f5b972f4..b10492ae6c0a 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -19,7 +19,7 @@ jobs: team_reviewers: "arbi-bom" email_address: arbi-bom@edx.org send_success_notification: false - python_version: '3.9' + python_version: '3.10' secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }} From 5d36fdef9c8800e7103de8a15dda9f4d4e947607 Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Fri, 12 Jan 2024 08:16:16 -0500 Subject: [PATCH 10/19] chore: Updating Python Requirements (#34045) --- requirements/edx/assets.txt | 2 +- requirements/edx/coverage.txt | 8 ++++---- requirements/edx/paver.txt | 7 +++---- scripts/xblock/requirements.txt | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/requirements/edx/assets.txt b/requirements/edx/assets.txt index bcac144e0edb..6f9ff484f328 100644 --- a/requirements/edx/assets.txt +++ b/requirements/edx/assets.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 6df26a54fda6..6b446423b258 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -1,16 +1,16 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade # chardet==5.2.0 # via diff-cover -coverage==7.3.2 +coverage==7.4.0 # via -r requirements/edx/coverage.in -diff-cover==8.0.1 +diff-cover==8.0.2 # via -r requirements/edx/coverage.in -jinja2==3.1.2 +jinja2==3.1.3 # via diff-cover markupsafe==2.1.3 # via jinja2 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 7db9d5ea4356..57bd85c813fa 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -30,7 +30,7 @@ paver==1.3.4 # via -r requirements/edx/paver.in pbr==6.0.0 # via stevedore -psutil==5.9.6 +psutil==5.9.7 # via -r requirements/edx/paver.in pymemcache==4.0.0 # via -r requirements/edx/paver.in @@ -39,7 +39,7 @@ pymongo==3.13.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/paver.in # edx-opaque-keys -python-memcached==1.59 +python-memcached==1.61 # via -r requirements/edx/paver.in requests==2.31.0 # via -r requirements/edx/paver.in @@ -47,7 +47,6 @@ six==1.16.0 # via # libsass # paver - # python-memcached stevedore==5.1.0 # via # -r requirements/edx/paver.in diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index db6e8f2f0b77..b05723d45e17 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade From 4ef266c9b70e269c3f57884bee9eee5f0f2c9b3a Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Fri, 12 Jan 2024 08:28:40 -0500 Subject: [PATCH 11/19] chore: Updating Python Requirements (#34046) --- requirements/edx-sandbox/py38.txt | 22 ++-- requirements/edx/base.txt | 93 ++++++---------- requirements/edx/development.txt | 177 ++++++++++++------------------ requirements/edx/doc.txt | 128 +++++++++------------ requirements/edx/semgrep.txt | 22 +--- requirements/edx/testing.txt | 140 +++++++++-------------- requirements/pip-tools.txt | 6 +- requirements/pip.txt | 6 +- 8 files changed, 222 insertions(+), 372 deletions(-) diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index 61dbc724bcc9..c8ad2eb22462 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -14,7 +14,7 @@ click==8.1.6 # nltk codejail-includes==1.0.0 # via -r requirements/edx-sandbox/py38.in -contourpy==1.1.1 +contourpy==1.2.0 # via matplotlib cryptography==38.0.4 # via @@ -22,15 +22,13 @@ cryptography==38.0.4 # -r requirements/edx-sandbox/py38.in cycler==0.12.1 # via matplotlib -fonttools==4.46.0 - # via matplotlib -importlib-resources==6.1.1 +fonttools==4.47.2 # via matplotlib joblib==1.3.2 # via nltk kiwisolver==1.4.5 # via matplotlib -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/edx-sandbox/py38.in # openedx-calc @@ -38,11 +36,11 @@ markupsafe==2.1.3 # via # chem # openedx-calc -matplotlib==3.7.4 +matplotlib==3.8.2 # via -r requirements/edx-sandbox/py38.in mpmath==1.3.0 # via sympy -networkx==3.1 +networkx==3.2.1 # via -r requirements/edx-sandbox/py38.in nltk==3.8.1 # via @@ -59,7 +57,7 @@ openedx-calc==3.0.1 # via -r requirements/edx-sandbox/py38.in packaging==23.2 # via matplotlib -pillow==10.1.0 +pillow==10.2.0 # via matplotlib pycparser==2.21 # via cffi @@ -71,9 +69,9 @@ pyparsing==3.1.1 # openedx-calc python-dateutil==2.8.2 # via matplotlib -random2==1.0.1 +random2==1.0.2 # via -r requirements/edx-sandbox/py38.in -regex==2023.10.3 +regex==2023.12.25 # via nltk scipy==1.7.3 # via @@ -92,5 +90,3 @@ sympy==1.12 # openedx-calc tqdm==4.66.1 # via nltk -zipp==3.17.0 - # via importlib-resources diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0a7979630521..8f369d829a51 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -35,7 +35,7 @@ async-timeout==4.0.3 # via # aiohttp # redis -attrs==23.1.0 +attrs==23.2.0 # via # -r requirements/edx/kernel.in # aiohttp @@ -53,11 +53,6 @@ babel==2.14.0 # enmerkar-underscore backoff==1.10.0 # via analytics-python -backports-zoneinfo[tzdata]==0.2.1 - # via - # celery - # icalendar - # kombu beautifulsoup4==4.12.2 # via pynliner billiard==4.2.0 @@ -73,13 +68,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -boto3==1.33.12 +boto3==1.34.17 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 -botocore==1.33.12 +botocore==1.34.17 # via # -r requirements/edx/kernel.in # boto3 @@ -283,12 +278,12 @@ django-filter==23.5 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.2 +django-ipware==6.0.3 # via # -r requirements/edx/kernel.in # edx-enterprise # edx-proctoring -django-js-asset==2.1.0 +django-js-asset==2.2.0 # via django-mptt django-method-override==1.0.4 # via -r requirements/edx/kernel.in @@ -310,7 +305,7 @@ django-model-utils==4.3.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.15.0 # via # -r requirements/edx/kernel.in # openedx-django-wiki @@ -325,7 +320,7 @@ django-oauth-toolkit==1.7.1 # edx-enterprise django-object-actions==4.2.0 # via edx-enterprise -django-pipeline==2.1.0 +django-pipeline==3.0.0 # via -r requirements/edx/kernel.in django-ratelimit==4.1.0 # via -r requirements/edx/kernel.in @@ -398,7 +393,7 @@ done-xblock==2.2.0 # via -r requirements/edx/bundled.in drf-jwt==1.19.2 # via edx-drf-extensions -drf-nested-routers==0.93.4 +drf-nested-routers==0.93.5 # via openedx-blockstore drf-spectacular==0.27.0 # via -r requirements/edx/kernel.in @@ -560,11 +555,11 @@ event-tracking==2.2.0 # edx-completion # edx-proctoring # edx-search -fastavro==1.9.1 +fastavro==1.9.3 # via openedx-events filelock==3.13.1 # via snowflake-connector-python -frozenlist==1.4.0 +frozenlist==1.4.1 # via # aiohttp # aiosignal @@ -601,13 +596,6 @@ idna==3.6 # requests # snowflake-connector-python # yarl -importlib-metadata==7.0.0 - # via markdown -importlib-resources==5.13.0 - # via - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # drf-spectacular @@ -620,7 +608,7 @@ isodate==0.6.1 # via python3-saml itypes==1.2.0 # via coreapi -jinja2==3.1.2 +jinja2==3.1.3 # via # code-annotations # coreschema @@ -645,9 +633,9 @@ jsonschema==4.20.0 # via # drf-spectacular # optimizely-sdk -jsonschema-specifications==2023.11.2 +jsonschema-specifications==2023.12.1 # via jsonschema -jwcrypto==1.5.0 +jwcrypto==1.5.1 # via # django-oauth-toolkit # pylti1p3 @@ -670,7 +658,7 @@ loremipsum==1.0.5 # via ora2 lti-consumer-xblock==9.8.1 # via -r requirements/edx/kernel.in -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/edx/kernel.in # edx-i18n-tools @@ -709,7 +697,7 @@ markupsafe==2.1.3 # mako # openedx-calc # xblock -maxminddb==2.5.1 +maxminddb==2.5.2 # via geoip2 mock==5.1.0 # via -r requirements/edx/paver.txt @@ -725,11 +713,11 @@ multidict==6.0.4 # via # aiohttp # yarl -mysqlclient==2.2.0 +mysqlclient==2.2.1 # via # -r requirements/edx/kernel.in # openedx-blockstore -newrelic==9.3.0 +newrelic==9.5.0 # via # -r requirements/edx/bundled.in # edx-django-utils @@ -762,7 +750,7 @@ openedx-blockstore==1.4.0 # via -r requirements/edx/kernel.in openedx-calc==3.0.1 # via -r requirements/edx/kernel.in -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.4.1 # via # lti-consumer-xblock # xblock @@ -818,21 +806,19 @@ pgpy==0.6.0 # via edx-enterprise piexif==1.1.3 # via -r requirements/edx/kernel.in -pillow==10.1.0 +pillow==10.2.0 # via # -r requirements/edx/kernel.in # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via jsonschema platformdirs==3.11.0 # via snowflake-connector-python polib==1.2.0 # via edx-i18n-tools -prompt-toolkit==3.0.42 +prompt-toolkit==3.0.43 # via click-repl -psutil==5.9.6 +psutil==5.9.7 # via # -r requirements/edx/paver.txt # edx-django-utils @@ -846,7 +832,7 @@ pycountry==23.12.11 # via -r requirements/edx/kernel.in pycparser==2.21 # via cffi -pycryptodomex==3.19.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/kernel.in # edx-proctoring @@ -919,9 +905,9 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.0 +python-ipware==2.0.1 # via django-ipware -python-memcached==1.59 +python-memcached==1.61 # via -r requirements/edx/paver.txt python-slugify==8.0.1 # via code-annotations @@ -936,7 +922,6 @@ python3-saml==1.16.0 pytz==2023.3.post1 # via # -r requirements/edx/kernel.in - # babel # django # django-ses # djangorestframework @@ -965,7 +950,7 @@ pyyaml==6.0.1 # edx-django-release-util # edx-i18n-tools # xblock -random2==1.0.1 +random2==1.0.2 # via -r requirements/edx/kernel.in recommender-xblock==2.0.1 # via -r requirements/edx/bundled.in @@ -973,11 +958,11 @@ redis==5.0.1 # via # -r requirements/edx/kernel.in # walrus -referencing==0.32.0 +referencing==0.32.1 # via # jsonschema # jsonschema-specifications -regex==2023.10.3 +regex==2023.12.25 # via nltk requests==2.31.0 # via @@ -1006,7 +991,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/edx/kernel.in # social-auth-core -rpds-py==0.13.2 +rpds-py==0.16.2 # via # jsonschema # referencing @@ -1020,7 +1005,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.8.2 +s3transfer==0.10.0 # via boto3 sailthru-client==2.2.3 # via edx-ace @@ -1069,7 +1054,6 @@ six==1.16.0 # py2neo # pyjwkest # python-dateutil - # python-memcached slumber==0.7.1 # via # -r requirements/edx/kernel.in @@ -1136,15 +1120,11 @@ typing-extensions==4.9.0 # -r requirements/edx/paver.txt # asgiref # django-countries - # drf-spectacular # edx-opaque-keys - # kombu # pylti1p3 # snowflake-connector-python -tzdata==2023.3 - # via - # backports-zoneinfo - # celery +tzdata==2023.4 + # via celery unicodecsv==0.14.1 # via # -r requirements/edx/kernel.in @@ -1162,7 +1142,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.0.0 # via -r requirements/edx/kernel.in vine==5.1.0 @@ -1176,7 +1155,7 @@ walrus==0.9.3 # via edx-event-bus-redis watchdog==3.0.0 # via -r requirements/edx/paver.txt -wcwidth==0.2.12 +wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.1.0 # via @@ -1199,7 +1178,7 @@ wrapt==1.16.0 # via # -r requirements/edx/paver.txt # deprecated -xblock[django]==1.8.1 +xblock[django]==1.9.1 # via # -r requirements/edx/kernel.in # acid-xblock @@ -1231,10 +1210,6 @@ xss-utils==0.5.0 # via -r requirements/edx/kernel.in yarl==1.9.4 # via aiohttp -zipp==3.17.0 - # via - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index df63fe4ee63b..d4875a4b5a4f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -27,7 +27,7 @@ aiosignal==1.3.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # aiohttp -alabaster==0.7.13 +alabaster==0.7.16 # via # -r requirements/edx/doc.txt # sphinx @@ -53,10 +53,9 @@ annotated-types==0.6.0 # via # -r requirements/edx/testing.txt # pydantic -anyio==3.7.1 +anyio==4.2.0 # via # -r requirements/edx/testing.txt - # fastapi # starlette appdirs==1.4.4 # via @@ -86,7 +85,7 @@ async-timeout==4.0.3 # -r requirements/edx/testing.txt # aiohttp # redis -attrs==23.1.0 +attrs==23.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -111,14 +110,6 @@ backoff==1.10.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # backports-zoneinfo - # celery - # icalendar - # kombu beautifulsoup4==4.12.2 # via # -r requirements/edx/doc.txt @@ -145,14 +136,14 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -boto3==1.33.12 +boto3==1.34.17 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-ses # fs-s3fs # ora2 -botocore==1.33.12 +botocore==1.34.17 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -281,7 +272,7 @@ coreschema==0.0.4 # -r requirements/edx/testing.txt # coreapi # drf-yasg -coverage[toml]==7.3.2 +coverage[toml]==7.4.0 # via # -r requirements/edx/testing.txt # coverage @@ -313,9 +304,9 @@ cssutils==2.9.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pynliner -ddt==1.7.0 +ddt==1.7.1 # via -r requirements/edx/testing.txt -deepmerge==1.1.0 +deepmerge==1.1.1 # via # -r requirements/edx/doc.txt # sphinxcontrib-openapi @@ -332,7 +323,7 @@ deprecated==1.2.14 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # jwcrypto -diff-cover==8.0.1 +diff-cover==8.0.2 # via -r requirements/edx/testing.txt dill==0.3.7 # via @@ -481,13 +472,13 @@ django-filter==23.5 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.2 +django-ipware==6.0.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise # edx-proctoring -django-js-asset==2.1.0 +django-js-asset==2.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -515,7 +506,7 @@ django-model-utils==4.3.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.15.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -540,7 +531,7 @@ django-object-actions==4.2.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -django-pipeline==2.1.0 +django-pipeline==3.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -640,7 +631,7 @@ djangorestframework-xml==2.0.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise -docutils==0.19 +docutils==0.20.1 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme @@ -655,7 +646,7 @@ drf-jwt==1.19.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-drf-extensions -drf-nested-routers==0.93.4 +drf-nested-routers==0.93.5 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -896,15 +887,15 @@ execnet==2.0.2 # pytest-xdist factory-boy==3.3.0 # via -r requirements/edx/testing.txt -faker==20.1.0 +faker==22.2.0 # via # -r requirements/edx/testing.txt # factory-boy -fastapi==0.105.0 +fastapi==0.109.0 # via # -r requirements/edx/testing.txt # pact-python -fastavro==1.9.1 +fastavro==1.9.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -916,9 +907,9 @@ filelock==3.13.1 # snowflake-connector-python # tox # virtualenv -freezegun==1.3.1 +freezegun==1.4.0 # via -r requirements/edx/testing.txt -frozenlist==1.4.0 +frozenlist==1.4.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -949,13 +940,13 @@ gitdb==4.0.11 # via # -r requirements/edx/doc.txt # gitpython -gitpython==3.1.40 +gitpython==3.1.41 # via -r requirements/edx/doc.txt glob2==0.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -grimp==3.1 +grimp==3.2 # via # -r requirements/edx/testing.txt # import-linter @@ -995,24 +986,8 @@ imagesize==1.4.1 # via # -r requirements/edx/doc.txt # sphinx -import-linter==1.12.1 +import-linter==2.0 # via -r requirements/edx/testing.txt -importlib-metadata==7.0.0 - # via - # -r requirements/edx/../pip-tools.txt - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # build - # markdown - # pytest-randomly - # sphinx -importlib-resources==5.13.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # -r requirements/edx/doc.txt @@ -1037,7 +1012,7 @@ isodate==0.6.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # python3-saml -isort==5.13.1 +isort==5.13.2 # via # -r requirements/edx/testing.txt # pylint @@ -1046,7 +1021,7 @@ itypes==1.2.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # coreapi -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1087,12 +1062,12 @@ jsonschema==4.20.0 # drf-spectacular # optimizely-sdk # sphinxcontrib-openapi -jsonschema-specifications==2023.11.2 +jsonschema-specifications==2023.12.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # jsonschema -jwcrypto==1.5.0 +jwcrypto==1.5.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1115,7 +1090,7 @@ lazy==1.6 # lti-consumer-xblock # ora2 # xblock -lazy-object-proxy==1.9.0 +lazy-object-proxy==1.10.0 # via # -r requirements/edx/testing.txt # astroid @@ -1134,7 +1109,7 @@ lti-consumer-xblock==9.8.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1183,7 +1158,7 @@ markupsafe==2.1.3 # mako # openedx-calc # xblock -maxminddb==2.5.1 +maxminddb==2.5.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1221,19 +1196,19 @@ multidict==6.0.4 # -r requirements/edx/testing.txt # aiohttp # yarl -mypy==1.7.1 +mypy==1.8.0 # via # -r requirements/edx/development.in # django-stubs # djangorestframework-stubs mypy-extensions==1.0.0 # via mypy -mysqlclient==2.2.0 +mysqlclient==2.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-blockstore -newrelic==9.3.0 +newrelic==9.5.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1286,7 +1261,7 @@ openedx-calc==3.0.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.4.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1385,7 +1360,7 @@ piexif==1.1.3 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pillow==10.1.0 +pillow==10.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1394,11 +1369,6 @@ pillow==10.1.0 # edxval pip-tools==7.3.0 # via -r requirements/edx/../pip-tools.txt -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # jsonschema platformdirs==3.11.0 # via # -r requirements/edx/doc.txt @@ -1418,12 +1388,12 @@ polib==1.2.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-i18n-tools -prompt-toolkit==3.0.42 +prompt-toolkit==3.0.43 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # click-repl -psutil==5.9.6 +psutil==5.9.7 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1455,22 +1425,22 @@ pycparser==2.21 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # cffi -pycryptodomex==3.19.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.5.2 +pydantic==2.5.3 # via # -r requirements/edx/testing.txt # fastapi -pydantic-core==2.14.5 +pydantic-core==2.14.6 # via # -r requirements/edx/testing.txt # pydantic -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.1 # via # -r requirements/edx/doc.txt # sphinx-book-theme @@ -1591,7 +1561,7 @@ pysrt==1.1.2 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edxval -pytest==7.4.3 +pytest==7.4.4 # via # -r requirements/edx/testing.txt # pylint-pytest @@ -1636,12 +1606,12 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.0 +python-ipware==2.0.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-ipware -python-memcached==1.59 +python-memcached==1.61 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1668,7 +1638,6 @@ pytz==2023.3.post1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # babel # django # django-ses # djangorestframework @@ -1703,7 +1672,7 @@ pyyaml==6.0.1 # edx-i18n-tools # sphinxcontrib-openapi # xblock -random2==1.0.1 +random2==1.0.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1716,13 +1685,13 @@ redis==5.0.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # walrus -referencing==0.32.0 +referencing==0.32.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # jsonschema # jsonschema-specifications -regex==2023.10.3 +regex==2023.12.25 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1759,7 +1728,7 @@ requests-oauthlib==1.3.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # social-auth-core -rpds-py==0.13.2 +rpds-py==0.16.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1782,7 +1751,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.8.2 +s3transfer==0.10.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1850,7 +1819,6 @@ six==1.16.0 # py2neo # pyjwkest # python-dateutil - # python-memcached # sphinxcontrib-httpdomain slumber==0.7.1 # via @@ -1904,17 +1872,22 @@ soupsieve==2.5 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==7.2.6 # via # -r requirements/edx/doc.txt # pydata-sphinx-theme # sphinx-book-theme # sphinx-design # sphinx-reredirects + # sphinxcontrib-applehelp + # sphinxcontrib-devhelp + # sphinxcontrib-htmlhelp # sphinxcontrib-httpdomain # sphinxcontrib-openapi + # sphinxcontrib-qthelp + # sphinxcontrib-serializinghtml # sphinxext-rediraffe -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.0 # via -r requirements/edx/doc.txt sphinx-design==0.5.0 # via -r requirements/edx/doc.txt @@ -1924,15 +1897,15 @@ sphinx-mdinclude==0.5.3 # sphinxcontrib-openapi sphinx-reredirects==0.1.3 # via -r requirements/edx/doc.txt -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.7 # via # -r requirements/edx/doc.txt # sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.5 # via # -r requirements/edx/doc.txt # sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.4 # via # -r requirements/edx/doc.txt # sphinx @@ -1948,11 +1921,11 @@ sphinxcontrib-openapi[markdown]==0.8.3 # via # -r requirements/edx/doc.txt # sphinxcontrib-openapi -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.6 # via # -r requirements/edx/doc.txt # sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.9 # via # -r requirements/edx/doc.txt # sphinx @@ -1969,7 +1942,7 @@ staff-graded-xblock==2.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -starlette==0.27.0 +starlette==0.35.1 # via # -r requirements/edx/testing.txt # fastapi @@ -2052,34 +2025,28 @@ typing-extensions==4.9.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # annotated-types + # anyio # asgiref # astroid # django-countries # django-stubs # django-stubs-ext # djangorestframework-stubs - # drf-spectacular # edx-opaque-keys - # faker # fastapi # grimp # import-linter - # kombu # mypy # pydantic # pydantic-core # pydata-sphinx-theme - # pylint # pylti1p3 # snowflake-connector-python - # starlette # uvicorn -tzdata==2023.3 +tzdata==2023.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -2104,12 +2071,11 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -uvicorn==0.24.0.post1 +uvicorn==0.25.0 # via # -r requirements/edx/testing.txt # pact-python @@ -2141,7 +2107,7 @@ watchdog==3.0.0 # -r requirements/edx/development.in # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -wcwidth==0.2.12 +wcwidth==0.2.13 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2177,7 +2143,7 @@ wrapt==1.16.0 # -r requirements/edx/testing.txt # astroid # deprecated -xblock[django]==1.8.1 +xblock[django]==1.9.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2227,13 +2193,6 @@ yarl==1.9.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # aiohttp -zipp==3.17.0 - # via - # -r requirements/edx/../pip-tools.txt - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 4d880f8f9d2d..46c209077422 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -19,7 +19,7 @@ aiosignal==1.3.1 # via # -r requirements/edx/base.txt # aiohttp -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx algoliasearch==3.0.0 # via -r requirements/edx/base.txt @@ -52,7 +52,7 @@ async-timeout==4.0.3 # -r requirements/edx/base.txt # aiohttp # redis -attrs==23.1.0 +attrs==23.2.0 # via # -r requirements/edx/base.txt # aiohttp @@ -74,13 +74,6 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/edx/base.txt - # backports-zoneinfo - # celery - # icalendar - # kombu beautifulsoup4==4.12.2 # via # -r requirements/edx/base.txt @@ -102,13 +95,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.33.12 +boto3==1.34.17 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.33.12 +botocore==1.34.17 # via # -r requirements/edx/base.txt # boto3 @@ -210,7 +203,7 @@ cssutils==2.9.0 # via # -r requirements/edx/base.txt # pynliner -deepmerge==1.1.0 +deepmerge==1.1.1 # via sphinxcontrib-openapi defusedxml==0.7.1 # via @@ -343,12 +336,12 @@ django-filter==23.5 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.2 +django-ipware==6.0.3 # via # -r requirements/edx/base.txt # edx-enterprise # edx-proctoring -django-js-asset==2.1.0 +django-js-asset==2.2.0 # via # -r requirements/edx/base.txt # django-mptt @@ -372,7 +365,7 @@ django-model-utils==4.3.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.15.0 # via # -r requirements/edx/base.txt # openedx-django-wiki @@ -391,7 +384,7 @@ django-object-actions==4.2.0 # via # -r requirements/edx/base.txt # edx-enterprise -django-pipeline==2.1.0 +django-pipeline==3.0.0 # via -r requirements/edx/base.txt django-ratelimit==4.1.0 # via -r requirements/edx/base.txt @@ -462,7 +455,7 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise -docutils==0.19 +docutils==0.20.1 # via # pydata-sphinx-theme # sphinx @@ -473,7 +466,7 @@ drf-jwt==1.19.2 # via # -r requirements/edx/base.txt # edx-drf-extensions -drf-nested-routers==0.93.4 +drf-nested-routers==0.93.5 # via # -r requirements/edx/base.txt # openedx-blockstore @@ -647,7 +640,7 @@ event-tracking==2.2.0 # edx-completion # edx-proctoring # edx-search -fastavro==1.9.1 +fastavro==1.9.3 # via # -r requirements/edx/base.txt # openedx-events @@ -655,7 +648,7 @@ filelock==3.13.1 # via # -r requirements/edx/base.txt # snowflake-connector-python -frozenlist==1.4.0 +frozenlist==1.4.1 # via # -r requirements/edx/base.txt # aiohttp @@ -678,7 +671,7 @@ geoip2==4.8.0 # via -r requirements/edx/base.txt gitdb==4.0.11 # via gitpython -gitpython==3.1.40 +gitpython==3.1.41 # via -r requirements/edx/doc.in glob2==0.7 # via -r requirements/edx/base.txt @@ -701,17 +694,6 @@ idna==3.6 # yarl imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.0 - # via - # -r requirements/edx/base.txt - # markdown - # sphinx -importlib-resources==5.13.0 - # via - # -r requirements/edx/base.txt - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -731,7 +713,7 @@ itypes==1.2.0 # via # -r requirements/edx/base.txt # coreapi -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements/edx/base.txt # code-annotations @@ -765,11 +747,11 @@ jsonschema==4.20.0 # drf-spectacular # optimizely-sdk # sphinxcontrib-openapi -jsonschema-specifications==2023.11.2 +jsonschema-specifications==2023.12.1 # via # -r requirements/edx/base.txt # jsonschema -jwcrypto==1.5.0 +jwcrypto==1.5.1 # via # -r requirements/edx/base.txt # django-oauth-toolkit @@ -797,7 +779,7 @@ loremipsum==1.0.5 # ora2 lti-consumer-xblock==9.8.1 # via -r requirements/edx/base.txt -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/edx/base.txt # edx-i18n-tools @@ -838,7 +820,7 @@ markupsafe==2.1.3 # mako # openedx-calc # xblock -maxminddb==2.5.1 +maxminddb==2.5.2 # via # -r requirements/edx/base.txt # geoip2 @@ -862,11 +844,11 @@ multidict==6.0.4 # -r requirements/edx/base.txt # aiohttp # yarl -mysqlclient==2.2.0 +mysqlclient==2.2.1 # via # -r requirements/edx/base.txt # openedx-blockstore -newrelic==9.3.0 +newrelic==9.5.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -903,7 +885,7 @@ openedx-blockstore==1.4.0 # via -r requirements/edx/base.txt openedx-calc==3.0.1 # via -r requirements/edx/base.txt -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.4.1 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -969,16 +951,12 @@ picobox==4.0.0 # via sphinxcontrib-openapi piexif==1.1.3 # via -r requirements/edx/base.txt -pillow==10.1.0 +pillow==10.2.0 # via # -r requirements/edx/base.txt # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/base.txt - # jsonschema platformdirs==3.11.0 # via # -r requirements/edx/base.txt @@ -987,11 +965,11 @@ polib==1.2.0 # via # -r requirements/edx/base.txt # edx-i18n-tools -prompt-toolkit==3.0.42 +prompt-toolkit==3.0.43 # via # -r requirements/edx/base.txt # click-repl -psutil==5.9.6 +psutil==5.9.7 # via # -r requirements/edx/base.txt # edx-django-utils @@ -1009,13 +987,13 @@ pycparser==2.21 # via # -r requirements/edx/base.txt # cffi -pycryptodomex==3.19.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/base.txt # edx-proctoring # lti-consumer-xblock # pyjwkest -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.1 # via sphinx-book-theme pygments==2.17.2 # via @@ -1096,11 +1074,11 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.0 +python-ipware==2.0.1 # via # -r requirements/edx/base.txt # django-ipware -python-memcached==1.59 +python-memcached==1.61 # via -r requirements/edx/base.txt python-slugify==8.0.1 # via @@ -1119,7 +1097,6 @@ python3-saml==1.16.0 pytz==2023.3.post1 # via # -r requirements/edx/base.txt - # babel # django # django-ses # djangorestframework @@ -1149,7 +1126,7 @@ pyyaml==6.0.1 # edx-i18n-tools # sphinxcontrib-openapi # xblock -random2==1.0.1 +random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.0.1 # via -r requirements/edx/base.txt @@ -1157,12 +1134,12 @@ redis==5.0.1 # via # -r requirements/edx/base.txt # walrus -referencing==0.32.0 +referencing==0.32.1 # via # -r requirements/edx/base.txt # jsonschema # jsonschema-specifications -regex==2023.10.3 +regex==2023.12.25 # via # -r requirements/edx/base.txt # nltk @@ -1194,7 +1171,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/edx/base.txt # social-auth-core -rpds-py==0.13.2 +rpds-py==0.16.2 # via # -r requirements/edx/base.txt # jsonschema @@ -1213,7 +1190,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.8.2 +s3transfer==0.10.0 # via # -r requirements/edx/base.txt # boto3 @@ -1268,7 +1245,6 @@ six==1.16.0 # py2neo # pyjwkest # python-dateutil - # python-memcached # sphinxcontrib-httpdomain slumber==0.7.1 # via @@ -1307,17 +1283,22 @@ soupsieve==2.5 # via # -r requirements/edx/base.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==7.2.6 # via # -r requirements/edx/doc.in # pydata-sphinx-theme # sphinx-book-theme # sphinx-design # sphinx-reredirects + # sphinxcontrib-applehelp + # sphinxcontrib-devhelp + # sphinxcontrib-htmlhelp # sphinxcontrib-httpdomain # sphinxcontrib-openapi + # sphinxcontrib-qthelp + # sphinxcontrib-serializinghtml # sphinxext-rediraffe -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.0 # via -r requirements/edx/doc.in sphinx-design==0.5.0 # via -r requirements/edx/doc.in @@ -1325,11 +1306,11 @@ sphinx-mdinclude==0.5.3 # via sphinxcontrib-openapi sphinx-reredirects==0.1.3 # via -r requirements/edx/doc.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.7 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.5 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.4 # via sphinx sphinxcontrib-httpdomain==1.8.1 # via sphinxcontrib-openapi @@ -1337,9 +1318,9 @@ sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-openapi[markdown]==0.8.3 # via -r requirements/edx/doc.in -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.6 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.9 # via sphinx sphinxext-rediraffe==0.2.7 # via -r requirements/edx/doc.in @@ -1392,16 +1373,13 @@ typing-extensions==4.9.0 # -r requirements/edx/base.txt # asgiref # django-countries - # drf-spectacular # edx-opaque-keys - # kombu # pydata-sphinx-theme # pylti1p3 # snowflake-connector-python -tzdata==2023.3 +tzdata==2023.4 # via # -r requirements/edx/base.txt - # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -1421,7 +1399,6 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.0.0 # via -r requirements/edx/base.txt vine==5.1.0 @@ -1440,7 +1417,7 @@ walrus==0.9.3 # edx-event-bus-redis watchdog==3.0.0 # via -r requirements/edx/base.txt -wcwidth==0.2.12 +wcwidth==0.2.13 # via # -r requirements/edx/base.txt # prompt-toolkit @@ -1466,7 +1443,7 @@ wrapt==1.16.0 # via # -r requirements/edx/base.txt # deprecated -xblock[django]==1.8.1 +xblock[django]==1.9.1 # via # -r requirements/edx/base.txt # acid-xblock @@ -1504,11 +1481,6 @@ yarl==1.9.4 # via # -r requirements/edx/base.txt # aiohttp -zipp==3.17.0 - # via - # -r requirements/edx/base.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index 1d4715a2ed7d..87782d647ed9 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -1,10 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade # -attrs==23.1.0 +attrs==23.2.0 # via # glom # jsonschema @@ -40,13 +40,9 @@ glom==22.1.0 # via semgrep idna==3.6 # via requests -importlib-resources==6.1.1 - # via - # jsonschema - # jsonschema-specifications jsonschema==4.20.0 # via semgrep -jsonschema-specifications==2023.11.2 +jsonschema-specifications==2023.12.1 # via jsonschema markdown-it-py==3.0.0 # via rich @@ -56,11 +52,9 @@ packaging==23.2 # via semgrep peewee==3.17.0 # via semgrep -pkgutil-resolve-name==1.3.10 - # via jsonschema pygments==2.17.2 # via rich -referencing==0.32.0 +referencing==0.32.1 # via # jsonschema # jsonschema-specifications @@ -68,7 +62,7 @@ requests==2.31.0 # via semgrep rich==13.7.0 # via semgrep -rpds-py==0.13.2 +rpds-py==0.16.2 # via # jsonschema # referencing @@ -81,9 +75,7 @@ semgrep==1.52.0 tomli==2.0.1 # via semgrep typing-extensions==4.9.0 - # via - # rich - # semgrep + # via semgrep urllib3==1.26.18 # via # -c requirements/edx/../constraints.txt @@ -91,5 +83,3 @@ urllib3==1.26.18 # semgrep wcmatch==8.5 # via semgrep -zipp==3.17.0 - # via importlib-resources diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 2b321570bd68..d3f985f6befd 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -31,10 +31,8 @@ aniso8601==9.0.1 # edx-tincan-py35 annotated-types==0.6.0 # via pydantic -anyio==3.7.1 - # via - # fastapi - # starlette +anyio==4.2.0 + # via starlette appdirs==1.4.4 # via # -r requirements/edx/base.txt @@ -58,7 +56,7 @@ async-timeout==4.0.3 # -r requirements/edx/base.txt # aiohttp # redis -attrs==23.1.0 +attrs==23.2.0 # via # -r requirements/edx/base.txt # aiohttp @@ -78,13 +76,6 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 - # via - # -r requirements/edx/base.txt - # backports-zoneinfo - # celery - # icalendar - # kombu beautifulsoup4==4.12.2 # via # -r requirements/edx/base.txt @@ -106,13 +97,13 @@ bleach[css]==6.1.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.33.12 +boto3==1.34.17 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 -botocore==1.33.12 +botocore==1.34.17 # via # -r requirements/edx/base.txt # boto3 @@ -210,7 +201,7 @@ coreschema==0.0.4 # -r requirements/edx/base.txt # coreapi # drf-yasg -coverage[toml]==7.3.2 +coverage[toml]==7.4.0 # via # -r requirements/edx/coverage.txt # pytest-cov @@ -237,7 +228,7 @@ cssutils==2.9.0 # via # -r requirements/edx/base.txt # pynliner -ddt==1.7.0 +ddt==1.7.1 # via -r requirements/edx/testing.in defusedxml==0.7.1 # via @@ -250,7 +241,7 @@ deprecated==1.2.14 # via # -r requirements/edx/base.txt # jwcrypto -diff-cover==8.0.1 +diff-cover==8.0.2 # via -r requirements/edx/coverage.txt dill==0.3.7 # via pylint @@ -376,12 +367,12 @@ django-filter==23.5 # edx-enterprise # lti-consumer-xblock # openedx-blockstore -django-ipware==6.0.2 +django-ipware==6.0.3 # via # -r requirements/edx/base.txt # edx-enterprise # edx-proctoring -django-js-asset==2.1.0 +django-js-asset==2.2.0 # via # -r requirements/edx/base.txt # django-mptt @@ -405,7 +396,7 @@ django-model-utils==4.3.1 # edxval # ora2 # super-csv -django-mptt==0.14.0 +django-mptt==0.15.0 # via # -r requirements/edx/base.txt # openedx-django-wiki @@ -424,7 +415,7 @@ django-object-actions==4.2.0 # via # -r requirements/edx/base.txt # edx-enterprise -django-pipeline==2.1.0 +django-pipeline==3.0.0 # via -r requirements/edx/base.txt django-ratelimit==4.1.0 # via -r requirements/edx/base.txt @@ -501,7 +492,7 @@ drf-jwt==1.19.2 # via # -r requirements/edx/base.txt # edx-drf-extensions -drf-nested-routers==0.93.4 +drf-nested-routers==0.93.5 # via # -r requirements/edx/base.txt # openedx-blockstore @@ -686,11 +677,11 @@ execnet==2.0.2 # via pytest-xdist factory-boy==3.3.0 # via -r requirements/edx/testing.in -faker==20.1.0 +faker==22.2.0 # via factory-boy -fastapi==0.105.0 +fastapi==0.109.0 # via pact-python -fastavro==1.9.1 +fastavro==1.9.3 # via # -r requirements/edx/base.txt # openedx-events @@ -700,9 +691,9 @@ filelock==3.13.1 # snowflake-connector-python # tox # virtualenv -freezegun==1.3.1 +freezegun==1.4.0 # via -r requirements/edx/testing.in -frozenlist==1.4.0 +frozenlist==1.4.1 # via # -r requirements/edx/base.txt # aiohttp @@ -725,7 +716,7 @@ geoip2==4.8.0 # via -r requirements/edx/base.txt glob2==0.7 # via -r requirements/edx/base.txt -grimp==3.1 +grimp==3.2 # via import-linter gunicorn==21.2.0 # via -r requirements/edx/base.txt @@ -749,19 +740,8 @@ idna==3.6 # requests # snowflake-connector-python # yarl -import-linter==1.12.1 +import-linter==2.0 # via -r requirements/edx/testing.in -importlib-metadata==7.0.0 - # via - # -r requirements/edx/base.txt - # markdown - # pytest-randomly -importlib-resources==5.13.0 - # via - # -r requirements/edx/base.txt - # jsonschema - # jsonschema-specifications - # pycountry inflection==0.5.1 # via # -r requirements/edx/base.txt @@ -779,7 +759,7 @@ isodate==0.6.1 # via # -r requirements/edx/base.txt # python3-saml -isort==5.13.1 +isort==5.13.2 # via # -r requirements/edx/testing.in # pylint @@ -787,7 +767,7 @@ itypes==1.2.0 # via # -r requirements/edx/base.txt # coreapi -jinja2==3.1.2 +jinja2==3.1.3 # via # -r requirements/edx/base.txt # -r requirements/edx/coverage.txt @@ -821,11 +801,11 @@ jsonschema==4.20.0 # -r requirements/edx/base.txt # drf-spectacular # optimizely-sdk -jsonschema-specifications==2023.11.2 +jsonschema-specifications==2023.12.1 # via # -r requirements/edx/base.txt # jsonschema -jwcrypto==1.5.0 +jwcrypto==1.5.1 # via # -r requirements/edx/base.txt # django-oauth-toolkit @@ -843,7 +823,7 @@ lazy==1.6 # lti-consumer-xblock # ora2 # xblock -lazy-object-proxy==1.9.0 +lazy-object-proxy==1.10.0 # via astroid libsass==0.10.0 # via @@ -855,7 +835,7 @@ loremipsum==1.0.5 # ora2 lti-consumer-xblock==9.8.1 # via -r requirements/edx/base.txt -lxml==4.9.3 +lxml==5.1.0 # via # -r requirements/edx/base.txt # edx-i18n-tools @@ -898,7 +878,7 @@ markupsafe==2.1.3 # mako # openedx-calc # xblock -maxminddb==2.5.1 +maxminddb==2.5.2 # via # -r requirements/edx/base.txt # geoip2 @@ -922,11 +902,11 @@ multidict==6.0.4 # -r requirements/edx/base.txt # aiohttp # yarl -mysqlclient==2.2.0 +mysqlclient==2.2.1 # via # -r requirements/edx/base.txt # openedx-blockstore -newrelic==9.3.0 +newrelic==9.5.0 # via # -r requirements/edx/base.txt # edx-django-utils @@ -963,7 +943,7 @@ openedx-blockstore==1.4.0 # via -r requirements/edx/base.txt openedx-calc==3.0.1 # via -r requirements/edx/base.txt -openedx-django-pyfs==3.4.0 +openedx-django-pyfs==3.4.1 # via # -r requirements/edx/base.txt # lti-consumer-xblock @@ -1030,16 +1010,12 @@ pgpy==0.6.0 # edx-enterprise piexif==1.1.3 # via -r requirements/edx/base.txt -pillow==10.1.0 +pillow==10.2.0 # via # -r requirements/edx/base.txt # edx-enterprise # edx-organizations # edxval -pkgutil-resolve-name==1.3.10 - # via - # -r requirements/edx/base.txt - # jsonschema platformdirs==3.11.0 # via # -r requirements/edx/base.txt @@ -1058,11 +1034,11 @@ polib==1.2.0 # -r requirements/edx/base.txt # -r requirements/edx/testing.in # edx-i18n-tools -prompt-toolkit==3.0.42 +prompt-toolkit==3.0.43 # via # -r requirements/edx/base.txt # click-repl -psutil==5.9.6 +psutil==5.9.7 # via # -r requirements/edx/base.txt # edx-django-utils @@ -1088,15 +1064,15 @@ pycparser==2.21 # via # -r requirements/edx/base.txt # cffi -pycryptodomex==3.19.0 +pycryptodomex==3.20.0 # via # -r requirements/edx/base.txt # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.5.2 +pydantic==2.5.3 # via fastapi -pydantic-core==2.14.5 +pydantic-core==2.14.6 # via pydantic pygments==2.17.2 # via @@ -1184,7 +1160,7 @@ pysrt==1.1.2 # via # -r requirements/edx/base.txt # edxval -pytest==7.4.3 +pytest==7.4.4 # via # -r requirements/edx/testing.in # pylint-pytest @@ -1226,11 +1202,11 @@ python-dateutil==2.8.2 # olxcleaner # ora2 # xblock -python-ipware==2.0.0 +python-ipware==2.0.1 # via # -r requirements/edx/base.txt # django-ipware -python-memcached==1.59 +python-memcached==1.61 # via -r requirements/edx/base.txt python-slugify==8.0.1 # via @@ -1249,7 +1225,6 @@ python3-saml==1.16.0 pytz==2023.3.post1 # via # -r requirements/edx/base.txt - # babel # django # django-ses # djangorestframework @@ -1278,7 +1253,7 @@ pyyaml==6.0.1 # edx-django-release-util # edx-i18n-tools # xblock -random2==1.0.1 +random2==1.0.2 # via -r requirements/edx/base.txt recommender-xblock==2.0.1 # via -r requirements/edx/base.txt @@ -1286,12 +1261,12 @@ redis==5.0.1 # via # -r requirements/edx/base.txt # walrus -referencing==0.32.0 +referencing==0.32.1 # via # -r requirements/edx/base.txt # jsonschema # jsonschema-specifications -regex==2023.10.3 +regex==2023.12.25 # via # -r requirements/edx/base.txt # nltk @@ -1323,7 +1298,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/edx/base.txt # social-auth-core -rpds-py==0.13.2 +rpds-py==0.16.2 # via # -r requirements/edx/base.txt # jsonschema @@ -1342,7 +1317,7 @@ rules==3.3 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.8.2 +s3transfer==0.10.0 # via # -r requirements/edx/base.txt # boto3 @@ -1401,7 +1376,6 @@ six==1.16.0 # py2neo # pyjwkest # python-dateutil - # python-memcached slumber==0.7.1 # via # -r requirements/edx/base.txt @@ -1444,7 +1418,7 @@ sqlparse==0.4.4 # openedx-blockstore staff-graded-xblock==2.2.0 # via -r requirements/edx/base.txt -starlette==0.27.0 +starlette==0.35.1 # via fastapi stevedore==5.1.0 # via @@ -1498,28 +1472,22 @@ tqdm==4.66.1 typing-extensions==4.9.0 # via # -r requirements/edx/base.txt - # annotated-types + # anyio # asgiref # astroid # django-countries - # drf-spectacular # edx-opaque-keys - # faker # fastapi # grimp # import-linter - # kombu # pydantic # pydantic-core - # pylint # pylti1p3 # snowflake-connector-python - # starlette # uvicorn -tzdata==2023.3 +tzdata==2023.4 # via # -r requirements/edx/base.txt - # backports-zoneinfo # celery unicodecsv==0.14.1 # via @@ -1541,10 +1509,9 @@ urllib3==1.26.18 # elasticsearch # py2neo # requests - # snowflake-connector-python user-util==1.0.0 # via -r requirements/edx/base.txt -uvicorn==0.24.0.post1 +uvicorn==0.25.0 # via pact-python vine==5.1.0 # via @@ -1564,7 +1531,7 @@ walrus==0.9.3 # edx-event-bus-redis watchdog==3.0.0 # via -r requirements/edx/base.txt -wcwidth==0.2.12 +wcwidth==0.2.13 # via # -r requirements/edx/base.txt # prompt-toolkit @@ -1591,7 +1558,7 @@ wrapt==1.16.0 # -r requirements/edx/base.txt # astroid # deprecated -xblock[django]==1.8.1 +xblock[django]==1.9.1 # via # -r requirements/edx/base.txt # acid-xblock @@ -1629,11 +1596,6 @@ yarl==1.9.4 # via # -r requirements/edx/base.txt # aiohttp -zipp==3.17.0 - # via - # -r requirements/edx/base.txt - # importlib-metadata - # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index d0f943174e7c..fc3544b2c87f 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -10,8 +10,6 @@ click==8.1.6 # via # -c requirements/constraints.txt # pip-tools -importlib-metadata==7.0.0 - # via build packaging==23.2 # via build pip-tools==7.3.0 @@ -25,8 +23,6 @@ tomli==2.0.1 # pyproject-hooks wheel==0.42.0 # via pip-tools -zipp==3.17.0 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 14cb99cd397f..14f87d58d2ae 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # make upgrade @@ -8,7 +8,7 @@ wheel==0.42.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r requirements/pip.in -setuptools==69.0.2 +setuptools==69.0.3 # via -r requirements/pip.in From 173383eede223ffe797d1decf927bdd1486a2d7d Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 12 Jan 2024 18:49:16 +0500 Subject: [PATCH 12/19] chore: a --- .github/workflows/pylint-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index b0118512a4ca..8921a41f1db9 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: "3.10" - name: Get pip cache dir id: pip-cache-dir From e8a23710304cdb7774c77814cf4ce979e407d132 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 12 Jan 2024 19:10:35 +0500 Subject: [PATCH 13/19] chore: a --- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/docker-publish.yml | 9 ++++----- .github/workflows/js-tests.yml | 2 +- .github/workflows/lint-imports.yml | 2 +- .github/workflows/migrations-check.yml | 2 +- .github/workflows/publish-ci-docker-image.yml | 2 +- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/quality-checks.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests-gh-hosted.yml | 4 ++-- .github/workflows/verify-dunder-init.yml | 2 +- .github/workflows/verify-gha-unit-tests-count.yml | 2 +- 12 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index e4c1a148ce65..ebb20cb7082c 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -12,7 +12,7 @@ jobs: os: ['ubuntu-20.04'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 978e616ee62a..0541d090af95 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -9,8 +9,8 @@ jobs: # See also https://docs.docker.com/docker-hub/builds/ push: runs-on: ubuntu-latest - if: github.event_name == 'push' - + if: github.event_name == 'push' + strategy: matrix: variant: @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -38,6 +38,5 @@ jobs: - name: Build and push lms base docker image env: DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} run : make docker_tag_build_push_${{matrix.variant}} - \ No newline at end of file diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 3590a97fd67d..834f8b82d660 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -18,7 +18,7 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Fetch master to compare coverage run: git fetch --depth=1 origin master diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index d67dd609226b..bdf9aa7a917a 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Check out branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index fc36ca049b35..0b15257501a0 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -73,7 +73,7 @@ jobs: mongosh --host 127.0.0.1 --username edxapp --password password --eval 'use edxapp; db.adminCommand("ping");' edxapp - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml index fd1c2da1d4c0..5a448306c6d0 100644 --- a/.github/workflows/publish-ci-docker-image.yml +++ b/.github/workflows/publish-ci-docker-image.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 # This has to happen after checkout in order for gh to work. - name: "Cancel scheduled job on forks" diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 8921a41f1db9..a8574455b8c4 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -31,7 +31,7 @@ jobs: name: pylint ${{ matrix.module-name }} steps: - name: Check out repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install required system packages run: sudo apt-get update && sudo apt-get install libxmlsec1-dev diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 1205666ca313..f58a70e8c742 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -19,7 +19,7 @@ jobs: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 2 diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index e430c70ed258..268466840d88 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index 23f4d7668396..0693d97c124b 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -38,7 +38,7 @@ jobs: - "xmodule-with-cms" name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Required System Packages run: sudo apt-get update && sudo apt-get install libxmlsec1-dev lynx @@ -88,7 +88,7 @@ jobs: django-version: - "pinned" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install Required System Packages run: sudo apt-get update && sudo apt-get install libxmlsec1-dev diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index aefc0f53b6f5..e2a7d58cd97b 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Check out branch - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Ensure git is installed run: | diff --git a/.github/workflows/verify-gha-unit-tests-count.yml b/.github/workflows/verify-gha-unit-tests-count.yml index c68092942d70..5e5a38b7ec7a 100644 --- a/.github/workflows/verify-gha-unit-tests-count.yml +++ b/.github/workflows/verify-gha-unit-tests-count.yml @@ -14,7 +14,7 @@ jobs: - name: sync directory owner run: sudo chown runner:runner -R .* - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: install requirements run: | sudo make test-requirements From f1432b2ebf3e68bf0072e899c1f7198d71d8053b Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 12 Jan 2024 19:17:12 +0500 Subject: [PATCH 14/19] chore: a --- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/compile-python-requirements.yml | 2 +- .github/workflows/js-tests.yml | 2 +- .github/workflows/lint-imports.yml | 2 +- .github/workflows/migrations-check.yml | 2 +- .github/workflows/publish-ci-docker-image.yml | 2 +- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/quality-checks.yml | 2 +- .github/workflows/semgrep.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests-gh-hosted.yml | 4 ++-- .github/workflows/upgrade-one-python-dependency.yml | 2 +- .github/workflows/verify-dunder-init.yml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index ebb20cb7082c..635c4b5161a2 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: python-version: ['3.10'] - os: ['ubuntu-20.04'] + os: ['ubuntu-latest'] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml index a5bded492633..756f5ef2af53 100644 --- a/.github/workflows/compile-python-requirements.yml +++ b/.github/workflows/compile-python-requirements.yml @@ -15,7 +15,7 @@ defaults: jobs: recompile-python-dependencies: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Check out target branch diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 834f8b82d660..2aa966f91909 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-latest ] node-version: [ 16 ] python-version: [ 3.10 ] diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index bdf9aa7a917a..94e27cbab5ea 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -10,7 +10,7 @@ jobs: lint-imports: name: Lint Python Imports - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Check out branch diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index 0b15257501a0..eb294dd6e8db 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-latest ] python-version: [ '3.10' ] # 'pinned' is used to install the latest patch version of Django # within the global constraint i.e. Django==3.2.21 in current case diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml index 5a448306c6d0..a4d2e2fef54c 100644 --- a/.github/workflows/publish-ci-docker-image.yml +++ b/.github/workflows/publish-ci-docker-image.yml @@ -7,7 +7,7 @@ on: jobs: push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index a8574455b8c4..6a49b84535aa 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -8,7 +8,7 @@ on: jobs: run-pylint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index f58a70e8c742..0da9c12cd99e 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-latest ] python-version: [ 3.10 ] node-version: [ 16 ] diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 360da3249c85..bcc9a095954b 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -17,7 +17,7 @@ jobs: runs-on: "${{ matrix.os }}" strategy: matrix: - os: [ "ubuntu-20.04" ] + os: [ "ubuntu-latest" ] python-version: [ "3.10" ] steps: diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index 268466840d88..c17586c150e6 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-latest ] python-version: [ 3.10 ] node-version: [ 16 ] npm-version: [ 8.5.x ] diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index 0693d97c124b..ae91b9bde863 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -10,7 +10,7 @@ on: jobs: run-test: if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true)) - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -81,7 +81,7 @@ jobs: collect-and-verify: if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true)) - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: python-version: [ '3.10' ] diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index 67db9ebbae5a..5e509820aa91 100644 --- a/.github/workflows/upgrade-one-python-dependency.yml +++ b/.github/workflows/upgrade-one-python-dependency.yml @@ -28,7 +28,7 @@ defaults: jobs: upgrade-one-python-dependency: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Check out target branch diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index e2a7d58cd97b..d6c207b81a3c 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -10,7 +10,7 @@ jobs: verify_dunder_init: name: Verify __init__.py Files - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: From 3291b68b4d76670fa1b74ffc375a377afce9ba17 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 12 Jan 2024 19:20:26 +0500 Subject: [PATCH 15/19] chore: a --- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/js-tests.yml | 2 +- .github/workflows/lint-imports.yml | 2 +- .github/workflows/migrations-check.yml | 2 +- .github/workflows/publish-ci-docker-image.yml | 2 +- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/quality-checks.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests-gh-hosted.yml | 4 ++-- .github/workflows/verify-dunder-init.yml | 2 +- .github/workflows/verify-gha-unit-tests-count.yml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index 635c4b5161a2..33621904c536 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -12,7 +12,7 @@ jobs: os: ['ubuntu-latest'] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 0541d090af95..40fd92b4d9b4 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 2aa966f91909..764e59e8c0b4 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -18,7 +18,7 @@ jobs: steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Fetch master to compare coverage run: git fetch --depth=1 origin master diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index 94e27cbab5ea..0397bf24df10 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Check out branch - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Set up Python uses: actions/setup-python@v4 diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index eb294dd6e8db..2275b9dbe815 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -73,7 +73,7 @@ jobs: mongosh --host 127.0.0.1 --username edxapp --password password --eval 'use edxapp; db.adminCommand("ping");' edxapp - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml index a4d2e2fef54c..360ac1c8dde4 100644 --- a/.github/workflows/publish-ci-docker-image.yml +++ b/.github/workflows/publish-ci-docker-image.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v2 # This has to happen after checkout in order for gh to work. - name: "Cancel scheduled job on forks" diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 6a49b84535aa..be74c04b6bdd 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -31,7 +31,7 @@ jobs: name: pylint ${{ matrix.module-name }} steps: - name: Check out repo - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Install required system packages run: sudo apt-get update && sudo apt-get install libxmlsec1-dev diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 0da9c12cd99e..7697313f21f7 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -19,7 +19,7 @@ jobs: steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 with: fetch-depth: 2 diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index c17586c150e6..dc453bef7820 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index ae91b9bde863..30662737d663 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -38,7 +38,7 @@ jobs: - "xmodule-with-cms" name: gh-hosted-python-${{ matrix.python-version }},django-${{ matrix.django-version }},${{ matrix.shard_name }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Install Required System Packages run: sudo apt-get update && sudo apt-get install libxmlsec1-dev lynx @@ -88,7 +88,7 @@ jobs: django-version: - "pinned" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: Install Required System Packages run: sudo apt-get update && sudo apt-get install libxmlsec1-dev diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index d6c207b81a3c..2f21e6a50593 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Check out branch - uses: actions/checkout@v4 + uses: actions/checkout@v2 - name: Ensure git is installed run: | diff --git a/.github/workflows/verify-gha-unit-tests-count.yml b/.github/workflows/verify-gha-unit-tests-count.yml index 5e5a38b7ec7a..c68092942d70 100644 --- a/.github/workflows/verify-gha-unit-tests-count.yml +++ b/.github/workflows/verify-gha-unit-tests-count.yml @@ -14,7 +14,7 @@ jobs: - name: sync directory owner run: sudo chown runner:runner -R .* - - uses: actions/checkout@v4 + - uses: actions/checkout@v2 - name: install requirements run: | sudo make test-requirements From 75f38fedf6528925fcb02c1ed93a50097a2a3c0b Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 12 Jan 2024 19:22:27 +0500 Subject: [PATCH 16/19] chore: a --- .github/workflows/js-tests.yml | 2 +- .github/workflows/quality-checks.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 764e59e8c0b4..4974998bd5c3 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ ubuntu-latest ] node-version: [ 16 ] - python-version: [ 3.10 ] + python-version: [ "3.10" ] steps: diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 7697313f21f7..2f72c17e778a 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - python-version: [ 3.10 ] + python-version: [ "3.10" ] node-version: [ 16 ] steps: diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index dc453bef7820..e6237c227e64 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest ] - python-version: [ 3.10 ] + python-version: [ "3.10" ] node-version: [ 16 ] npm-version: [ 8.5.x ] diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index f9831ffe0a4d..ea28fa84fb03 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -128,7 +128,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ 3.10 ] + python-version: [ "3.10" ] steps: - name: Checkout repo uses: actions/checkout@v3 From 2e3d840ae33774f7d507029b9a1b0c20d1850097 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 12 Jan 2024 19:23:33 +0500 Subject: [PATCH 17/19] chore: a --- .github/workflows/check-for-tutorial-prs.yml | 4 ++-- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/compile-python-requirements.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/js-tests.yml | 2 +- .github/workflows/lint-imports.yml | 2 +- .github/workflows/migrations-check.yml | 4 ++-- .github/workflows/publish-ci-docker-image.yml | 2 +- .github/workflows/pylint-checks.yml | 4 ++-- .github/workflows/quality-checks.yml | 2 +- .github/workflows/semgrep.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests-gh-hosted.yml | 4 ++-- .github/workflows/unit-tests.yml | 4 ++-- .github/workflows/upgrade-one-python-dependency.yml | 2 +- .github/workflows/verify-dunder-init.yml | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/check-for-tutorial-prs.yml b/.github/workflows/check-for-tutorial-prs.yml index 5d64a50573fd..7e5cda1d22aa 100644 --- a/.github/workflows/check-for-tutorial-prs.yml +++ b/.github/workflows/check-for-tutorial-prs.yml @@ -19,7 +19,7 @@ on: jobs: # Provide helpful bot comment comment: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 name: provide helpful bot comment steps: - name: Checkout @@ -32,4 +32,4 @@ jobs: Thank you for your pull request! Congratulations on completing the Open edX tutorial! A team member will be by to take a look shortly. To those watching community pull requests: No need to worry about this one, a tCRIL team member will be taking care of it. For this PR's author: If this is a PR that is NOT coming from the Open edX tutorial, please comment and let us know to disregard this message. - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index 33621904c536..e4c1a148ce65 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: python-version: ['3.10'] - os: ['ubuntu-latest'] + os: ['ubuntu-20.04'] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml index 756f5ef2af53..a5bded492633 100644 --- a/.github/workflows/compile-python-requirements.yml +++ b/.github/workflows/compile-python-requirements.yml @@ -15,7 +15,7 @@ defaults: jobs: recompile-python-dependencies: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out target branch diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 40fd92b4d9b4..8ae4ba018c3c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -8,7 +8,7 @@ jobs: # Push image to GitHub Packages. # See also https://docs.docker.com/docker-hub/builds/ push: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 if: github.event_name == 'push' strategy: diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 4974998bd5c3..61ee664d533d 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-20.04 ] node-version: [ 16 ] python-version: [ "3.10" ] diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index 0397bf24df10..d67dd609226b 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -10,7 +10,7 @@ jobs: lint-imports: name: Lint Python Imports - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out branch diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index 2275b9dbe815..c9898a2d533e 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-20.04 ] python-version: [ '3.10' ] # 'pinned' is used to install the latest patch version of Django # within the global constraint i.e. Django==3.2.21 in current case @@ -129,7 +129,7 @@ jobs: if: always() needs: - check_migrations - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Decide whether the needed jobs succeeded or failed # uses: re-actors/alls-green@v1.2.1 diff --git a/.github/workflows/publish-ci-docker-image.yml b/.github/workflows/publish-ci-docker-image.yml index 360ac1c8dde4..fd1c2da1d4c0 100644 --- a/.github/workflows/publish-ci-docker-image.yml +++ b/.github/workflows/publish-ci-docker-image.yml @@ -7,7 +7,7 @@ on: jobs: push: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index be74c04b6bdd..b6b8afbeb67e 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -8,7 +8,7 @@ on: jobs: run-pylint: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -75,7 +75,7 @@ jobs: if: always() needs: - run-pylint - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Decide whether the needed jobs succeeded or failed # uses: re-actors/alls-green@v1.2.1 diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 2f72c17e778a..2791d3e9e6bb 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-20.04 ] python-version: [ "3.10" ] node-version: [ 16 ] diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index bcc9a095954b..360da3249c85 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -17,7 +17,7 @@ jobs: runs-on: "${{ matrix.os }}" strategy: matrix: - os: [ "ubuntu-latest" ] + os: [ "ubuntu-20.04" ] python-version: [ "3.10" ] steps: diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index e6237c227e64..dcae0e5e1370 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ ubuntu-20.04 ] python-version: [ "3.10" ] node-version: [ 16 ] npm-version: [ 8.5.x ] diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index 30662737d663..23f4d7668396 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -10,7 +10,7 @@ on: jobs: run-test: if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true)) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -81,7 +81,7 @@ jobs: collect-and-verify: if: (github.repository != 'openedx/edx-platform' && github.repository != 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == true)) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: python-version: [ '3.10' ] diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ea28fa84fb03..3fc4c7698408 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -86,7 +86,7 @@ jobs: if: (github.repository == 'edx/edx-platform-private') || (github.repository == 'openedx/edx-platform' && (startsWith(github.base_ref, 'open-release') == false)) needs: - run-tests - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Decide whether the needed jobs succeeded or failed # uses: re-actors/alls-green@v1.2.1 @@ -125,7 +125,7 @@ jobs: # Combine and upload coverage reports. coverage: needs: run-tests - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: python-version: [ "3.10" ] diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index 5e509820aa91..67db9ebbae5a 100644 --- a/.github/workflows/upgrade-one-python-dependency.yml +++ b/.github/workflows/upgrade-one-python-dependency.yml @@ -28,7 +28,7 @@ defaults: jobs: upgrade-one-python-dependency: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out target branch diff --git a/.github/workflows/verify-dunder-init.yml b/.github/workflows/verify-dunder-init.yml index 2f21e6a50593..aefc0f53b6f5 100644 --- a/.github/workflows/verify-dunder-init.yml +++ b/.github/workflows/verify-dunder-init.yml @@ -10,7 +10,7 @@ jobs: verify_dunder_init: name: Verify __init__.py Files - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: From 876418f6993727eee9a3cf22fda65cb42091210f Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 15 Jan 2024 14:46:11 +0500 Subject: [PATCH 18/19] chore: Update ci-runner.Dockerfile --- scripts/ci-runner.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci-runner.Dockerfile b/scripts/ci-runner.Dockerfile index 291f1d33d32f..f0bfcb5799cd 100644 --- a/scripts/ci-runner.Dockerfile +++ b/scripts/ci-runner.Dockerfile @@ -34,7 +34,7 @@ ENV SETTINGS production RUN mkdir -p /edx/etc/ ENV VIRTUAL_ENV=/edx/app/edxapp/venvs/edxapp -RUN python3.8 -m venv $VIRTUAL_ENV +RUN python3.10 -m venv $VIRTUAL_ENV ENV PATH="$VIRTUAL_ENV/bin:$PATH" From 8a7e4fcf506a2f37dfd74b5aae2d4f5c94bf0d75 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Tue, 6 Feb 2024 00:07:23 +0500 Subject: [PATCH 19/19] chore: minor changes. --- .github/workflows/check-consistent-dependencies.yml | 2 +- .github/workflows/ci-static-analysis.yml | 2 +- .github/workflows/compile-python-requirements.yml | 2 +- .github/workflows/js-tests.yml | 2 +- .github/workflows/lint-imports.yml | 2 +- .github/workflows/migrations-check.yml | 2 +- .github/workflows/pylint-checks.yml | 2 +- .github/workflows/quality-checks.yml | 2 +- .github/workflows/semgrep.yml | 2 +- .github/workflows/static-assets-check.yml | 2 +- .github/workflows/unit-tests-gh-hosted.yml | 4 ++-- .github/workflows/unit-tests.yml | 4 ++-- .github/workflows/upgrade-one-python-dependency.yml | 2 +- .github/workflows/upgrade-python-requirements.yml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml index eb3294116e6d..caa8f0780892 100644 --- a/.github/workflows/check-consistent-dependencies.yml +++ b/.github/workflows/check-consistent-dependencies.yml @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-python@v4 if: ${{ env.RELEVANT == 'true' }} with: - python-version: '3.10' + python-version: '3.9' - name: "Recompile requirements" if: ${{ env.RELEVANT == 'true' }} diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index e4c1a148ce65..375e65a6553d 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.10'] + python-version: ['3.9'] os: ['ubuntu-20.04'] steps: diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml index a5bded492633..e2633fde17e7 100644 --- a/.github/workflows/compile-python-requirements.yml +++ b/.github/workflows/compile-python-requirements.yml @@ -26,7 +26,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.9" - name: Run make compile-requirements env: diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 61ee664d533d..aaa798d89bef 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ ubuntu-20.04 ] node-version: [ 16 ] - python-version: [ "3.10" ] + python-version: [ "3.9" ] steps: diff --git a/.github/workflows/lint-imports.yml b/.github/workflows/lint-imports.yml index d67dd609226b..6dcece2ab2d1 100644 --- a/.github/workflows/lint-imports.yml +++ b/.github/workflows/lint-imports.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.9' - name: Install system requirements run: sudo apt update && sudo apt install -y libxmlsec1-dev diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index c9898a2d533e..8bc8260c69fa 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ '3.10' ] + python-version: [ '3.9' ] # 'pinned' is used to install the latest patch version of Django # within the global constraint i.e. Django==3.2.21 in current case # because we have global constraint of Django<4.2 diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index b6b8afbeb67e..ac4223f13e31 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.9" - name: Get pip cache dir id: pip-cache-dir diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 2791d3e9e6bb..11fdc4aeba2b 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ "3.10" ] + python-version: [ "3.9" ] node-version: [ 16 ] steps: diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 360da3249c85..24b71a8cba43 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: os: [ "ubuntu-20.04" ] - python-version: [ "3.10" ] + python-version: [ "3.9" ] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index dcae0e5e1370..a7992b375353 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ "3.10" ] + python-version: [ "3.9" ] node-version: [ 16 ] npm-version: [ 8.5.x ] diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index 23f4d7668396..f9a9f08439ed 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ '3.10' ] + python-version: [ '3.9' ] django-version: - "pinned" # When updating the shards, remember to make the same changes in @@ -84,7 +84,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [ '3.10' ] + python-version: [ '3.9' ] django-version: - "pinned" steps: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 3fc4c7698408..d1822414043e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: python-version: - - "3.10" + - "3.9" django-version: - "pinned" - "4.2" @@ -128,7 +128,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [ "3.10" ] + python-version: [ "3.9" ] steps: - name: Checkout repo uses: actions/checkout@v3 diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index 67db9ebbae5a..d9fd90b425f5 100644 --- a/.github/workflows/upgrade-one-python-dependency.yml +++ b/.github/workflows/upgrade-one-python-dependency.yml @@ -39,7 +39,7 @@ jobs: - name: Set up Python environment uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.9" - name: Update any pinned dependencies env: diff --git a/.github/workflows/upgrade-python-requirements.yml b/.github/workflows/upgrade-python-requirements.yml index b10492ae6c0a..c730f5b972f4 100644 --- a/.github/workflows/upgrade-python-requirements.yml +++ b/.github/workflows/upgrade-python-requirements.yml @@ -19,7 +19,7 @@ jobs: team_reviewers: "arbi-bom" email_address: arbi-bom@edx.org send_success_notification: false - python_version: '3.10' + python_version: '3.9' secrets: requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }} requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}