From 8e71f4113a55630e2b4ec78b63bbe1ea67d83975 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 14 Jul 2021 18:31:45 +0000 Subject: [PATCH] Remove oic patch - 1.3.0 contains the fix. Commit ready for merge. - Legacy-Id: 19214 --- ietf/settings.py | 1 - patch/fix-oic-logging.patch | 11 ----------- requirements.txt | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 patch/fix-oic-logging.patch diff --git a/ietf/settings.py b/ietf/settings.py index 4e9e05023..bd5202694 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -1151,7 +1151,6 @@ CHECKS_LIBRARY_PATCHES_TO_APPLY = [ 'patch/change-oidc-provider-field-sizes-228.patch', 'patch/fix-oidc-access-token-post.patch', 'patch/fix-jwkest-jwt-logging.patch', - 'patch/fix-oic-logging.patch', 'patch/fix-django-password-strength-kwargs.patch', 'patch/add-django-http-cookie-value-none.patch', 'patch/django-cookie-delete-with-all-settings.patch', diff --git a/patch/fix-oic-logging.patch b/patch/fix-oic-logging.patch deleted file mode 100644 index 1b93d1155..000000000 --- a/patch/fix-oic-logging.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- oic/utils/keyio.py.orig 2020-06-06 18:49:44.819104615 +0200 -+++ oic/utils/keyio.py 2020-06-06 18:49:47.523182608 +0200 -@@ -191,7 +191,7 @@ - args["headers"] = {"If-None-Match": self.etag} - - try: -- logging.debug("KeyBundle fetch keys from: %s", self.source) -+ logger.debug("KeyBundle fetch keys from: %s", self.source) - r = requests.get(self.source, **args) - except Exception as err: - logger.error(err) diff --git a/requirements.txt b/requirements.txt index 40588ec7a..3aac7dbc5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ markdown2>=2.3.8 mock>=2.0.0 mypy>=0.782,<0.790 # Version requirements determined by django-stubs. mysqlclient>=1.3.13,!=2.0.2 -oic>=1.2 +oic>=1.3 pathlib>=1.0 pathlib2>=2.3.0 Pillow>=3.0