Skip to content

Commit

Permalink
Merge pull request #34780 from openedx/feanil/drop_old
Browse files Browse the repository at this point in the history
feanil/drop old
  • Loading branch information
Feanil Patel authored May 14, 2024
2 parents 62aa7dd + 4687dae commit e54f647
Show file tree
Hide file tree
Showing 14 changed files with 60 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-consistent-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile-python-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Python environment
uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.11"

- name: Run make compile-requirements
env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/js-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
matrix:
os: [ ubuntu-20.04 ]
node-version: [ 18 ]
python-version: [ '3.8', '3.11' ]
python-version:
- '3.11'

steps:

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/migrations-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/quality-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/static-assets-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
29 changes: 15 additions & 14 deletions .github/workflows/unit-tests-gh-hosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
strategy:
matrix:
python-version:
- "3.8"
- "3.11"
django-version:
- "pinned"
Expand All @@ -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

Expand Down
32 changes: 17 additions & 15 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
strategy:
matrix:
python-version:
- "3.8"
- "3.11"
django-version:
- "pinned"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/units-test-scripts-structures-pruning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ jobs:

strategy:
matrix:
python-version: [ '3.8', '3.11', '3.12' ]
python-version:
- '3.12'

steps:
- name: Checkout code
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/units-test-scripts-user-retirement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ jobs:

strategy:
matrix:
python-version: [ '3.8', '3.11', '3.12']
python-version:
- '3.12'

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade-one-python-dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Set up Python environment
uses: actions/setup-python@v4
with:
python-version: "3.8"
python-version: "3.11"

- name: Update any pinned dependencies
env:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/verify-gha-unit-tests-count.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit e54f647

Please sign in to comment.