diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7be0c2e9..260d0204 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,10 +11,7 @@ repos: - id: ruff-check name: "馃悕 python 路 Linter with Ruff" types_or: [ python, pyi ] - args: [ --fix, --exit-non-zero-on-fix ] - - id: ruff-format - name: "馃悕 python 路 Format with Ruff" - types_or: [ python, pyi ] + args: [ --fix, --exit-non-zero-on-fix, --config, './pyproject.toml' ] # - repo: https://github.com/RobertCraigie/pyright-python # rev: v1.1.391 @@ -48,11 +45,11 @@ repos: name: "馃悮 shell 路 Check shell script code style" entry: bashate --error . --ignore=E006 - - repo: https://github.com/mrtazz/checkmake.git - rev: 0.2.2 - hooks: - - id: checkmake - name: "馃惍 Makefile 路 Lint Makefile" + # - repo: https://github.com/mrtazz/checkmake.git + # rev: 0.2.2 + # hooks: + # - id: checkmake + # name: "馃惍 Makefile 路 Lint Makefile" - repo: https://github.com/pre-commit/pre-commit-hooks rev: v6.0.0 diff --git a/Makefile b/Makefile index a0c7b8c1..f97cbc4d 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ UV_RUN := .venv-uv/bin/uv # if the command is only `make`, the default tasks will be the printing of the help. .DEFAULT_GOAL := help -.PHONY: help test docs docs-server venv requirements profiling docker all clean +.PHONY: help test docs docs-server venv requirements profiling docker all clean all test help: ## List all make commands available @grep -E '^[\.a-zA-Z_%-]+:.*?## .*$$' $(MAKEFILE_LIST) | \ diff --git a/docker-compose/glances.conf b/docker-compose/glances.conf old mode 100755 new mode 100644 diff --git a/glances/exports/glances_mqtt/__init__.py b/glances/exports/glances_mqtt/__init__.py old mode 100755 new mode 100644 diff --git a/glances/plugins/processlist/__init__.py b/glances/plugins/processlist/__init__.py index 7c6bed8f..5b4bde66 100644 --- a/glances/plugins/processlist/__init__.py +++ b/glances/plugins/processlist/__init__.py @@ -482,7 +482,7 @@ class ProcesslistPlugin(GlancesPluginModel): ret.append(self.curse_add_line(msg, decoration=process_decoration, splittable=True)) if arguments: msg = ' ' if args.cursor_process_name_position == 0 else unicode_message('THREE_DOTS') - msg += self.layout_stat['command'].format(arguments[args.cursor_process_name_position:]) + msg += self.layout_stat['command'].format(arguments[args.cursor_process_name_position :]) ret.append(self.curse_add_line(msg, splittable=True)) else: msg = self.layout_stat['name'].format(bare_process_name) @@ -967,4 +967,5 @@ class ProcesslistPlugin(GlancesPluginModel): # By default return 5 (corresponding to 99999 PID number) return 5 + # End of file diff --git a/tests/test_export_influxdb_v3.sh b/tests/test_export_influxdb_v3.sh index 0a104a2e..f8d5dad8 100755 --- a/tests/test_export_influxdb_v3.sh +++ b/tests/test_export_influxdb_v3.sh @@ -72,4 +72,4 @@ docker rm influxdb-v3-for-glances # Remove the temporary configuration file rm -f /tmp/glances.conf -echo "Script completed successfully!" \ No newline at end of file +echo "Script completed successfully!" diff --git a/tests/test_export_prometheus.sh b/tests/test_export_prometheus.sh index d5447ab6..5206f625 100755 --- a/tests/test_export_prometheus.sh +++ b/tests/test_export_prometheus.sh @@ -20,7 +20,7 @@ curl http://localhost:9091/metrics # Kill the glances process if it's still running if ps -p $GLANCES_PID > /dev/null; then - kill $GLANCES_PID + kill $GLANCES_PID fi echo "Script completed successfully!" \ No newline at end of file diff --git a/tests/test_export_timescaledb.sh b/tests/test_export_timescaledb.sh index cfae9a7e..4865cf60 100755 --- a/tests/test_export_timescaledb.sh +++ b/tests/test_export_timescaledb.sh @@ -40,4 +40,4 @@ docker exec timescaledb-for-glances psql -d "postgres://postgres:password@localh echo "Stopping and removing TimescaleDB container..." # docker stop timescaledb-for-glances && docker rm timescaledb-for-glances -echo "Script completed successfully!" \ No newline at end of file +echo "Script completed successfully!"