diff --git a/.github/workflows/migrations-check.yml b/.github/workflows/migrations-check.yml index fb66cfe775cb..243e625474b9 100644 --- a/.github/workflows/migrations-check.yml +++ b/.github/workflows/migrations-check.yml @@ -14,10 +14,10 @@ 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==4.2.8 in current case - # because we have global constraint of Django<4.2 + # because we have global constraint of Django<4.2 django-version: ["pinned"] mongo-version: ["4"] mysql-version: ["8"] @@ -115,7 +115,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/unit-tests-gh-hosted.yml b/.github/workflows/unit-tests-gh-hosted.yml index 60dabbbecec8..0a6eb1c7e172 100644 --- a/.github/workflows/unit-tests-gh-hosted.yml +++ b/.github/workflows/unit-tests-gh-hosted.yml @@ -9,12 +9,11 @@ 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 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 +83,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/unit-tests.yml b/.github/workflows/unit-tests.yml index be7e122f2fd8..6500f633eecb 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" # When updating the shards, remember to make the same changes in @@ -127,7 +127,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ 3.8 ] + python-version: [ 3.9 ] steps: - name: Checkout repo uses: actions/checkout@v3 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" diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 14a113e3c9dd..eda2ce44a518 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -53,7 +53,7 @@ babel==2.14.0 # enmerkar-underscore backoff==1.10.0 # via analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports.zoneinfo;python_version<"3.9" # via # celery # django diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 9c1a687481aa..502d12492e52 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -110,7 +110,7 @@ backoff==1.10.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports.zoneinfo;python_version<"3.9" # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index f85207bfa95d..5a6229c46d43 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -74,7 +74,7 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports.zoneinfo;python_version<"3.9" # via # -r requirements/edx/base.txt # backports-zoneinfo diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index db003eb00657..09583cd78646 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -76,7 +76,7 @@ backoff==1.10.0 # via # -r requirements/edx/base.txt # analytics-python -backports-zoneinfo[tzdata]==0.2.1 +backports.zoneinfo;python_version<"3.9" # via # -r requirements/edx/base.txt # backports-zoneinfo