Merge branch 'develop' into issue2791

.github/workflows/build.yml

@@ -123,19 +123,12 @@ jobs:
 
       - name: Retrieve Repository Docker metadata
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v5.0.0
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.DEFAULT_DOCKER_IMAGE }}
           labels: |
             org.opencontainers.image.url=https://nicolargo.github.io/glances/
 
-      - name: Cache Docker layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ env.NODE_ENV }}-${{ matrix.os }}-${{ matrix.tag.tag }}
-          restore-keys: ${{ runner.os }}-buildx-${{ env.NODE_ENV }}-${{ matrix.os }}
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -166,5 +159,7 @@ jobs:
           platforms: ${{ matrix.os != 'ubuntu' && env.DOCKER_PLATFORMS || env.DOCKER_PLATFORMS_UBUNTU }}
           target: ${{ matrix.tag.target }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
+          # GHA default behaviour overwrites last build cache. Causes alpine and ubuntu cache to overwrite each other.
-          cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
+          # Use `scope` with the os name to prevent that
+          cache-from: 'type=gha,scope=${{ matrix.os }}'
+          cache-to: 'type=gha,mode=max,scope=${{ matrix.os }}'

docker-requirements.txt

@@ -1,9 +1,8 @@
 # install with base requirements file
 -r requirements.txt
 
-docker>=6.1.1; python_version >= "3.7"
+docker>=6.1.1
-packaging; python_version >= "3.7"
+podman
-podman; python_version >= "3.6"
 python-dateutil
 requests
 six

optional-requirements.txt

@@ -7,35 +7,32 @@ cassandra-driver
 chevron
 docker>=6.1.1
 elasticsearch
-fastapi; python_version >= "3.8"
+fastapi
 graphitesender
 hddtemp
 influxdb>=1.0.0 # For InfluxDB < 1.8
-influxdb-client; python_version >= "3.7" # For InfluxDB >= 1.8
+influxdb-client # For InfluxDB >= 1.8
 jinja2
 kafka-python
 netifaces
-nvidia-ml-py; python_version >= "3.5"
+nvidia-ml-py
-packaging; python_version >= "3.7"
 paho-mqtt
 pika
-podman; python_version >= "3.6"
+podman
 potsdb
 prometheus_client
 pycouchdb
 pydantic
 pygal
 pymdstat
-pymongo; python_version >= "3.7"
+pymongo
 pySMART.smartx
-pysnmp-lextudio; python_version >= "3.7"
+pysnmp-lextudio
 python-dateutil
 pyzmq
 requests
-scandir; python_version < "3.5"
 six
 sparklines
 statsd
-uvicorn; python_version >= "3.8"
+uvicorn
-wifi
 zeroconf==0.131.0 # Waiting correction for ARMv7: https://github.com/python-zeroconf/python-zeroconf/issues/1372

pyproject.toml

@@ -1,8 +1,3 @@
-[tool.black]
-line-length = 120
-skip-string-normalization = true
-exclude = '\./glances/outputs/static/*'
-
 [tool.ruff]
 line-length = 120
 target-version = "py38"