Update python deps and pin urllib3 version to 1.26.18 + Update pre-co…

…mmit-config to format requirements.in files as well + Apply pre-commit
DitZii · Oct 18, 2023 · bd6065a · bd6065a
1 parent 619e564
commit bd6065a
Show file tree

Hide file tree

Showing 16 changed files with 662 additions and 256 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,6 +6,9 @@ repos:
     rev: c4a0b883114b00d8d76b479c820ce7950211c99b # frozen: v4.5.0
     hooks:
       - id: requirements-txt-fixer
+        name: Fix requirements.txt and requirements.in files
+        description: Sorts entries in requirements.txt and requirements.in files.
+        files: (requirements|constraints).*\.(txt|in)$
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
@@ -14,7 +17,7 @@ repos:
       - id: check-case-conflict
 
   - repo: https://github.com/ambv/black
-    rev: e87737140f32d3cd7c44ede75f02dcd58e55820e # frozen: 23.9.1
+    rev: 9edba85f71d50d12996ef7bda576426362016171 # frozen: 23.10.0
     hooks:
       - id: black
         name: Black Python Formatter

diff --git a/docs/requirements.in b/docs/requirements.in
@@ -1,5 +1,5 @@
+mike==1.1.2
 mkdocs==1.5.3
 mkdocs-material==9.4.6
-pytablewriter==1.2.0
-mike==1.1.2
 mkdocs-print-site-plugin==2.3.6
+pytablewriter==1.2.0
diff --git a/src/common/gen/requirements.in b/src/common/gen/requirements.in
@@ -3,3 +3,4 @@ jinja2==3.1.2
 kubernetes==28.1.0
 python-dotenv==1.0.0
 redis==5.0.1
+urllib3==1.26.18
diff --git a/src/common/gen/requirements.txt b/src/common/gen/requirements.txt
@@ -301,6 +301,7 @@ urllib3==1.26.18 \
     --hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \
     --hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0
     # via
+    #   -r requirements.in
     #   docker
     #   kubernetes
     #   requests

diff --git a/src/deps/requirements-deps.in b/src/deps/requirements-deps.in
@@ -1,7 +1,7 @@
 pip==23.3
-pip-tools==7.3.0
-wheel==0.41.2
-setuptools==68.2.2
 pip-compile-multi==2.6.3
+pip-tools==7.3.0
 pip-upgrader==1.4.15
+setuptools==68.2.2
 tomli==2.0.1
+wheel==0.41.2
diff --git a/src/deps/requirements.in b/src/deps/requirements.in
@@ -1,4 +1,4 @@
 pip==23.3
 pip-tools==7.3.0
-wheel==0.41.2
 setuptools==68.2.2
+wheel==0.41.2
diff --git a/src/scheduler/requirements.in b/src/scheduler/requirements.in
@@ -1,7 +1,7 @@
 certbot==2.7.1
+configobj==5.0.8
 cryptography==41.0.4
 maxminddb==2.4.0
 python-magic==0.4.27
 schedule==1.2.1
 urllib3==1.26.18
-configobj==5.0.8