From 61190284be22e69d83fbd16eccaca7b46d596136 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 Aug 2020 21:22:50 +0200 Subject: [PATCH 1/5] About box shoud now point to the new website URL --- nw/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nw/__init__.py b/nw/__init__.py index 5ffae592..34d506ef 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -47,7 +47,7 @@ __date__ = "2020-07-29" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Beta" -__url__ = "https://github.com/vkbo/novelWriter" +__url__ = "https://novelwriter.io" __issuesurl__ = "https://github.com/vkbo/novelWriter/issues" __domain__ = "novelwriter.io" __docurl__ = "https://novelwriter.readthedocs.io" From 148c3530e257d418035e0ff9d0e3d7dbd3680b15 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 Aug 2020 21:23:16 +0200 Subject: [PATCH 2/5] Split up author and credit entries in icon theme config files --- nw/assets/icons/typicons_colour_dark/icons.conf | 4 ++-- nw/assets/icons/typicons_colour_light/icons.conf | 4 ++-- nw/assets/icons/typicons_grey_dark/icons.conf | 4 ++-- nw/assets/icons/typicons_grey_light/icons.conf | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nw/assets/icons/typicons_colour_dark/icons.conf b/nw/assets/icons/typicons_colour_dark/icons.conf index 33aeef93..c4167b90 100644 --- a/nw/assets/icons/typicons_colour_dark/icons.conf +++ b/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/ diff --git a/nw/assets/icons/typicons_colour_light/icons.conf b/nw/assets/icons/typicons_colour_light/icons.conf index 0ba6dd6b..be0b1853 100644 --- a/nw/assets/icons/typicons_colour_light/icons.conf +++ b/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/ diff --git a/nw/assets/icons/typicons_grey_dark/icons.conf b/nw/assets/icons/typicons_grey_dark/icons.conf index 301c74ac..fba00697 100644 --- a/nw/assets/icons/typicons_grey_dark/icons.conf +++ b/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/ diff --git a/nw/assets/icons/typicons_grey_light/icons.conf b/nw/assets/icons/typicons_grey_light/icons.conf index 6e98346a..62aba87f 100644 --- a/nw/assets/icons/typicons_grey_light/icons.conf +++ b/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/ From b6e06a81d544f1fa8c6444af175903091a42b43a Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 Aug 2020 21:25:45 +0200 Subject: [PATCH 3/5] Setup file should get version from nw/__init__.py --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 091e3652..68134ad9 100755 --- a/setup.py +++ b/setup.py @@ -1,12 +1,14 @@ #!/usr/bin/env python3 import setuptools +from nw import __version__ + with open("README.md", "r") as inFile: long_description = inFile.read() 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", From 4d0777b02ec791977a7dcd84f0029cf02926419b Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 Aug 2020 21:35:45 +0200 Subject: [PATCH 4/5] Remove duplicate settings from setup, and add more classifiers --- setup.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index 68134ad9..6638e0bc 100755 --- a/setup.py +++ b/setup.py @@ -1,10 +1,13 @@ #!/usr/bin/env python3 import setuptools -from nw import __version__ +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", @@ -12,10 +15,10 @@ setuptools.setup( 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"], @@ -24,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, ) From 56528d0f988cb2d0c41e1f33337aa6f42ee13240 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 2 Aug 2020 21:36:09 +0200 Subject: [PATCH 5/5] Add source url variable to nw init --- nw/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nw/__init__.py b/nw/__init__.py index 34d506ef..3373a34f 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -48,6 +48,7 @@ __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Beta" __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"