Skip to content
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ["3.8", "3.11", "3.12"]
python-version: ["3.11", "3.12"]
toxenv:
[
django42-celery53-drflatest,
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django42-celery53-drflatest'
if: matrix.python-version == '3.12' && matrix.toxenv=='django42-celery53-drflatest'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
7 changes: 4 additions & 3 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.3.0
# Generated by edx-lint version: 5.6.0
# ------------------------------
[MASTER]
ignore = migrations,tests
Expand Down Expand Up @@ -259,6 +259,7 @@ enable =
useless-suppression,
disable =
bad-indentation,
broad-exception-raised,
consider-using-f-string,
duplicate-code,
file-ignored,
Expand Down Expand Up @@ -381,6 +382,6 @@ ext-import-graph =
int-import-graph =

[EXCEPTIONS]
overgeneral-exceptions = Exception
overgeneral-exceptions = builtins.Exception

# 2e3a63b4656d2fe598f8145548bb1f0d6c829da7
# 6e50ecbd28fda642e07ed6b0f9fc470ed6ae5e49
60 changes: 25 additions & 35 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
amqp==5.2.0
amqp==5.3.1
# via kombu
asgiref==3.8.1
# via django
backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# celery
# django
# djangorestframework
# kombu
billiard==4.2.0
billiard==4.2.1
# via celery
celery==5.3.6
celery==5.5.0
# via
# -c requirements/constraints.txt
# edx-celeryutils
cffi==1.16.0
cffi==1.17.1
# via pynacl
click==8.1.7
click==8.1.8
# via
# celery
# click-didyoumean
Expand All @@ -36,7 +29,7 @@ click-plugins==1.1.1
# via celery
click-repl==0.3.0
# via celery
django==4.2.11
django==4.2.20
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -51,56 +44,53 @@ django-crum==0.7.9
# via
# -r requirements/base.in
# edx-django-utils
django-model-utils==4.5.0
django-model-utils==5.0.0
# via
# -r requirements/base.in
# edx-celeryutils
django-waffle==4.1.0
django-waffle==4.2.0
# via edx-django-utils
djangorestframework==3.15.1
djangorestframework==3.16.0
# via -r requirements/base.in
edx-celeryutils==1.3.0
# via -r requirements/base.in
edx-django-utils==5.12.0
edx-django-utils==7.2.0
# via -r requirements/base.in
jsonfield==3.1.0
# via edx-celeryutils
kombu==5.3.6
kombu==5.5.2
# via celery
newrelic==9.8.0
newrelic==10.8.1
# via edx-django-utils
pbr==6.0.0
pbr==6.1.1
# via stevedore
prompt-toolkit==3.0.43
prompt-toolkit==3.0.50
# via click-repl
psutil==5.9.8
psutil==7.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.9.0.post0
# via celery
simplejson==3.19.2
simplejson==3.20.1
# via -r requirements/base.in
six==1.16.0
six==1.17.0
# via python-dateutil
sqlparse==0.4.4
sqlparse==0.5.3
# via django
stevedore==5.2.0
stevedore==5.4.1
# via edx-django-utils
typing-extensions==4.11.0
# via
# asgiref
# kombu
tzdata==2024.1
# via
# backports-zoneinfo
# celery
tzdata==2025.2
# via kombu
vine==5.1.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.13
# via prompt-toolkit

# The following packages are considered to be unsafe in a requirements file:
# setuptools
12 changes: 6 additions & 6 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
amqp==5.2.0
billiard==4.2.0
celery==5.3.6
click==8.1.7
amqp==5.3.1
billiard==4.2.1
celery==5.5.0
click==8.1.8
click-didyoumean==0.3.1
click-repl==0.3.0
kombu==5.3.6
prompt-toolkit==3.0.43
kombu==5.5.2
prompt-toolkit==3.0.50
vine==5.1.0
24 changes: 10 additions & 14 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==5.3.3
cachetools==5.5.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
distlib==0.3.9
# via virtualenv
filelock==3.13.3
filelock==3.18.0
# via
# tox
# virtualenv
packaging==24.0
packaging==24.2
# via
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.3.7
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
pyproject-api==1.9.0
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.14.2
tox==4.25.0
# via -r requirements/ci.in
virtualenv==20.25.1
virtualenv==20.30.0
# via tox
17 changes: 8 additions & 9 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,21 @@
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version
Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3

# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0
Loading