From 70ea5e0bae491b075819b62295498cf28c15e2b8 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 16 May 2023 23:04:24 +0200 Subject: [PATCH 1/3] Fix broken documentation URL --- novelwriter/gui/mainmenu.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/novelwriter/gui/mainmenu.py b/novelwriter/gui/mainmenu.py index 0da2d783..12568da6 100644 --- a/novelwriter/gui/mainmenu.py +++ b/novelwriter/gui/mainmenu.py @@ -872,14 +872,9 @@ class GuiMainMenu(QMenuBar): self.helpMenu.addSeparator() # Help > User Manual (Online) - if novelwriter.__version__[-2] == "f": - docUrl = f"{novelwriter.__docurl__}/en/stable/" - else: - docUrl = f"{novelwriter.__docurl__}/en/latest/" - self.aHelpDocs = QAction(self.tr("User Manual (Online)"), self) self.aHelpDocs.setShortcut("F1") - self.aHelpDocs.triggered.connect(lambda: self._openWebsite(docUrl)) + self.aHelpDocs.triggered.connect(lambda: self._openWebsite(novelwriter.__docurl__)) self.helpMenu.addAction(self.aHelpDocs) # Help > User Manual (PDF) From 277bd783b162d59bc7ee028fd787cecd28be4ae3 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 1 Jun 2023 10:56:11 +0200 Subject: [PATCH 2/3] Clean up workflows --- .github/workflows/syntax.yml | 11 ++++------- .github/workflows/test_linux.yml | 2 +- .github/workflows/test_mac.yml | 2 +- .github/workflows/test_win.yml | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml index eeb31851..ee5d5cc3 100644 --- a/.github/workflows/syntax.yml +++ b/.github/workflows/syntax.yml @@ -2,7 +2,7 @@ name: flake8 on: push: - branches: + branches: - main - dev pull_request: @@ -25,9 +25,6 @@ jobs: run: pip install flake8 - name: Syntax Error Check run: | - flake8 novelwriter --count --select=E9,F63,F7,F82 --show-source --statistics - flake8 tests --count --select=E9,F63,F7,F82 --show-source --statistics - - name: Coding Style Violations - run: | - flake8 novelwriter --count --max-line-length=99 --ignore E133,E221,E226,E228,E241,W503 --show-source --statistics - flake8 tests --count --max-line-length=99 --ignore E133,E221,E226,E228,E241,W503 --show-source --statistics + flake8 --version + flake8 novelwriter --count --show-source --statistics + flake8 tests --count --show-source --statistics diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 346b8db5..b8705a02 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -2,7 +2,7 @@ name: Linux on: push: - branches: + branches: - main - dev pull_request: diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml index 10fac337..36394f43 100644 --- a/.github/workflows/test_mac.yml +++ b/.github/workflows/test_mac.yml @@ -2,7 +2,7 @@ name: macOS on: push: - branches: + branches: - main - dev pull_request: diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 42281a53..cea804e9 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -2,7 +2,7 @@ name: Windows on: push: - branches: + branches: - main - dev pull_request: From 0a70adeceb58c575daaef588239f0f1cd8ce7e92 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 1 Jun 2023 15:27:29 +0200 Subject: [PATCH 3/3] Update ignored error codes for flake8 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index b9572076..53e27d09 100644 --- a/setup.cfg +++ b/setup.cfg @@ -50,6 +50,6 @@ gui_scripts = universal = 0 [flake8] -ignore = E133,E221,E226,E228,E241,W503 +ignore = D107,D205,D400,E133,E221,E226,E228,E241,W503 max-line-length = 99 exclude = docs/*