Skip to content

Commit

Permalink
feat: add python311 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
edx-requirements-bot authored and awais786 committed Mar 29, 2024
1 parent 751ac18 commit fad234c
Show file tree
Hide file tree
Showing 16 changed files with 240 additions and 230 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.8']
toxenv: [quality, docs, django32-celery53, django42-celery53, django32-pii-annotations]
python-version:
- '3.8'
- '3.11'
toxenv: [quality, docs, django42-celery53, django42-pii-annotations, django42]
env:
RUNJSHINT: true
steps:
Expand All @@ -26,7 +28,7 @@ jobs:
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- uses: actions/setup-python@v2
with:
python-version: '3.8'
python-version: ${{ matrix.python-version }}
architecture: x64
- uses: actions/setup-node@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion integrated_channels/integrated_channel/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def fetch_orphaned_content_audits(self):
enterprise_customer=self.enterprise_customer,
remote_deleted_at__isnull=True,
remote_created_at__isnull=False,
).filter(~non_existent_catalogs_filter | null_catalogs_filter)
).filter(~non_existent_catalogs_filter | null_catalogs_filter) # pylint: disable=unsupported-binary-operation

def update_content_synced_at(self, action_happened_at, was_successful):
"""
Expand Down
2 changes: 1 addition & 1 deletion pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -386,5 +386,5 @@ int-import-graph =

[EXCEPTIONS]
overgeneral-exceptions = builtins.Exception

# 852b6fff3b5db38083c340a20de6cc6024cc0c00

2 changes: 1 addition & 1 deletion pylintrc_tweaks
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ no-docstring-rgx=(__.*__)|Meta
disable+ =
logging-format-interpolation,
no-member,
missing-timeout,
missing-timeout,
4 changes: 2 additions & 2 deletions requirements/celery53.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ amqp==5.2.0
billiard==4.2.0
celery==5.3.6
click==8.1.7
click-didyoumean==0.3.0
click-didyoumean==0.3.1
click-repl==0.3.0
kombu==5.3.5
kombu==5.3.6
prompt-toolkit==3.0.43
vine==5.1.0
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
packaging==23.2
packaging==24.0
# via tox
platformdirs==4.1.0
platformdirs==4.2.0
# via virtualenv
pluggy==1.4.0
# via tox
Expand All @@ -26,5 +26,5 @@ tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.in
virtualenv==20.25.0
virtualenv==20.25.1
# via tox
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,19 @@


# using LTS django version
Django<4.0
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
elasticsearch<7.14.0

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

# 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
3 changes: 3 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@ tox<4

# upgrading django-simple-history
django-simple-history<=3.1.1

# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
Loading

0 comments on commit fad234c

Please sign in to comment.