diff --git a/pyproject.toml b/pyproject.toml index 9e4cf021..15736ca4 100644 --- a/pyproject.toml +++ b/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", diff --git a/LICENSE-Apache-2.0.txt b/setup/LICENSE-Apache-2.0.txt similarity index 100% rename from LICENSE-Apache-2.0.txt rename to setup/LICENSE-Apache-2.0.txt diff --git a/utils/common.py b/utils/common.py index 95dcac28..09d937b1 100644 --- a/utils/common.py +++ b/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" ))