Merge pull request #708 from bunkerity/dev

Merge branch "dev" into branch "staging"

.github/workflows/staging-create-infra.yml

@@ -34,7 +34,6 @@ jobs:
         if: inputs.TYPE != 'k8s'
         with:
           python-version: "3.11"
-          cache: "pip"
       - name: Install ansible
         run: pip install --no-cache-dir --require-hashes -r misc/requirements-ansible.txt
         if: inputs.TYPE != 'k8s'

.github/workflows/test-core-linux.yml

@@ -21,7 +21,6 @@ jobs:
         uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
         with:
           python-version: "3.11"
-          cache: "pip"
       - name: Install Firefox manually and dependencies
         run: |
           sudo apt purge -y firefox

.github/workflows/tests-ui-linux.yml

@@ -18,7 +18,6 @@ jobs:
         uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
         with:
           python-version: "3.11"
-          cache: "pip"
       - name: Install Firefox manually and dependencies
         run: |
           sudo apt purge -y firefox

.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

CHANGELOG.md

@@ -20,7 +20,7 @@
 - [MISC] Optimize the way the UI handles services creation and edition
 - [MISC] Optimize certbot renew script to renew all domains in one command
 
-## v1.5.2 - 2023/10/10
+## v1.5.2 - 2023/09/10
 
 - [BUGFIX] Fix UI fetching only default values from the database (fixes no trash button too)
 - [BUGFIX] Fix infinite loop when using autoconf

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

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

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

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

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

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

src/ui/static/js/utils/form.js

@@ -222,8 +222,10 @@ class DisabledPop {
   init() {
     window.addEventListener("pointerover", (e) => {
       //for checkbox and regular inputs
-      if (e.target.tagName === "INPUT" &&
-      e.target.hasAttribute('data-default-method')) {
+      if (
+        e.target.tagName === "INPUT" &&
+        e.target.hasAttribute("data-default-method")
+      ) {
         const el = e.target;
         this.showPopup(el, "input");
       }

tests/core/badbehavior/requirements.in

@@ -1,2 +1,2 @@
-requests==2.31.0
 docker==6.1.3
+requests==2.31.0

tests/core/db/requirements.in

@@ -1,4 +1,4 @@
-sqlalchemy==2.0.22
+cryptography==41.0.4
 psycopg2-binary==2.9.9
 PyMySQL==1.1.0
-cryptography==41.0.4
+sqlalchemy==2.0.22

tests/core/redis/requirements.in

@@ -1,5 +1,5 @@
-requests==2.31.0
-redis==5.0.1
 fastapi==0.103.2
-uvicorn[standard]==0.23.2
+redis==5.0.1
+requests==2.31.0
 selenium==4.14.0
+uvicorn[standard]==0.23.2

tests/core/reversescan/requirements.in

@@ -1,3 +1,3 @@
-requests==2.31.0
 fastapi==0.103.2
+requests==2.31.0
 uvicorn[standard]==0.23.2

tests/core/selfsigned/requirements.in

@@ -1,2 +1,2 @@
-requests==2.31.0
 cryptography==41.0.4
+requests==2.31.0

tests/requirements.in

@@ -1,2 +1,2 @@
-requests==2.31.0
 pyyaml==6.0.1
+requests==2.31.0

tests/ui/requirements.in

@@ -1,3 +1,3 @@
-selenium==4.14.0
 requests==2.31.0
+selenium==4.14.0
 urllib3[socks]==2.0.7