aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2021-01-14 17:16:16 -0800
committerBryan Newbold <bnewbold@archive.org>2021-01-14 17:16:18 -0800
commit4bf33eb6b7389541d7c5a8904042e8dc25ac4452 (patch)
tree2c487091ec11caa525a19fdf6b05b5dca9907ce2
parente01ca16efb5fe6afb671bdbb77ec44f85db11d62 (diff)
downloadfatcat-scholar-4bf33eb6b7389541d7c5a8904042e8dc25ac4452.tar.gz
fatcat-scholar-4bf33eb6b7389541d7c5a8904042e8dc25ac4452.zip
pipenv: lock minio S3 library to <7.0.0
In this upstream commit: https://github.com/minio/minio-py/commit/b81883a98e6f8a09e2903609caabbf0956dd0ec9 The API for errors changes, which makes it harder for use to catch specific exceptions (such as "NoSuchKey" as a Not Found / 404 error). Instead of refactoring, just going to pin the library. We should probably remove this library for a non-implementation-specific S3 client at some point; minio seems simpler than, eg, boto3, but there is probably something ever simpler out there.
-rw-r--r--Pipfile2
-rw-r--r--Pipfile.lock29
2 files changed, 20 insertions, 11 deletions
diff --git a/Pipfile b/Pipfile
index 04c6469..937ed4b 100644
--- a/Pipfile
+++ b/Pipfile
@@ -19,7 +19,7 @@ httptools = "*"
internetarchive = "*"
jinja2 = "*"
lxml = "*"
-minio = "*"
+minio = "<7.0.0"
pycountry = "==19.8.18"
pydantic = "*"
pylatexenc = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index bf47225..be2da96 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "ed7e19fed92dbe38f0a775a33c83cfdff502d566e21785c614ad55bd42e8d9ad"
+ "sha256": "80ff024108b260ead55bb39b6d034d0bd6cca5f689e5eaf1d96094942ae4e816"
},
"pipfile-spec": 6,
"requires": {
@@ -135,6 +135,14 @@
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
"version": "==7.1.2"
},
+ "configparser": {
+ "hashes": [
+ "sha256:005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a",
+ "sha256:08e8a59ef1817ac4ed810bb8e17d049566dd6e024e7566f6285c756db2bb4ff8"
+ ],
+ "markers": "python_version >= '3.6'",
+ "version": "==5.0.1"
+ },
"confluent-kafka": {
"hashes": [
"sha256:00acc73f7d49961bf427f5e4fd6c0a220a6bfa5ccc91e0ad1f9ffa1751a169b0",
@@ -388,11 +396,12 @@
},
"minio": {
"hashes": [
- "sha256:d595e255e3220101dac3fab97bcfa48fbd6639e62daf7b7c928a15c71d9d4ac4",
- "sha256:e1468f7214c986b00f69525c984c9f5757916e06ce9f3c8450c980a8c16b67e8"
+ "sha256:7cb075b56bac894551304cb824f958069a84e0dd2d0a685f9bed3c05e15727bf",
+ "sha256:acae9bfae0aec1b92025bd63e18135ebb4994c84600716c5323e14cb0c9a0b03",
+ "sha256:eec4ab073ff979c34e928e532d8acc1d40d61ba4404709cf27ab3ecdcfa2a561"
],
"index": "pypi",
- "version": "==7.0.1"
+ "version": "==6.0.2"
},
"multidict": {
"hashes": [
@@ -593,7 +602,7 @@
"sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
"sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'",
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
"version": "==1.26.2"
},
"uvicorn": {
@@ -776,7 +785,7 @@
"sha256:fda29412a66099af6d6de0baa6bd7c52674de177ec2ad2630ca264142d69c6c7",
"sha256:ff1330e8bc996570221b450e2d539134baa9465f5cb98aff0e0f73f34172e0ae"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'",
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
"version": "==5.3.1"
},
"decorator": {
@@ -812,10 +821,10 @@
},
"importlab": {
"hashes": [
- "sha256:d855350d19dc10a17aabd2fe6f4b428ff1a936071f692fbf686a73694d26a51c"
+ "sha256:056503329df1ba8f6291a4b548042aa18620ad91d39388ba58044f0fd44ff83e"
],
- "markers": "python_version >= '2.7'",
- "version": "==0.5.1"
+ "markers": "python_version >= '3.6'",
+ "version": "==0.6.1"
},
"iniconfig": {
"hashes": [
@@ -1195,7 +1204,7 @@
"sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08",
"sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'",
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
"version": "==1.26.2"
},
"wcwidth": {