From 7d26a36ab7f93577849399c317f7ebe1d6096e44 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:16:32 -0500 Subject: [PATCH 1/9] workflow: specify python3 --- .forgejo/workflows/pylint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pylint.yml b/.forgejo/workflows/pylint.yml index 5515969..36146db 100644 --- a/.forgejo/workflows/pylint.yml +++ b/.forgejo/workflows/pylint.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - name: Install Python Deps run: | - python -m pip install --upgrade pip + python3 install --upgrade pip pip install -r requirements.txt - name: Analysing the code with pylint run: | From 9872fe8811b0052020a9f7586dcdd6b3e5a937fd Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:25:45 -0500 Subject: [PATCH 2/9] workflow: *properly* specify python3 --- .forgejo/workflows/pylint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/pylint.yml b/.forgejo/workflows/pylint.yml index 36146db..1cff75c 100644 --- a/.forgejo/workflows/pylint.yml +++ b/.forgejo/workflows/pylint.yml @@ -23,8 +23,8 @@ jobs: - uses: actions/checkout@v3 - name: Install Python Deps run: | - python3 install --upgrade pip - pip install -r requirements.txt + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements.txt - name: Analysing the code with pylint run: | pylint $(git ls-files '*.py') From 990a32bb1989bba8dadaa9226064daba29578c69 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:28:59 -0500 Subject: [PATCH 3/9] workflow: add/use venv --- .forgejo/workflows/pylint.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/pylint.yml b/.forgejo/workflows/pylint.yml index 1cff75c..d5586cf 100644 --- a/.forgejo/workflows/pylint.yml +++ b/.forgejo/workflows/pylint.yml @@ -14,7 +14,7 @@ jobs: - name: Install Package-based Deps run: | echo -e 'max_parallel_downloads=20\ndeltarpm=False\nfastestmirror=False' | tee -a /etc/dnf/dnf.conf - dnf -yq install nodejs git pylint python3-pip + dnf -yq install nodejs git pylint python3-pip python3-venv dnf clean all # - name: "Set up Python ${{ matrix.python-version }}" # uses: https://github.com/actions/setup-python@v3 @@ -23,8 +23,11 @@ jobs: - uses: actions/checkout@v3 - name: Install Python Deps run: | + python3 -m venv venv + source venv/bin/activate python3 -m pip install --upgrade pip python3 -m pip install -r requirements.txt - name: Analysing the code with pylint run: | + source venv/bin/activate pylint $(git ls-files '*.py') From f800d4b577cecac4dffaa7903d0e7779ef69f746 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:31:28 -0500 Subject: [PATCH 4/9] workflow: fix venv pkg, add pylint fixer --- .forgejo/workflows/pylint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pylint.yml b/.forgejo/workflows/pylint.yml index d5586cf..f556c30 100644 --- a/.forgejo/workflows/pylint.yml +++ b/.forgejo/workflows/pylint.yml @@ -14,7 +14,7 @@ jobs: - name: Install Package-based Deps run: | echo -e 'max_parallel_downloads=20\ndeltarpm=False\nfastestmirror=False' | tee -a /etc/dnf/dnf.conf - dnf -yq install nodejs git pylint python3-pip python3-venv + dnf -yq install nodejs git pylint python3-pip python3-virtualenv python3-pylint-venv dnf clean all # - name: "Set up Python ${{ matrix.python-version }}" # uses: https://github.com/actions/setup-python@v3 From 34881f4c979d72b3afce4748c2a07e6c5ea22a8e Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:34:35 -0500 Subject: [PATCH 5/9] requirements.txt: remove pyyaml, explicitly add rich --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ffd6e5e..58c037d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -textual>=0.16.0 +textual>=0.32.0 humanfriendly==10.0 -pyyaml==6.0 +rich>=13.3.3 From fa44c535105037d276379cc12a7f220a05bb7126 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:37:47 -0500 Subject: [PATCH 6/9] readme: remove old github badge, update screenshot URLs --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a09732e..ae68712 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ # amdgpu_stats -![pylint](https://github.com/joshlay/amdgpu_stats/actions/workflows/pylint.yml/badge.svg) A Python module/TUI for AMD GPU statistics -![Screenshot of the main stats table](https://raw.githubusercontent.com/joshlay/amdgpu_stats/master/screens/main.svg "Main screen") -![Screenshot of the 'graphing' scroll bars](https://raw.githubusercontent.com/joshlay/amdgpu_stats/master/screens/graphs.svg "Graphs") -![Screenshot of the 'Logs' tab pane](https://raw.githubusercontent.com/joshlay/amdgpu_stats/master/screens/logs.svg "Logs") +![Screenshot of the main stats table](https://git.jlay.dev/jlay/amdgpu_stats/raw/branch/master/screens/main.svg "Main screen") +![Screenshot of the 'graphing' scroll bars](https://git.jlay.dev/jlay/amdgpu_stats/raw/branch/master/screens/graphs.svg "Graphs") +![Screenshot of the 'Logs' tab pane](https://git.jlay.dev/jlay/amdgpu_stats/raw/branch/master/screens/logs.svg "Logs") Tested _only_ on `RX6000` series cards; APUs and more _may_ be supported. Please file an issue if finding incompatibility! From e3e7712e4769593f8acc546219e56965e2d6279e Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:38:46 -0500 Subject: [PATCH 7/9] workflow: add step, show pip list --- .forgejo/workflows/pylint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/pylint.yml b/.forgejo/workflows/pylint.yml index f556c30..0efb88b 100644 --- a/.forgejo/workflows/pylint.yml +++ b/.forgejo/workflows/pylint.yml @@ -30,4 +30,5 @@ jobs: - name: Analysing the code with pylint run: | source venv/bin/activate + python3 -m pip list pylint $(git ls-files '*.py') From f5c72203accfecf7e0952739c751f5594c4e676f Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:41:21 -0500 Subject: [PATCH 8/9] workflow: use non-distro pylint --- .forgejo/workflows/pylint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/pylint.yml b/.forgejo/workflows/pylint.yml index 0efb88b..26a269f 100644 --- a/.forgejo/workflows/pylint.yml +++ b/.forgejo/workflows/pylint.yml @@ -11,21 +11,21 @@ jobs: # matrix: # python-version: ["3.8.17", "3.9.17", "3.10.12", "3.11.4"] steps: - - name: Install Package-based Deps + - name: Install package dependencies run: | echo -e 'max_parallel_downloads=20\ndeltarpm=False\nfastestmirror=False' | tee -a /etc/dnf/dnf.conf - dnf -yq install nodejs git pylint python3-pip python3-virtualenv python3-pylint-venv + dnf -yq install nodejs git python3-pip python3-virtualenv python3-pylint-venv dnf clean all # - name: "Set up Python ${{ matrix.python-version }}" # uses: https://github.com/actions/setup-python@v3 # with: # python-version: ${{ matrix.python-version }} - uses: actions/checkout@v3 - - name: Install Python Deps + - name: Install Python dependencies run: | python3 -m venv venv source venv/bin/activate - python3 -m pip install --upgrade pip + python3 -m pip install --upgrade pip pylint python3 -m pip install -r requirements.txt - name: Analysing the code with pylint run: | From 881bc810872bbb425b553736388610f8ad9e4f34 Mon Sep 17 00:00:00 2001 From: Josh Lay Date: Sun, 6 Aug 2023 02:44:49 -0500 Subject: [PATCH 9/9] workflow: minimize, improve output --- .forgejo/workflows/pylint.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/pylint.yml b/.forgejo/workflows/pylint.yml index 26a269f..bc177b5 100644 --- a/.forgejo/workflows/pylint.yml +++ b/.forgejo/workflows/pylint.yml @@ -13,9 +13,9 @@ jobs: steps: - name: Install package dependencies run: | + echo "Making DNF more performant with these directives:" echo -e 'max_parallel_downloads=20\ndeltarpm=False\nfastestmirror=False' | tee -a /etc/dnf/dnf.conf - dnf -yq install nodejs git python3-pip python3-virtualenv python3-pylint-venv - dnf clean all + dnf -yq install nodejs git python3-pip python3-virtualenv # - name: "Set up Python ${{ matrix.python-version }}" # uses: https://github.com/actions/setup-python@v3 # with: @@ -25,8 +25,10 @@ jobs: run: | python3 -m venv venv source venv/bin/activate - python3 -m pip install --upgrade pip pylint - python3 -m pip install -r requirements.txt + python3 -m pip install --upgrade pip + python3 -m pip install --upgrade wheel + python3 -m pip install pylint + python3 -m pip install --no-compile -r requirements.txt - name: Analysing the code with pylint run: | source venv/bin/activate