Skip to content
New issue

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

#

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

Already on GitHub? # to your account

remove flask upper pin #336

Merged
merged 4 commits into from
Nov 5, 2024
Merged

remove flask upper pin #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3f309a
fix: for flask >= 3.0.0 compatibility
utnapischtim Sep 24, 2024
d1982c2
global: jws use from invenio-base
utnapischtim Sep 25, 2024
6ff4f35
setup: remove upper pins oauthlib,requests-oauthlib
utnapischtim Sep 25, 2024
426501d
chore: remove unused imports
utnapischtim Oct 10, 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
3 changes: 2 additions & 1 deletion invenio_oauthclient/handlers/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# This file is part of Invenio.
# Copyright (C) 2015-2019 CERN.
# Copyright (C) 2024 Graz University of Technology.
#
# Invenio is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.
Expand All @@ -11,7 +12,6 @@
from functools import partial, wraps

from flask import (
Markup,
current_app,
flash,
redirect,
Expand All @@ -23,6 +23,7 @@
from flask_security.utils import do_flash, get_message
from invenio_db import db
from invenio_i18n import gettext as _
from markupsafe import Markup

from ..errors import (
AlreadyLinkedError,
Expand Down
13 changes: 10 additions & 3 deletions invenio_oauthclient/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,30 @@
#
# This file is part of Invenio.
# Copyright (C) 2015-2023 CERN.
# Copyright (C) 2024 Graz University of Technology.
#
# Invenio is free software; you can redistribute it and/or modify it
# under the terms of the MIT License; see LICENSE file for more details.

"""Utility methods."""

from flask import current_app, request, session
from flask_login import current_user
from flask_principal import RoleNeed, UserNeed
from flask_principal import RoleNeed
from invenio_db.utils import rebuild_encrypted_properties
from itsdangerous import TimedJSONWebSignatureSerializer
from uritools import uricompose, urisplit
from werkzeug.local import LocalProxy
from werkzeug.utils import import_string

from .models import RemoteToken

try:
# itsdangerous < 2.1.0
from itsdangerous import TimedJSONWebSignatureSerializer
except ImportError:
# itsdangerous >= 2.1.0
from invenio_base.jws import TimedJSONWebSignatureSerializer


_security = LocalProxy(lambda: current_app.extensions["security"])


Expand Down
5 changes: 3 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ install_requires =
invenio-i18n>=2.0.0
invenio-mail>=1.0.2
invenio-theme>=3.0.0
oauthlib>=1.1.2,<3.0.0
requests-oauthlib>=0.6.2,<1.2.0
oauthlib>=1.1.2
markupsafe>=2.1.5
requests-oauthlib>=0.6.2
uritools>=1.0.1
github3.py>=1.0.0a4
uritemplate>=3.0.1
Expand Down