Skip to content

Commit

Permalink
Merge pull request #580 from UW-GAC/maint/python-3.12
Browse files Browse the repository at this point in the history
Switch future CI to use python 3.12
  • Loading branch information
amstilp authored May 23, 2024
2 parents 4231aa3 + a3a865c commit 4efc189
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@ jobs:
backend: ["sqlite", "mariadb"]
mariadb-version: ["10.4"]
include:
# Not sure yet how best to include CI for a newer python version with the pip-tools workflow.
- python-version: 3.11 # Possible future version.
- python-version: 3.12 # Possible future version.
backend: "mariadb"
mariadb-version: "10.5"
pip-recompile: true
- python-version: 3.11 # Possible future version.
- python-version: 3.12 # Possible future version.
backend: "mariadb"
mariadb-version: "10.11"
pip-recompile: true
Expand Down
2 changes: 1 addition & 1 deletion primed/drupal_oauth_provider/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def get_mocked_response(self):
# This login response mimics drupals in that it contains a set of scopes
# and the uid which has the name sub
def get_login_response_json(self, with_refresh_token=True):
now = datetime.datetime.utcnow()
now = datetime.datetime.now(datetime.timezone.utc)
app = get_adapter().get_app(request=None, provider=self.provider_id)
allowed_audience = app.client_id
id_token = sign_id_token(
Expand Down
1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ filterwarnings =
ignore:pkg_resources is deprecated as an API.:DeprecationWarning:model_utils
# Warning raised by pkg_resources via model_utils. ??
ignore:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning:pkg_resources
ignore:'pkgutil.find_loader' is deprecated and slated for removal in Python 3.14:DeprecationWarning
2 changes: 1 addition & 1 deletion requirements/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ django-dbbackup # https://github.com/jazzband/django-dbbackup
django-extensions # https://github.com/django-extensions/django-extensions

# anvil_consortium_manager
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/[email protected]
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/[email protected].1

# Simple history - model history tracking
django-simple-history
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ django==4.2.13
# django-tables2
django-allauth==0.54.0
# via -r requirements/requirements.in
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/[email protected]
django-anvil-consortium-manager @ git+https://github.com/UW-GAC/[email protected].1
# via -r requirements/requirements.in
django-autocomplete-light==3.11.0
# via django-anvil-consortium-manager
Expand Down

0 comments on commit 4efc189

Please sign in to comment.