diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c44b8abd..3d2cc68fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,14 +11,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [py38] + python-version: ['3.8', '3.12'] django-version: [django42] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: '3.8' + python-version: ${{ matrix.python-version }} architecture: x64 - name: Start container run: | @@ -27,5 +27,5 @@ jobs: run: | docker exec -e TOXENV=${{ matrix.python-version }}-${{ matrix.django-version }} -u root enterprise.catalog.app /edx/app/enterprise_catalog/enterprise_catalog/validate.sh - name: Code Coverage - if: matrix.python-version == 'py38' && matrix.django-version=='django42' + if: matrix.python-version == '3.8' && matrix.django-version=='django42' uses: codecov/codecov-action@v1 diff --git a/Makefile b/Makefile index 159c37a9e..20e04564d 100644 --- a/Makefile +++ b/Makefile @@ -99,9 +99,8 @@ html_coverage: ## generate and view HTML coverage report upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) piptools ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in # Make sure to compile files after any other files they include! - sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed -i 's/django-simple-history==//g' requirements/common_constraints.txt pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b5d2098db..fc5c765e7 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -20,7 +20,7 @@ Django<5.0 elasticsearch<7.14.0 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -3.0.0 + # opentelemetry requires version 6.x at the moment: # https://github.com/open-telemetry/opentelemetry-python/issues/3570 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 822279be8..6878afae9 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -40,3 +40,6 @@ astroid<2.12 # To avoid any breaking changes openai<=1.13.3 + +# For python greater than or equal to 3.9 backports.zoneinfo causing failures +backports.zoneinfo; python_version<'3.9' diff --git a/tox.ini b/tox.ini index 90a45394a..848894862 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] skipsdist = true -envlist = {py38}-django{42} +envlist = py{38, 312}-django{42} [testenv] deps = @@ -8,4 +8,3 @@ deps = -r{toxinidir}/requirements/test.txt commands = {posargs:pytest} -