Merge pull request #379 from vkbo/about_tweaks

About and Setup Tweaks

nw/__init__.py

@@ -47,7 +47,8 @@ __date__       = "2020-07-29"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
 __status__     = "Beta"
-__url__        = "https://github.com/vkbo/novelWriter"
+__url__        = "https://novelwriter.io"
+__sourceurl__  = "https://github.com/vkbo/novelWriter"
 __issuesurl__  = "https://github.com/vkbo/novelWriter/issues"
 __domain__     = "novelwriter.io"
 __docurl__     = "https://novelwriter.readthedocs.io"

nw/assets/icons/typicons_colour_dark/icons.conf

@@ -9,8 +9,8 @@
 [Main]
 name           = Typicons Colour Dark
 description    = Coulorised icons for dark GUI theme based on Typicons.
-author         = Stephen Hutchings (original), Veronica Berglyd Olsen (adaptation)
-credit         = Stephen Hutchings
+author         = Veronica Berglyd Olsen (adaptation)
+credit         = Stephen Hutchings (icon design)
 url            = https://github.com/stephenhutchings/typicons.font
 license        = CC BY-SA 4.0
 licenseurl     = https://creativecommons.org/licenses/by-sa/4.0/

nw/assets/icons/typicons_colour_light/icons.conf

@@ -9,8 +9,8 @@
 [Main]
 name           = Typicons Colour Light
 description    = Coulorised icons for light GUI theme based on Typicons.
-author         = Stephen Hutchings (original), Veronica Berglyd Olsen (adaptation)
-credit         = Stephen Hutchings
+author         = Veronica Berglyd Olsen (adaptation)
+credit         = Stephen Hutchings (icon design)
 url            = https://github.com/stephenhutchings/typicons.font
 license        = CC BY-SA 4.0
 licenseurl     = https://creativecommons.org/licenses/by-sa/4.0/

nw/assets/icons/typicons_grey_dark/icons.conf

@@ -9,8 +9,8 @@
 [Main]
 name           = Typicons Grey Dark
 description    = Greyscaled icons for dark GUI theme based on Typicons.
-author         = Stephen Hutchings (original), Veronica Berglyd Olsen (adaptation)
-credit         = Stephen Hutchings
+author         = Veronica Berglyd Olsen (adaptation)
+credit         = Stephen Hutchings (icon design)
 url            = https://github.com/stephenhutchings/typicons.font
 license        = CC BY-SA 4.0
 licenseurl     = https://creativecommons.org/licenses/by-sa/4.0/

nw/assets/icons/typicons_grey_light/icons.conf

@@ -9,8 +9,8 @@
 [Main]
 name           = Typicons Grey Light
 description    = Greyscaled icons for light GUI theme based on Typicons.
-author         = Stephen Hutchings (original), Veronica Berglyd Olsen (adaptation)
-credit         = Stephen Hutchings
+author         = Veronica Berglyd Olsen (adaptation)
+credit         = Stephen Hutchings (icon design)
 url            = https://github.com/stephenhutchings/typicons.font
 license        = CC BY-SA 4.0
 licenseurl     = https://creativecommons.org/licenses/by-sa/4.0/

setup.py

@@ -1,19 +1,24 @@
 #!/usr/bin/env python3
 import setuptools
 
+from nw import __version__, __url__, __docurl__, __issuesurl__, __sourceurl__
+
 with open("README.md", "r") as inFile:
-    long_description = inFile.read()
+    longDescription = inFile.read()
+
+with open("requirements.txt", "r") as inFile:
+    pkgRequirements = inFile.read().strip().splitlines()
 
 setuptools.setup(
     name = "novelWriter",
-    version = "0.10.2",
+    version = __version__,
     author = "Veronica Berglyd Olsen",
     author_email = "code@vkbo.net",
     description = "A markdown-like document editor for writing novels",
-    long_description = long_description,
+    long_description = longDescription,
     long_description_content_type = "text/markdown",
     license = "GNU General Public License v3",
-    url = "https://github.com/vkbo/novelWriter",
+    url = __url__,
     entry_points = {
         "console_scripts" : ["novelWriter-cli=nw:main"],
         "gui_scripts" :     ["novelWriter=nw:main"],
@@ -22,26 +27,24 @@ setuptools.setup(
     include_package_data = True,
     package_data = {"": ["*.conf"]},
     project_urls = {
-        "Bug Tracker": "https://github.com/vkbo/novelWriter/issues",
-        "Documentation": "https://novelwriter.readthedocs.io/",
-        "Source Code": "https://github.com/vkbo/novelWriter",
+        "Bug Tracker": __issuesurl__,
+        "Documentation": __docurl__,
+        "Source Code": __sourceurl__,
     },
     classifiers = [
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: Implementation :: CPython",
         "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 4 - Beta",
         "Operating System :: OS Independent",
         "Intended Audience :: End Users/Desktop",
         "Natural Language :: English",
         "Topic :: Text Editors",
     ],
     python_requires = ">=3.6",
-    install_requires = [
-        "pyqt5>=5.2.1",
-        "lxml>=4.2.0",
-        "pyenchant>=3.0.0",
-    ],
+    install_requires = pkgRequirements,
 )