Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade Python requirements #420

Merged
merged 2 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/migrations-mysql8-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 3 additions & 8 deletions notesapi/v1/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{38,311,312}-django{42}
envlist = py{311,312}-django{42}
skipsdist = true

[testenv]
Expand Down
Loading