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.

Sign up for GitHub

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

Jump to bottom

build: running tests using python 3.11 #297

Merged
merged 6 commits into from
Apr 1, 2024
Merged

build: running tests using python 3.11 #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0252486
build: running tests using python 3.11 and 3.12
awais786 Feb 12, 2024
25c72b0
feat: running tests using python 3.11.
awais786 Mar 28, 2024
9db2f48
chore: Updating Python Requirements (#309)
edx-requirements-bot Mar 28, 2024
ce27d06
feat: Update setup.py
awais786 Mar 31, 2024
4fd9d90
feat: Update tox.ini
awais786 Mar 31, 2024
49d78fc
docs: Update changelog date and messag.
feanil Apr 1, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [quality, django32, django42, check_keywords]
python-version: ['3.8', '3.11', '3.12']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are upgrading to Python 3.11 now, we can skip running tests with 3.12 for now.

Suggested change
python-version: ['3.8', '3.11', '3.12']
python-version: ['3.8', '3.11']

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think since the tests are passing on both, we should run both, we'll want to drop 3.11 after we cut redwood almost immediately so best to start testing 3.12 where it's already passing.

toxenv: [quality, django42, check_keywords]

steps:
- uses: actions/checkout@v3
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,18 @@ Unreleased

*

Added
~~~~~~~

[4.3.0] - 2024-04-01
--------------------

* Added support for python3.11 and 3.12
* Dropped django 3.2 support.

[4.2.0] - 2023-08-03
--------------------

Added
~~~~~~~
* Added support for Django 4.2

[4.1.0] - 2022-01-28
Expand Down
2 changes: 1 addition & 1 deletion auth_backends/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
These package is designed to be used primarily with Open edX Django projects, but should be compatible with non-edX
projects as well.
"""
__version__ = '4.2.0' # pragma: no cover
__version__ = '4.3.0' # pragma: no cover
14 changes: 8 additions & 6 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
#
# make upgrade
#
asgiref==3.7.2
asgiref==3.8.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
certifi==2024.2.2
# via requests
cffi==1.16.0
Expand All @@ -20,7 +24,7 @@ defusedxml==0.8.0rc2
# via
# python3-openid
# social-auth-core
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand All @@ -31,21 +35,19 @@ oauthlib==3.2.2
# via
# requests-oauthlib
# social-auth-core
pycparser==2.21
pycparser==2.22
# via cffi
pyjwt[crypto]==2.8.0
# via
# -r requirements/base.in
# social-auth-core
python3-openid==3.2.0
# via social-auth-core
pytz==2024.1
# via django
requests==2.31.0
# via
# requests-oauthlib
# social-auth-core
requests-oauthlib==1.3.1
requests-oauthlib==2.0.0
# via social-auth-core
six==1.16.0
# via -r requirements/base.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#
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.2.0
# via virtualenv
Expand Down
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,20 @@


# 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
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
4 changes: 4 additions & 0 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0


# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
42 changes: 22 additions & 20 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ argparse==1.4.0
# via
# -r requirements/test.txt
# unittest2
asgiref==3.7.2
asgiref==3.8.1
# via
# -r requirements/test.txt
# django
Expand All @@ -17,7 +17,12 @@ astroid==3.1.0
# -r requirements/test.txt
# pylint
# pylint-celery
build==1.0.3
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# django
build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down Expand Up @@ -45,11 +50,11 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.6.0
code-annotations==1.7.0
# via
# -r requirements/test.txt
# edx-lint
coverage[toml]==7.4.3
coverage[toml]==7.4.4
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -72,21 +77,21 @@ distlib==0.3.8
# -r requirements/ci.txt
# -r requirements/test.txt
# virtualenv
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
# edx-django-release-util
# social-auth-app-django
edx-django-release-util==1.3.0
edx-django-release-util==1.4.0
# via -r requirements/test.txt
edx-lint==5.3.6
# via -r requirements/test.txt
exceptiongroup==1.2.0
# via
# -r requirements/test.txt
# pytest
filelock==3.13.1
filelock==3.13.3
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand All @@ -98,8 +103,9 @@ idna==3.6
# via
# -r requirements/test.txt
# requests
importlib-metadata==7.0.1
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# -r requirements/pip-tools.txt
# build
iniconfig==2.0.0
Expand Down Expand Up @@ -131,7 +137,7 @@ oauthlib==3.2.2
# -r requirements/test.txt
# requests-oauthlib
# social-auth-core
packaging==23.2
packaging==24.0
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand All @@ -143,7 +149,7 @@ pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.txt
platformdirs==4.2.0
# via
Expand All @@ -164,7 +170,7 @@ py==1.11.0
# tox
pycodestyle==2.11.1
# via -r requirements/test.txt
pycparser==2.21
pycparser==2.22
# via
# -r requirements/test.txt
# cffi
Expand Down Expand Up @@ -199,12 +205,12 @@ pyproject-hooks==1.0.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.0.2
pytest==8.1.1
# via
# -r requirements/test.txt
# pytest-cov
# pytest-django
pytest-cov==4.1.0
pytest-cov==5.0.0
# via -r requirements/test.txt
pytest-django==4.8.0
# via -r requirements/test.txt
Expand All @@ -216,10 +222,6 @@ python3-openid==3.2.0
# via
# -r requirements/test.txt
# social-auth-core
pytz==2024.1
# via
# -r requirements/test.txt
# django
pyyaml==6.0.1
# via
# -r requirements/test.txt
Expand All @@ -230,7 +232,7 @@ requests==2.31.0
# -r requirements/test.txt
# requests-oauthlib
# social-auth-core
requests-oauthlib==1.3.1
requests-oauthlib==2.0.0
# via
# -r requirements/test.txt
# social-auth-core
Expand Down Expand Up @@ -302,11 +304,11 @@ virtualenv==20.25.1
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
wheel==0.42.0
wheel==0.43.0
# via
# -r requirements/pip-tools.txt
# pip-tools
zipp==3.17.0
zipp==3.18.1
# via
# -r requirements/pip-tools.txt
# importlib-metadata
Expand Down
16 changes: 9 additions & 7 deletions requirements/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
#
# make upgrade
#
build==1.0.3
build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.1
# via build
packaging==23.2
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
packaging==24.0
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
Expand All @@ -23,9 +25,9 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
wheel==0.43.0
# via pip-tools
zipp==3.17.0
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.42.0
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.1
setuptools==69.2.0
# via -r requirements/pip.in
Loading
Loading