From ce4d3c0b5cb5e3f4d7a29db3992c1f9d256637b1 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 15 Mar 2022 22:07:33 +0100
Subject: [PATCH] Update linting settings, and drop Ubuntu 18.04 releases
 (#1014)

* Add E133 and W503 to ignored list for flake8
* Drop making releases for Ubuntu 18.04
---
 .github/workflows/syntax.yml | 4 ++--
 setup.cfg                    | 2 +-
 setup.py                     | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
index 560dd7dc..5294afe0 100644
--- a/.github/workflows/syntax.yml
+++ b/.github/workflows/syntax.yml
@@ -27,5 +27,5 @@ jobs:
           flake8 tests --count --select=E9,F63,F7,F82 --show-source --statistics
       - name: Coding Style Violations
         run: | 
-          flake8 novelwriter --count --max-line-length=99 --ignore E221,E226,E228,E241 --show-source --statistics
-          flake8 tests --count --max-line-length=99 --ignore E221,E226,E228,E241 --show-source --statistics
+          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
diff --git a/setup.cfg b/setup.cfg
index 0e005bf5..b88b656b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,6 +49,6 @@ gui_scripts =
 universal = 0
 
 [flake8]
-ignore = E221,E226,E228,E241
+ignore = E133,E221,E226,E228,E241,W503
 max-line-length = 99
 exclude = docs/*
diff --git a/setup.py b/setup.py
index 44d5cb1f..f72ce936 100755
--- a/setup.py
+++ b/setup.py
@@ -786,7 +786,6 @@ def makeForLaunchpad(doSign=False, isFirst=False, isSnapshot=False):
             bldNum = "0"
 
     distLoop = [
-        ("18.04", "bionic"),
         ("20.04", "focal"),
         ("21.10", "impish"),
         ("22.04", "jammy"),