From a003914e91433c97e523093c4db2afc199f7df45 Mon Sep 17 00:00:00 2001
From: Daoud Clarke <daoud.clarke@gmail.com>
Date: Fri, 17 Jun 2022 22:14:55 +0100
Subject: [PATCH] Fix boto3 dependency
---
poetry.lock | 25 ++++++++++++-------------
pyproject.toml | 6 ++----
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/poetry.lock b/poetry.lock
index 0a52633..82fdd04 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -76,14 +76,14 @@ numpy = ">=1.15.0"
[[package]]
name = "boto3"
-version = "1.24.10"
+version = "1.24.12"
description = "The AWS SDK for Python"
category = "main"
optional = false
python-versions = ">= 3.7"
[package.dependencies]
-botocore = ">=1.27.10,<1.28.0"
+botocore = ">=1.27.12,<1.28.0"
jmespath = ">=0.7.1,<2.0.0"
s3transfer = ">=0.6.0,<0.7.0"
@@ -92,7 +92,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
[[package]]
name = "botocore"
-version = "1.27.10"
+version = "1.27.12"
description = "Low-level, data-driven core of boto 3."
category = "main"
optional = false
@@ -185,7 +185,6 @@ spacy = ">=3.2.0,<3.3.0"
[package.source]
type = "url"
url = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.2.0/en_core_web_sm-3.2.0.tar.gz"
-
[[package]]
name = "fastapi"
version = "0.70.1"
@@ -244,7 +243,7 @@ i18n = ["Babel (>=2.7)"]
[[package]]
name = "jmespath"
-version = "1.0.0"
+version = "1.0.1"
description = "JSON Matching Expressions"
category = "main"
optional = false
@@ -929,12 +928,12 @@ cffi = {version = ">=1.11", markers = "platform_python_implementation == \"PyPy\
cffi = ["cffi (>=1.11)"]
[extras]
-indexer = ["boto3", "ujson", "warcio", "idna", "beautifulsoup4", "lxml", "jusText", "langdetect", "pyarrow", "pyspark", "Levenshtein", "spacy", "en-core-web-sm"]
+indexer = ["ujson", "warcio", "idna", "beautifulsoup4", "lxml", "jusText", "langdetect", "pyarrow", "pyspark", "Levenshtein", "spacy", "en-core-web-sm"]
[metadata]
lock-version = "1.1"
python-versions = ">=3.10,<3.11"
-content-hash = "e9fd2b7a725d4d7d6fd161e112310dee12d1ee0cf7abdfd799ac9af234c4e2db"
+content-hash = "0782bf407e18e268c5a53aede8595a60b1a545e4ed3709e87191f2bb1678e92c"
[metadata.files]
anyio = [
@@ -979,12 +978,12 @@ blis = [
{file = "blis-0.7.7.tar.gz", hash = "sha256:5d4a81f9438db7a19ac8e64ad41331f65a659ea8f3bb1889a9c2088cfd9fe104"},
]
boto3 = [
- {file = "boto3-1.24.10-py3-none-any.whl", hash = "sha256:32ffc0fd50408acc710cf5ce40037aa3c14926d6e3f6fbf61ed5990fb63cd881"},
- {file = "boto3-1.24.10.tar.gz", hash = "sha256:88fd816274d4b64bcf90889441d4efa5f16a0048ed670bc33cbd0f5a678313a6"},
+ {file = "boto3-1.24.12-py3-none-any.whl", hash = "sha256:0b9757575b8003928defc5fb6e816936fa1bdb1384d0edec6622bb9fb104e96c"},
+ {file = "boto3-1.24.12.tar.gz", hash = "sha256:f39b91a4c3614db8e44912ee82426fb4b16d5df2cd66883f3aff6f76d7f5d310"},
]
botocore = [
- {file = "botocore-1.27.10-py3-none-any.whl", hash = "sha256:24ec42b4f29a50f7ef78f9f863c3c25e00f65b5a48db669c8068457789a90803"},
- {file = "botocore-1.27.10.tar.gz", hash = "sha256:b39da97452c9e2c856e7778d8c908252394da81e2e5792f1d4cb0ece4ce1043a"},
+ {file = "botocore-1.27.12-py3-none-any.whl", hash = "sha256:b8ac156e55267da6e728ea0b806bfcd97adf882801cffe7849c4b88ce4780326"},
+ {file = "botocore-1.27.12.tar.gz", hash = "sha256:17d3ec9f684d21e06b64d9cb224934557bcd95031e2ecb551bf16271e8722fec"},
]
catalogue = [
{file = "catalogue-2.0.7-py3-none-any.whl", hash = "sha256:cab4feda641fe05da1e6a1a9d123b0869d5ca324dcd93d4a5c384408ab62e7fb"},
@@ -1098,8 +1097,8 @@ jinja2 = [
{file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
]
jmespath = [
- {file = "jmespath-1.0.0-py3-none-any.whl", hash = "sha256:e8dcd576ed616f14ec02eed0005c85973b5890083313860136657e24784e4c04"},
- {file = "jmespath-1.0.0.tar.gz", hash = "sha256:a490e280edd1f57d6de88636992d05b71e97d69a26a19f058ecf7d304474bf5e"},
+ {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"},
+ {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"},
]
joblib = [
{file = "joblib-1.1.0-py2.py3-none-any.whl", hash = "sha256:f21f109b3c7ff9d95f8387f752d0d9c34a02aa2f7060c2135f465da0e5160ff6"},
diff --git a/pyproject.toml b/pyproject.toml
index 536f666..0bdc6e8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,6 +15,8 @@ fastapi = "^0.70.1"
uvicorn = "^0.16.0"
pyyaml = "==6.0"
boto3 = "^1.20.37"
+requests = "^2.27.1"
+psycopg2-binary = "^2.9.3"
# Optional dependencies do not get installed by default. Look under tool.poetry.extras section
# to see which extras to use.
@@ -31,14 +33,10 @@ Levenshtein = {version= "==0.16.0", optional = true}
# en-core-web-sm requires a compatible version of spacy
spacy = {version= "==3.2.1", optional = true}
en-core-web-sm = {url = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.2.0/en_core_web_sm-3.2.0.tar.gz", optional = true}
-requests = "^2.27.1"
-psycopg2-binary = "^2.9.3"
[tool.poetry.extras]
indexer = [
- "botocore",
- "boto3",
"ujson",
"warcio",
"idna",