flake8 fixes
This commit is contained in:
+4
-5
@@ -27,13 +27,13 @@ helpMsg = (
|
|||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
inOpts, inArgs = getopt.getopt(sys.argv[1:],shortOpt,longOpt)
|
inOpts, inArgs = getopt.getopt(sys.argv[1:], shortOpt, longOpt)
|
||||||
except getopt.GetoptError:
|
except getopt.GetoptError:
|
||||||
print(helpMsg)
|
print(helpMsg)
|
||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
|
|
||||||
for inOpt, inArg in inOpts:
|
for inOpt, inArg in inOpts:
|
||||||
if inOpt in ("-h","--help"):
|
if inOpt in ("-h", "--help"):
|
||||||
print(helpMsg)
|
print(helpMsg)
|
||||||
sys.exit()
|
sys.exit()
|
||||||
elif inOpt in ("-d", "--debug"):
|
elif inOpt in ("-d", "--debug"):
|
||||||
@@ -41,7 +41,7 @@ for inOpt, inArg in inOpts:
|
|||||||
|
|
||||||
# Run pip
|
# Run pip
|
||||||
packList = ["pyinstaller"]
|
packList = ["pyinstaller"]
|
||||||
with open("requirements.txt",mode="r") as reqFile:
|
with open("requirements.txt", mode="r") as reqFile:
|
||||||
for reqPack in reqFile:
|
for reqPack in reqFile:
|
||||||
if len(reqPack.strip()) > 0:
|
if len(reqPack.strip()) > 0:
|
||||||
packList.append(reqPack)
|
packList.append(reqPack)
|
||||||
@@ -72,7 +72,7 @@ if buildWindowed:
|
|||||||
|
|
||||||
instOpt.append("novelWriter.py")
|
instOpt.append("novelWriter.py")
|
||||||
|
|
||||||
import PyInstaller.__main__
|
import PyInstaller.__main__ # noqa: F401
|
||||||
PyInstaller.__main__.run(instOpt)
|
PyInstaller.__main__.run(instOpt)
|
||||||
|
|
||||||
print("")
|
print("")
|
||||||
@@ -82,4 +82,3 @@ print("##################")
|
|||||||
print("")
|
print("")
|
||||||
print("If everything went well, the novelWriter executable should be in the folder named 'dist'")
|
print("If everything went well, the novelWriter executable should be in the folder named 'dist'")
|
||||||
print("")
|
print("")
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -4,10 +4,10 @@
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import PyQt5.QtWidgets
|
import PyQt5.QtWidgets # noqa: F401
|
||||||
import PyQt5.QtGui
|
import PyQt5.QtGui # noqa: F401
|
||||||
import PyQt5.QtCore
|
import PyQt5.QtCore # noqa: F401
|
||||||
except:
|
except Exception:
|
||||||
print("ERROR: Failed to load dependency python3-pyqt5")
|
print("ERROR: Failed to load dependency python3-pyqt5")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ setuptools.setup(
|
|||||||
"console_scripts" : ["novelWriter-cli=nw:main"],
|
"console_scripts" : ["novelWriter-cli=nw:main"],
|
||||||
"gui_scripts" : ["novelWriter=nw:main"],
|
"gui_scripts" : ["novelWriter=nw:main"],
|
||||||
},
|
},
|
||||||
packages = setuptools.find_packages(exclude=["docs","tests","sample"]),
|
packages = setuptools.find_packages(exclude=["docs", "tests", "sample"]),
|
||||||
include_package_data = True,
|
include_package_data = True,
|
||||||
package_data = {"": ["*.conf"]},
|
package_data = {"": ["*.conf"]},
|
||||||
project_urls = {
|
project_urls = {
|
||||||
|
|||||||
+2
-2
@@ -95,8 +95,8 @@ def testLaunch(qtbot, monkeypatch, nwFuncTemp, nwTemp):
|
|||||||
)
|
)
|
||||||
nwGUI.closeMain()
|
nwGUI.closeMain()
|
||||||
nwGUI.close()
|
nwGUI.close()
|
||||||
assert ex.value.code & 4 == 4 # Python version not satisfied
|
assert ex.value.code & 4 == 4 # Python version not satisfied
|
||||||
assert ex.value.code & 8 == 8 # Qt version not satisfied
|
assert ex.value.code & 8 == 8 # Qt version not satisfied
|
||||||
assert ex.value.code & 16 == 16 # PyQt version not satisfied
|
assert ex.value.code & 16 == 16 # PyQt version not satisfied
|
||||||
assert ex.value.code & 32 == 32 # lxml package missing
|
assert ex.value.code & 32 == 32 # lxml package missing
|
||||||
monkeypatch.undo()
|
monkeypatch.undo()
|
||||||
|
|||||||
Reference in New Issue
Block a user