pyproject.toml: update docker to 7.1.x to handle interaction with req…

…uests 2.32

remade requirements-dev.txt, requirements.txt, .pre-commit-config.yaml

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       - id: black
         language_version: python3.10
   - repo: http://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
+    rev: v1.10.1
     hooks:
       - id: mypy
         entry: bin/pre-commit-wrapper.py mypy

pyproject.toml

@@ -8,7 +8,7 @@ version = "0.0.1"
 dependencies = [
   "beautifulsoup4 ~= 4.12.2",
   "boto3 ~= 1.28.44",
-  "docker ~= 6.1.0",
+  "docker ~= 7.1.0",
   "elasticsearch ~= 8.12.0",
   # lxml installed by some other package?
   "mediacloud-metadata ~= 0.12.0",

requirements-dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --allow-unsafe --extra=dev --output-file=requirements-dev.txt --strip-extras pyproject.toml
@@ -26,15 +26,15 @@ boilerpy3==1.0.7
     # via mediacloud-metadata
 boto3==1.28.85
     # via story-indexer (pyproject.toml)
-boto3-stubs==1.34.128
+boto3-stubs==1.34.139
     # via story-indexer (pyproject.toml)
 botocore==1.31.85
     # via
     #   boto3
     #   s3transfer
-botocore-stubs==1.34.128
+botocore-stubs==1.34.139
     # via boto3-stubs
-certifi==2024.6.2
+certifi==2024.7.4
     # via
     #   elastic-transport
     #   requests
@@ -77,19 +77,21 @@ defusedxml==0.7.1
     # via scrapy
 distlib==0.3.8
     # via virtualenv
-docker==6.1.3
+docker==7.1.0
     # via story-indexer (pyproject.toml)
 elastic-transport==8.13.1
     # via elasticsearch
 elasticsearch==8.12.1
     # via story-indexer (pyproject.toml)
+exceptiongroup==1.2.1
+    # via pytest
 faust-cchardet==2.1.19
     # via mediacloud-metadata
 feedfinder2==0.0.4
     # via newspaper3k
 feedparser==6.0.11
     # via newspaper3k
-filelock==3.15.1
+filelock==3.15.4
     # via
     #   tldextract
     #   virtualenv
@@ -154,11 +156,13 @@ lxml-stubs==0.5.1
     # via story-indexer (pyproject.toml)
 markupsafe==2.1.5
     # via jinja2
+mc-manage @ git+https://github.com/mediacloud/[email protected]
+    # via story-indexer (pyproject.toml)
 mediacloud-metadata==0.12.0
     # via story-indexer (pyproject.toml)
 mypy==1.5.1
     # via story-indexer (pyproject.toml)
-mypy-boto3-s3==1.34.120
+mypy-boto3-s3==1.34.138
     # via boto3-stubs
 mypy-extensions==1.0.0
     # via mypy
@@ -174,7 +178,6 @@ orderedmultidict==1.0.1
     # via furl
 packaging==24.1
     # via
-    #   docker
     #   parsel
     #   pytest
     #   scrapy
@@ -184,7 +187,7 @@ parsel==1.9.1
     #   scrapy
 pika==1.3.2
     # via story-indexer (pyproject.toml)
-pillow==10.3.0
+pillow==10.4.0
     # via
     #   goose3
     #   newspaper3k
@@ -200,6 +203,10 @@ py3langid==0.2.2
     # via mediacloud-metadata
 pyahocorasick==2.1.0
     # via goose3
+pyairtable==2.3.3
+    # via
+    #   mc-manage
+    #   story-indexer (pyproject.toml)
 pyasn1==0.6.0
     # via
     #   pyasn1-modules
@@ -208,9 +215,9 @@ pyasn1-modules==0.4.0
     # via service-identity
 pycparser==2.22
     # via cffi
-pydantic==2.7.4
+pydantic==2.8.2
     # via pyairtable
-pydantic-core==2.18.4
+pydantic-core==2.20.1
     # via pydantic
 pydispatcher==2.0.7
     # via scrapy
@@ -294,13 +301,17 @@ tldextract==5.1.2
     #   newspaper3k
     #   scrapy
     #   surt
+tomli==2.0.1
+    # via
+    #   mypy
+    #   pytest
 tqdm==4.66.4
     # via nltk
 trafilatura==1.6.4
     # via mediacloud-metadata
 twisted==24.3.0
     # via scrapy
-types-awscrt==0.20.12
+types-awscrt==0.21.0
     # via botocore-stubs
 types-beautifulsoup4==4.12.0.20240511
     # via story-indexer (pyproject.toml)
@@ -314,7 +325,9 @@ types-s3transfer==0.10.1
     # via boto3-stubs
 typing-extensions==4.12.2
     # via
+    #   boto3-stubs
     #   mypy
+    #   mypy-boto3-s3
     #   pyairtable
     #   pydantic
     #   pydantic-core
@@ -335,7 +348,7 @@ urllib3==2.0.7
     #   sentry-sdk
     #   trafilatura
     #   types-requests
-virtualenv==20.26.2
+virtualenv==20.26.3
     # via pre-commit
 w3lib==2.2.1
     # via
@@ -344,15 +357,13 @@ w3lib==2.2.1
     #   scrapy
 warcio==1.7.4
     # via story-indexer (pyproject.toml)
-websocket-client==1.8.0
-    # via docker
 zope-interface==6.4.post2
     # via
     #   scrapy
     #   twisted
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==70.0.0
+setuptools==70.2.0
     # via
     #   scrapy
     #   supervisor

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --allow-unsafe --strip-extras pyproject.toml
@@ -28,7 +28,7 @@ botocore==1.31.85
     # via
     #   boto3
     #   s3transfer
-certifi==2024.6.2
+certifi==2024.7.4
     # via
     #   elastic-transport
     #   requests
@@ -67,7 +67,7 @@ dateparser==1.2.0
     #   mediacloud-metadata
 defusedxml==0.7.1
     # via scrapy
-docker==6.1.3
+docker==7.1.0
     # via story-indexer (pyproject.toml)
 elastic-transport==8.13.1
     # via elasticsearch
@@ -79,7 +79,7 @@ feedfinder2==0.0.4
     # via newspaper3k
 feedparser==6.0.11
     # via newspaper3k
-filelock==3.15.1
+filelock==3.15.4
     # via tldextract
 furl==2.1.3
     # via mediacloud-metadata
@@ -140,7 +140,6 @@ orderedmultidict==1.0.1
     # via furl
 packaging==24.1
     # via
-    #   docker
     #   parsel
     #   scrapy
 parsel==1.9.1
@@ -149,7 +148,7 @@ parsel==1.9.1
     #   scrapy
 pika==1.3.2
     # via story-indexer (pyproject.toml)
-pillow==10.3.0
+pillow==10.4.0
     # via
     #   goose3
     #   newspaper3k
@@ -273,15 +272,13 @@ w3lib==2.2.1
     #   scrapy
 warcio==1.7.4
     # via story-indexer (pyproject.toml)
-websocket-client==1.8.0
-    # via docker
 zope-interface==6.4.post2
     # via
     #   scrapy
     #   twisted
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==70.0.0
+setuptools==70.2.0
     # via
     #   scrapy
     #   supervisor