Move the Apache license file back to setup

pyproject.toml

@@ -10,7 +10,7 @@ authors = [
 description = "A plain text editor for planning and writing novels"
 readme = {file = "setup/description_pypi.md", content-type = "text/markdown"}
 license = "GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0"
-license-files = ["LICENSE.md", "LICENSE-Apache-2.0.txt"]
+license-files = ["LICENSE.md", "setup/LICENSE-Apache-2.0.txt"]
 classifiers = [
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.10",

utils/common.py

@@ -93,14 +93,14 @@ def copySourceCode(dst: Path) -> None:
 
 def copyPackageFiles(dst: Path, oldLicense: bool = False) -> None:
     """Copy files needed for packaging."""
-    copyFiles = ["LICENSE.md", "LICENSE-Apache-2.0.txt", "CREDITS.md", "pyproject.toml"]
+    copyFiles = ["LICENSE.md", "setup/LICENSE-Apache-2.0.txt", "CREDITS.md", "pyproject.toml"]
     for copyFile in copyFiles:
         shutil.copyfile(copyFile, dst / copyFile)
         print("Copied:", copyFile, flush=True)
 
     writeFile(dst / "MANIFEST.in", (
         "include LICENSE.md\n"
-        "include LICENSE-Apache-2.0.txt\n"
+        "include setup/LICENSE-Apache-2.0.txt\n"
         "include CREDITS.md\n"
         "recursive-include novelwriter/assets *\n"
     ))