From b6a5989a936c79e780c337dafc9d7eb2118ae780 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 10 Dec 2020 12:45:21 +0100
Subject: [PATCH] Work around pygithub pin

---
 lib/galaxy/dependencies/pipfiles/default/Pipfile              | 2 +-
 .../dependencies/pipfiles/default/pinned-dev-requirements.txt | 4 ++--
 .../dependencies/pipfiles/default/pinned-requirements.txt     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/galaxy/dependencies/pipfiles/default/Pipfile b/lib/galaxy/dependencies/pipfiles/default/Pipfile
index 6a17775dcc15..4d308c54e3c5 100644
--- a/lib/galaxy/dependencies/pipfiles/default/Pipfile
+++ b/lib/galaxy/dependencies/pipfiles/default/Pipfile
@@ -70,7 +70,7 @@ galaxy_sequence_utils = "*"
 h5py = "!=2.7.0, !=2.7.1"
 pykwalify = "*"
 "Cheetah3" = "*"
-requests = "*"
+requests = "<2.25"  # PyGitHub 1.54 requires requests < 2.25
 bioblend = "*"
 boto = "*"
 kombu = "*"
diff --git a/lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt b/lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt
index ef8aa2b8b5db..99638356df30 100644
--- a/lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt
+++ b/lib/galaxy/dependencies/pipfiles/default/pinned-dev-requirements.txt
@@ -49,7 +49,7 @@ pytest==6.1.2
 python-irodsclient==0.8.5
 pytz==2020.4
 recommonmark==0.6.0
-requests==2.25.0
+requests==2.24.0
 responses==0.12.1
 selenium==3.141.0
 six==1.15.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
@@ -66,7 +66,7 @@ sphinxcontrib-serializinghtml==1.1.4; python_version >= '3.5'
 testfixtures==6.16.0
 toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'
 twill==2.0.1
-urllib3==1.26.2; python_version != '3.4'
+urllib3==1.25.11; python_version != '3.4'
 watchdog==1.0.0
 wcwidth==0.2.5; sys_platform != 'win32'
 wrapt==1.12.1
diff --git a/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt b/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt
index 40d8f1955d4a..b4dde4cce3d2 100644
--- a/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pipfiles/default/pinned-requirements.txt
@@ -149,7 +149,7 @@ refgenconf==0.9.3
 repoze.lru==0.7
 requests-oauthlib==1.3.0
 requests-toolbelt==0.9.1
-requests==2.25.0
+requests==2.24.0
 requestsexceptions==1.4.0
 rfc3986==1.4.0
 routes==2.5.1
@@ -180,7 +180,7 @@ tzlocal==2.1
 ubiquerg==0.6.1
 unidecode==1.1.1; python_version >= '3.0'
 uritemplate==3.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
-urllib3==1.26.2; python_version != '3.4'
+urllib3==1.25.11; python_version != '3.4'
 uvicorn==0.13.0
 vine==5.0.0; python_version >= '3.6'
 wcwidth==0.2.5; sys_platform != 'win32'