From 4687dae487efb072d5f1f17134c2670b4c92f62f Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 10 May 2024 10:52:09 -0400 Subject: [PATCH] build: Drop testing with Mongo 4.4 and Python 3.8 --- .../check-consistent-dependencies.yml | 2 +- .github/workflows/ci-static-analysis.yml | 3 +- .../workflows/compile-python-requirements.yml | 2 +- .github/workflows/js-tests.yml | 3 +- .github/workflows/migrations-check.yml | 6 ++-- .github/workflows/quality-checks.yml | 3 +- .github/workflows/semgrep.yml | 3 +- .github/workflows/static-assets-check.yml | 6 ++-- .github/workflows/unit-tests-gh-hosted.yml | 29 +++++++++-------- .github/workflows/unit-tests.yml | 32 ++++++++++--------- .../units-test-scripts-structures-pruning.yml | 3 +- .../units-test-scripts-user-retirement.yml | 3 +- .../upgrade-one-python-dependency.yml | 2 +- .../workflows/verify-gha-unit-tests-count.yml | 5 +++ 14 files changed, 60 insertions(+), 42 deletions(-) diff --git a/.github/workflows/check-consistent-dependencies.yml b/.github/workflows/check-consistent-dependencies.yml index 51a4d5f24fe..a7506bd9587 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.11' - name: "Recompile requirements" if: ${{ env.RELEVANT == 'true' }} diff --git a/.github/workflows/ci-static-analysis.yml b/.github/workflows/ci-static-analysis.yml index 33415601fed..2e40e09e0aa 100644 --- a/.github/workflows/ci-static-analysis.yml +++ b/.github/workflows/ci-static-analysis.yml @@ -8,7 +8,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.11'] + python-version: + - '3.11' os: ['ubuntu-20.04'] steps: diff --git a/.github/workflows/compile-python-requirements.yml b/.github/workflows/compile-python-requirements.yml index 18e68aa0ad6..f8f945545d9 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.11" - name: Run make compile-requirements env: diff --git a/.github/workflows/js-tests.yml b/.github/workflows/js-tests.yml index 179b376b685..8b7c137c8b2 100644 --- a/.github/workflows/js-tests.yml +++ b/.github/workflows/js-tests.yml @@ -14,7 +14,8 @@ jobs: matrix: os: [ ubuntu-20.04 ] node-version: [ 18 ] - python-version: [ '3.8', '3.11' ] + python-version: + - '3.11' steps: diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index 417371c6462..7375583e040 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -14,12 +14,14 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ '3.8', '3.11' ] + python-version: + - '3.11' # 'pinned' is used to install the latest patch version of Django # within the global constraint i.e. Django==4.2.8 in current case # because we have global constraint of Django<4.2 django-version: ["pinned"] - mongo-version: ["4", "7"] + mongo-version: + - "7" mysql-version: ["8"] services: mongo: diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 92065963195..6bf16c9f0b2 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -14,7 +14,8 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ '3.8', '3.11' ] + python-version: + - '3.11' node-version: [ 18 ] steps: diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 870de732cf4..ec6b99e7967 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -18,7 +18,8 @@ jobs: strategy: matrix: os: [ "ubuntu-20.04" ] - python-version: [ "3.8", '3.11' ] + python-version: + - '3.11' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/static-assets-check.yml b/.github/workflows/static-assets-check.yml index db5ead905a8..25614f69a00 100644 --- a/.github/workflows/static-assets-check.yml +++ b/.github/workflows/static-assets-check.yml @@ -13,10 +13,12 @@ jobs: strategy: matrix: os: [ ubuntu-20.04 ] - python-version: [ '3.8', '3.11' ] + python-version: + - '3.11' node-version: [ 18 ] npm-version: [ 10.5.x ] - mongo-version: ["4.4", "7.0"] + mongo-version: + - "7.0" services: mongo: diff --git a/.github/workflows/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index 3f3e60ae8ff..c7e8868f6bd 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -15,7 +15,6 @@ jobs: strategy: matrix: python-version: - - "3.8" - "3.11" django-version: - "pinned" @@ -39,21 +38,23 @@ jobs: - "xmodule-with-lms" - "xmodule-with-cms" mongo-version: - - "4.4" - "7.0" - # We only need to test Mongo 4.4 for modules that directly interface with Mongo (that is: xmodule.modulestore) - exclude: - - mongo-version: "4.4" - include: - - shard_name: "xmodule-with-cms" - python-version: "3.11" - django-version: "pinned" - mongo-version: "4.4" - - shard_name: "xmodule-with-lms" - python-version: "3.11" - django-version: "pinned" - mongo-version: "4.4" + # We only need to test older versions of Mongo with modules that directly interface with Mongo (that is: xmodule.modulestore) + # This code is left here as an example for future refernce in case we need to reduce the number of shards we're + # testing but still have good confidence with older versions of mongo. We use Mongo 4.4 in the example. + # + # exclude: + # - mongo-version: "4.4" + # include: + # - shard_name: "xmodule-with-cms" + # python-version: "3.11" + # django-version: "pinned" + # mongo-version: "4.4" + # - shard_name: "xmodule-with-lms" + # python-version: "3.11" + # django-version: "pinned" + # mongo-version: "4.4" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index bf7fe86ab76..b65e0bcd0b8 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -14,7 +14,6 @@ jobs: strategy: matrix: python-version: - - "3.8" - "3.11" django-version: - "pinned" @@ -38,21 +37,23 @@ jobs: - "xmodule-with-lms" - "xmodule-with-cms" mongo-version: - - "4.4" - "7.0" - # We only need to test Mongo 4.4 for modules that directly interface with Mongo (that is: xmodule.modulestore) - exclude: - - mongo-version: "4.4" - include: - - shard_name: "xmodule-with-cms" - python-version: "3.11" - django-version: "pinned" - mongo-version: "4.4" - - shard_name: "xmodule-with-lms" - python-version: "3.11" - django-version: "pinned" - mongo-version: "4.4" + # We only need to test older versions of Mongo with modules that directly interface with Mongo (that is: xmodule.modulestore) + # This code is left here as an example for future refernce in case we need to reduce the number of shards we're + # testing but still have good confidence with older versions of mongo. We use Mongo 4.4 in the example. + # + # exclude: + # - mongo-version: "4.4" + # include: + # - shard_name: "xmodule-with-cms" + # python-version: "3.11" + # django-version: "pinned" + # mongo-version: "4.4" + # - shard_name: "xmodule-with-lms" + # python-version: "3.11" + # django-version: "pinned" + # mongo-version: "4.4" steps: - name: sync directory owner @@ -157,7 +158,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ 3.8 ] + python-version: + - 3.11 steps: - name: Checkout repo uses: actions/checkout@v3 diff --git a/.github/workflows/units-test-scripts-structures-pruning.yml b/.github/workflows/units-test-scripts-structures-pruning.yml index 9fab62643c3..b87d27a884c 100644 --- a/.github/workflows/units-test-scripts-structures-pruning.yml +++ b/.github/workflows/units-test-scripts-structures-pruning.yml @@ -12,7 +12,8 @@ jobs: strategy: matrix: - python-version: [ '3.8', '3.11', '3.12' ] + python-version: + - '3.12' steps: - name: Checkout code diff --git a/.github/workflows/units-test-scripts-user-retirement.yml b/.github/workflows/units-test-scripts-user-retirement.yml index 22bbdc3f617..0ab9bfb2da2 100644 --- a/.github/workflows/units-test-scripts-user-retirement.yml +++ b/.github/workflows/units-test-scripts-user-retirement.yml @@ -12,7 +12,8 @@ jobs: strategy: matrix: - python-version: [ '3.8', '3.11', '3.12'] + python-version: + - '3.12' steps: - name: Checkout code diff --git a/.github/workflows/upgrade-one-python-dependency.yml b/.github/workflows/upgrade-one-python-dependency.yml index 91e042a112f..a5d0aa9e48f 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.11" - name: Update any pinned dependencies env: diff --git a/.github/workflows/verify-gha-unit-tests-count.yml b/.github/workflows/verify-gha-unit-tests-count.yml index c68092942d7..1f6f91829c8 100644 --- a/.github/workflows/verify-gha-unit-tests-count.yml +++ b/.github/workflows/verify-gha-unit-tests-count.yml @@ -14,6 +14,11 @@ jobs: - name: sync directory owner run: sudo chown runner:runner -R .* + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: '3.11' + - uses: actions/checkout@v2 - name: install requirements run: |