Merge from develop

4 files changed, 63 insertions, 15 deletions

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ebcfa8a9..cff2ec1d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -10,10 +10,18 @@ For an enhancement or new feature: Describe your needs.
 
 #### Versions
 
-* Glances & psutil (glances -V):
-* Operating System (lsb_release -a):
-* How do you install Glances (Pypi package, script, package manager, source):
+* Glances & psutil versions: `To be completed with result of: glances -V`
+* Operating System: `To be completed with result of: lsb_release -a`
+* How do you install Glances (Pypi package, script, package manager, source): `To be completed`
+* Glances test (only available with Glances 3.1.7 or higher):
 
-#### Logs
+ ```
+ To be completed with result of: glances --issue
+ ```
 
-You can also pastebin the Glances logs file (https://glances.readthedocs.io/en/latest/config.html#logging)
+#### Configuration and log file
+
+You can also [pastebin](https://pastebin.com/):
+
+* the Glances configuration file (https://glances.readthedocs.io/en/latest/config.html#location)
+* the Glances log file (https://glances.readthedocs.io/en/latest/config.html#logging)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e602208c..46d4fe7b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -22,11 +22,20 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. GNU/Linux Ubuntu 20.04]
- - Glances Version [output of glances -V]
- - Glances logs file [output of tail -10 <glances logs file>]
- - Glances test [output of glances --issue] (only available with Glances 3.1.7 or higher)
+**Environement (please complete the following information)**
+ - Operating System (lsb_release -a or OS name/version): `To be completed with result of: lsb_release -a`
+ - Glances & psutil versions: `To be completed with result of: glances -V`
+ - How do you install Glances (Pypi package, script, package manager, source): `To be completed`
+ - Glances test (only available with Glances 3.1.7 or higher):
+
+ ```
+ To be completed with result of: glances --issue
+ ```
 
 **Additional context**
 Add any other context about the problem here.
+
+You can also [pastebin](https://pastebin.com/):
+
+* the Glances configuration file (https://glances.readthedocs.io/en/latest/config.html#location)
+* the Glances log file (https://glances.readthedocs.io/en/latest/config.html#logging)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cbe49e79..c4e48704 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,8 +8,10 @@ env:
   DEFAULT_DOCKER_IMAGE: nicolargo/glances
   NODE_ENV: ${{ (contains('refs/heads/master', github.ref) || startsWith(github.ref, 'refs/tags/v')) && 'prod' || 'dev' }}
   PUSH_BRANCH: ${{ 'refs/heads/develop' == github.ref || 'refs/heads/master' == github.ref || startsWith(github.ref, 'refs/tags/v') }}
-  # linux/arm/v6 support following issue #2120
+  # linux/arm/v7 (drop support for v6) support following issue - See issue #2120
   DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64,linux/386
+  # Ubuntu image only support linux/amd64 and linux/arm64 - See issue #2185
+  DOCKER_PLATFORMS_UBUNTU: linux/amd64,linux/arm64
 
 on:
   pull_request:
@@ -104,7 +106,7 @@ jobs:
 
       - name: Retrieve Repository Docker metadata
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v4.3.0
+        uses: crazy-max/ghaction-docker-meta@v4.4.0
         with:
           images: ${{ env.DEFAULT_DOCKER_IMAGE }}
           labels: |
@@ -144,7 +146,7 @@ jobs:
             CHANGING_ARG=${{ github.sha }}
           context: .
           file: "docker-files/${{ matrix.os }}.Dockerfile"
-          platforms: ${{env.DOCKER_PLATFORMS}}
+          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
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 808e7d7b..9956e345 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ name: test
 on: [push]
 
 jobs:
-  test:
+  test-linux:
 
     runs-on: ubuntu-latest
     strategy:
@@ -34,6 +34,8 @@ jobs:
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude=.git,./docs,./glances/outputs/static
 
+    # - name: Lint with Ruff
+    #   uses: chartboost/ruff-action@v1
 
     - name: Static type check
       run: |
@@ -54,4 +56,31 @@ jobs:
       uses: jpetrucciani/bandit-check@master
       with:
         #path: '-r --exit-zero --skip B104 ./glances/'
-        path: '-r --exit-zero --skip B104 ./glances/'
\ No newline at end of file
+        path: '-r --exit-zero --skip B104 ./glances/'
+
+
+  test-windows:
+
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+
+    steps:
+
+    - uses: actions/checkout@v3
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if (Test-Path -PathType Leaf "requirements.txt") { python -m pip install -r requirements.txt }
+        python setup.py install
+
+    - name: Unitary tests
+      run: |
+        python ./unitest.py