From 6a155e1c67f026bd9a3f7bba632434b96310a471 Mon Sep 17 00:00:00 2001
From: "Jens W. Klein" <jk@kleinundpartner.at>
Date: Thu, 12 Aug 2021 23:53:05 +0200
Subject: [PATCH 1/2] Update PyJWT

---
 versions.cfg | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/versions.cfg b/versions.cfg
index eeccb61515..bf6fb8573f 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -110,7 +110,7 @@ ordereddict = 1.1
 pathlib = 1.0.1
 piexif = 1.1.3
 pillow = 8.3.1
-pyjwt = 1.7.1
+pyjwt = 2.1.0
 pyrsistent = 0.18.0
 pyscss = 1.3.7
 python-dateutil = 2.8.2
@@ -296,8 +296,8 @@ Deprecated = 1.2.12
 distro = 1.6.0
 fancycompleter = 0.9.1
 FormEncode = 1.3.1
-gitdb2 = 2.0.6
-gitpython = 3.0.5
+gitdb = 4.0.7
+gitpython = 3.1.18
 html5lib = 1.1i
 httplib2 = 0.19.1
 launchpadlib = 1.10.13
@@ -308,12 +308,12 @@ pdbpp = 0.10.3
 pep517 = 0.11.0
 progress = 1.6
 prompt-toolkit = 1.0.18
-PyGithub = 1.47
+pygithub = 1.55
+pynacl = 1.4.0
 pyrepl = 0.9.0
 pyroma = 3.2
 pynacl = 1.4.0
-smmap = 3.0.4
-smmap2 = 3.0.1
+smmap = 4.0.0
 stdlib-list = 0.8.0
 testresources = 2.0.1
 tomli = 1.2.1

From 19b1a6d6c10cc56f1be8ef060f06736ef27fc5a1 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Thu, 14 Apr 2022 21:50:03 +0200
Subject: [PATCH 2/2] Pin PyGitHub higher so it works with newer pyjwt.

Added pynacl pin, new dependency of pygithub.
---
 versions-extra.cfg | 5 ++---
 versions.cfg       | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/versions-extra.cfg b/versions-extra.cfg
index a526fe2216..cabacef286 100644
--- a/versions-extra.cfg
+++ b/versions-extra.cfg
@@ -37,7 +37,8 @@ pkginfo = 1.8.2
 plone.releaser = 1.8.6
 plone.versioncheck = 1.7.0
 progress = 1.6
-PyGithub = 1.54.1
+pygithub = 1.55
+pynacl = 1.5.0
 pyparsing = 3.0.8
 pyrepl = 0.9.0
 pyroma = 4.0b2
@@ -65,5 +66,3 @@ zodbverify = 1.1.0
 [versionannotations]
 towncrier =
     21.9.0 introduced option '--version' which breaks zestreleaser.towncrier.
-PyGithub =
-    PyGitHub 1.55+ requires PyJWT >= 2, which plone.restapi fails with, see pyjwt version annotation
diff --git a/versions.cfg b/versions.cfg
index e5ebe9ca5a..453b904b01 100644
--- a/versions.cfg
+++ b/versions.cfg
@@ -221,8 +221,6 @@ selenium = 3.141.0
 # keep this alphabetical please
 prompt-toolkit =
     Requirement of robotframework-debuglibrary: prompt-toolkit<2
-pyjwt =
-    plone.restapi fails with PyJWT >=2 - see https://github.com/plone/plone.restapi/issues/1193 and see PyGithub version annotation in versions-extra.cfg
 robotframework =
     Since 3.2.x the robot.parsing module API has breaking changes, thus we need to adopt before upgrading.
 Pillow =