diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d40ddbf1..9bcb9168 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false max-parallel: 4 matrix: - python-version: ['py38', 'py311', 'py312'] + python-version: ['py311', 'py312'] django-version: ['django42'] db-version: ['mysql80'] diff --git a/.github/workflows/migrations-mysql8-check.yml b/.github/workflows/migrations-mysql8-check.yml index b448e28e..c9ef52cd 100644 --- a/.github/workflows/migrations-mysql8-check.yml +++ b/.github/workflows/migrations-mysql8-check.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04 ] - python-version: [ '3.8', '3.11', '3.12' ] + python-version: [ '3.11', '3.12' ] steps: - name: Checkout repo diff --git a/notesapi/v1/tests/test_views.py b/notesapi/v1/tests/test_views.py index 33de6763..20df1e48 100644 --- a/notesapi/v1/tests/test_views.py +++ b/notesapi/v1/tests/test_views.py @@ -388,14 +388,9 @@ def test_read_all_no_annotations(self): headers["course_id"] = "a/b/c" response = self.client.get(reverse('api:v1:annotations'), headers) self.assertEqual(response.status_code, status.HTTP_200_OK) - if sys.version_info[1] == 12: # python 3.12 - self.assertEqual( - {'total': 0, 'rows': []} | response.data, response.data, "no annotation should be returned in response" - ) - else: # remove this code after removing python 3.8 dependency - self.assertDictContainsSubset( - {'total': 0, 'rows': []}, response.data, "no annotation should be returned in response" - ) + self.assertEqual( + {'total': 0, 'rows': []} | response.data, response.data, "no annotation should be returned in response" + ) def test_read_all(self): """ diff --git a/requirements/pip.txt b/requirements/pip.txt index 854334df..12caa843 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.1.2 +pip==24.2 # via -r requirements/pip.in setuptools==71.1.0 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index ab97dc26..88fd4751 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -222,7 +222,7 @@ pynacl==1.5.0 # via # -r requirements/base.txt # edx-django-utils -pytest==8.3.1 +pytest==8.3.2 # via # -r requirements/test.in # pytest-cov diff --git a/tox.ini b/tox.ini index 71efc447..5b64eb6b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{38,311,312}-django{42} +envlist = py{311,312}-django{42} skipsdist = true [testenv]