Skip to content

Commit f019a3c

Browse files
committed
Move the Apache license file back to setup
1 parent a37482a commit f019a3c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ authors = [
1010
description = "A plain text editor for planning and writing novels"
1111
readme = {file = "setup/description_pypi.md", content-type = "text/markdown"}
1212
license = "GPL-3.0-or-later AND Apache-2.0 AND CC-BY-4.0"
13-
license-files = ["LICENSE.md", "LICENSE-Apache-2.0.txt"]
13+
license-files = ["LICENSE.md", "setup/LICENSE-Apache-2.0.txt"]
1414
classifiers = [
1515
"Programming Language :: Python :: 3 :: Only",
1616
"Programming Language :: Python :: 3.10",
File renamed without changes.

utils/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ def copySourceCode(dst: Path) -> None:
9393

9494
def copyPackageFiles(dst: Path, oldLicense: bool = False) -> None:
9595
"""Copy files needed for packaging."""
96-
copyFiles = ["LICENSE.md", "LICENSE-Apache-2.0.txt", "CREDITS.md", "pyproject.toml"]
96+
copyFiles = ["LICENSE.md", "setup/LICENSE-Apache-2.0.txt", "CREDITS.md", "pyproject.toml"]
9797
for copyFile in copyFiles:
9898
shutil.copyfile(copyFile, dst / copyFile)
9999
print("Copied:", copyFile, flush=True)
100100

101101
writeFile(dst / "MANIFEST.in", (
102102
"include LICENSE.md\n"
103-
"include LICENSE-Apache-2.0.txt\n"
103+
"include setup/LICENSE-Apache-2.0.txt\n"
104104
"include CREDITS.md\n"
105105
"recursive-include novelwriter/assets *\n"
106106
))

0 commit comments

Comments
 (0)