From eeb8847f154bec4fd74dcdc8379d4e01b06698e8 Mon Sep 17 00:00:00 2001 From: Divyansh Singh Date: Sun, 26 Feb 2023 18:22:43 +0530 Subject: [PATCH 1/7] ci: add flake8-print linter --- .pre-commit-config.yaml | 1 + requirements.d/dev.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4acb82f28..bfad4751e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -61,6 +61,7 @@ repos: rev: 6.0.0 hooks: - id: flake8 + additional_dependencies: [flake8-print] # configuration for the pre-commit.ci bot # only relevant when actually using the bot diff --git a/requirements.d/dev.txt b/requirements.d/dev.txt index 3c9c38f1f..fd87933c5 100644 --- a/requirements.d/dev.txt +++ b/requirements.d/dev.txt @@ -1,9 +1,10 @@ -pre-commit black==22.* coverage flake8 +flake8-print isort macholib +pre-commit pyinstaller pylint pytest From 056fa4821a88df337a44fa2c3b8febf127b2047a Mon Sep 17 00:00:00 2001 From: Divyansh Singh Date: Sun, 26 Feb 2023 19:38:48 +0530 Subject: [PATCH 2/7] add flake8 ignores for delibrately used print statements --- setup.cfg | 2 ++ src/vorta/__main__.py | 2 +- src/vorta/application.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index f5a5036b7..17b88da9c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -78,6 +78,8 @@ extend-ignore = E203,E121,E123,E126,E226,E24,E704,W503,W504 exclude = build,dist,.git,.idea,.cache,.tox,.eggs, ./src/vorta/__init__.py,.direnv +per-file-ignores = + packages/*: T20 [tox:tox] envlist = py36,py37,py38,flake8 diff --git a/src/vorta/__main__.py b/src/vorta/__main__.py index eb2ca3a1c..8c1a3dd02 100644 --- a/src/vorta/__main__.py +++ b/src/vorta/__main__.py @@ -47,7 +47,7 @@ def exception_handler(type, value, tb): want_background = getattr(args, 'daemonize', False) if want_version: - print(f"Vorta {__version__}") + print(f"Vorta {__version__}") # noqa: T20 sys.exit() if want_background: diff --git a/src/vorta/application.py b/src/vorta/application.py index 6d8210e05..0d725809e 100644 --- a/src/vorta/application.py +++ b/src/vorta/application.py @@ -46,11 +46,11 @@ def __init__(self, args_raw, single_app=False): if self.isRunning(): if single_app: self.sendMessage("open main window") - print('An instance of Vorta is already running. Opening main window.') + print('An instance of Vorta is already running. Opening main window.') # noqa: T20 sys.exit() elif args.profile: self.sendMessage(f"create {args.profile}") - print('Creating backup using existing Vorta instance.') + print('Creating backup using existing Vorta instance.') # noqa: T20 sys.exit() elif args.profile: sys.exit('Vorta must already be running for --create to work') From 64a175da18632944b74bb75ae9eef6d56ee7e220 Mon Sep 17 00:00:00 2001 From: Divyansh Singh Date: Sun, 26 Feb 2023 20:49:56 +0530 Subject: [PATCH 3/7] use relative path when excluding the packages dir --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 17b88da9c..97a8398fa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -79,7 +79,7 @@ exclude = build,dist,.git,.idea,.cache,.tox,.eggs, ./src/vorta/__init__.py,.direnv per-file-ignores = - packages/*: T20 + ./packages/*: T20 [tox:tox] envlist = py36,py37,py38,flake8 From 4712c97be4509283b3c3916c8cd4d38b679e9c06 Mon Sep 17 00:00:00 2001 From: Divyansh Singh Date: Sun, 26 Feb 2023 21:32:47 +0530 Subject: [PATCH 4/7] fix spelling mistake --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 97a8398fa..db62c6fa6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -79,7 +79,7 @@ exclude = build,dist,.git,.idea,.cache,.tox,.eggs, ./src/vorta/__init__.py,.direnv per-file-ignores = - ./packages/*: T20 + ./package/*: T20 [tox:tox] envlist = py36,py37,py38,flake8 From e53ab97040957ae867d96a592b98c71f4e8f1a7f Mon Sep 17 00:00:00 2001 From: Divyansh Singh Date: Mon, 27 Feb 2023 20:19:31 +0530 Subject: [PATCH 5/7] replace print with logger in application.py --- src/vorta/application.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vorta/application.py b/src/vorta/application.py index 0d725809e..3b9e427f0 100644 --- a/src/vorta/application.py +++ b/src/vorta/application.py @@ -46,11 +46,11 @@ def __init__(self, args_raw, single_app=False): if self.isRunning(): if single_app: self.sendMessage("open main window") - print('An instance of Vorta is already running. Opening main window.') # noqa: T20 + logger.info('An instance of Vorta is already running. Opening main window.') sys.exit() elif args.profile: self.sendMessage(f"create {args.profile}") - print('Creating backup using existing Vorta instance.') # noqa: T20 + logger.info('Creating backup using existing Vorta instance.') sys.exit() elif args.profile: sys.exit('Vorta must already be running for --create to work') From 7e71b32ebf504e51cda69e60d82604c4fc12f2d2 Mon Sep 17 00:00:00 2001 From: Divyansh Singh Date: Tue, 28 Feb 2023 22:03:15 +0530 Subject: [PATCH 6/7] just replace prints with logs, remove flake8-print --- .pre-commit-config.yaml | 1 - requirements.d/dev.txt | 1 - setup.cfg | 2 -- src/vorta/__main__.py | 2 +- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bfad4751e..4acb82f28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -61,7 +61,6 @@ repos: rev: 6.0.0 hooks: - id: flake8 - additional_dependencies: [flake8-print] # configuration for the pre-commit.ci bot # only relevant when actually using the bot diff --git a/requirements.d/dev.txt b/requirements.d/dev.txt index fd87933c5..78d09e088 100644 --- a/requirements.d/dev.txt +++ b/requirements.d/dev.txt @@ -1,7 +1,6 @@ black==22.* coverage flake8 -flake8-print isort macholib pre-commit diff --git a/setup.cfg b/setup.cfg index db62c6fa6..f5a5036b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -78,8 +78,6 @@ extend-ignore = E203,E121,E123,E126,E226,E24,E704,W503,W504 exclude = build,dist,.git,.idea,.cache,.tox,.eggs, ./src/vorta/__init__.py,.direnv -per-file-ignores = - ./package/*: T20 [tox:tox] envlist = py36,py37,py38,flake8 diff --git a/src/vorta/__main__.py b/src/vorta/__main__.py index 8c1a3dd02..eb2ca3a1c 100644 --- a/src/vorta/__main__.py +++ b/src/vorta/__main__.py @@ -47,7 +47,7 @@ def exception_handler(type, value, tb): want_background = getattr(args, 'daemonize', False) if want_version: - print(f"Vorta {__version__}") # noqa: T20 + print(f"Vorta {__version__}") sys.exit() if want_background: From 4fe014992df0a3242bf7d9871ab0884e9adb0d55 Mon Sep 17 00:00:00 2001 From: real-yfprojects Date: Wed, 8 Mar 2023 17:30:21 +0100 Subject: [PATCH 7/7] Revert formatting change to `dev.txt`. --- requirements.d/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.d/dev.txt b/requirements.d/dev.txt index 78d09e088..3c9c38f1f 100644 --- a/requirements.d/dev.txt +++ b/requirements.d/dev.txt @@ -1,9 +1,9 @@ +pre-commit black==22.* coverage flake8 isort macholib -pre-commit pyinstaller pylint pytest