From a0c3a9b97ffde5453cc7c9638fa7ef353eb486cf Mon Sep 17 00:00:00 2001 From: amar jandu Date: Mon, 10 Feb 2020 13:03:52 -0800 Subject: [PATCH 1/2] unpinned docutils requirement, need to sort out comments in requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4ca2de79..59d32e17 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ dcplib >= 2.0.2, < 3 # The version range of docutils is pinned by botocore. Pinning it here can cause a version conflict. # See https://github.com/boto/botocore/pull/1802, https://github.com/HumanCellAtlas/dcp-cli/issues/418 -docutils +# docutils google-auth >= 1.3.0, < 2 google-auth-oauthlib >= 0.4.1, < 2 From eb2260fd4fd086959329c726ad334f6c1af02522 Mon Sep 17 00:00:00 2001 From: amar jandu Date: Mon, 10 Feb 2020 13:20:14 -0800 Subject: [PATCH 2/2] attempting match the pin in botocore --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 59d32e17..8b5d4198 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ dcplib >= 2.0.2, < 3 # The version range of docutils is pinned by botocore. Pinning it here can cause a version conflict. # See https://github.com/boto/botocore/pull/1802, https://github.com/HumanCellAtlas/dcp-cli/issues/418 -# docutils +docutils < 0.16 google-auth >= 1.3.0, < 2 google-auth-oauthlib >= 0.4.1, < 2