From ae3cd8513e55278c03aa2afeb070a45b99d81b5d Mon Sep 17 00:00:00 2001 From: gilch Date: Sun, 28 Jul 2024 14:10:23 -0600 Subject: [PATCH] Rework LICENSE files for GitHub Hopefully this is still clear and will show up better in the GitHub UI. --- COPYING.txt | 16 +++++++++++----- setup/LICENSE.txt => LICENSE.txt | 0 docs/{CC-BY-SA-4.0.txt => LICENSE.txt} | 0 setup.py | 8 ++++++-- 4 files changed, 17 insertions(+), 7 deletions(-) rename setup/LICENSE.txt => LICENSE.txt (100%) rename docs/{CC-BY-SA-4.0.txt => LICENSE.txt} (100%) diff --git a/COPYING.txt b/COPYING.txt index 6982a3682..dc2d51871 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -1,7 +1,13 @@ -This repository is licensed Apache-2.0 except for -the docs/ directory which is mostly licensed CC-BY-SA-4.0 instead. -Which license applies is noted inside each file near the top. +# Notice Regarding Separate Licensing of Documentation # -See the setup/LICENSE.txt and docs/CC-BY-SA-4.0.txt files for the full text of each license. +See LICENSE.txt for the full text of the Apache-2.0 license. +See docs/LICENSE.txt for the full text of the CC-BY-SA-4.0 license. -The docs/hissp.svg and docs/H.svg logos are trademarks. \ No newline at end of file +Apache-2.0 applies to most of the repository, but CC-BY-SA-4.0 applies +to most of the files in the docs/ directory. Check the individual files; +which license applies is noted inside each near the top. + +The docs/hissp.svg and docs/H.svg logos are trademarks. + +(Hissp package-only distributions do not include the extra documentation +or this notice.) \ No newline at end of file diff --git a/setup/LICENSE.txt b/LICENSE.txt similarity index 100% rename from setup/LICENSE.txt rename to LICENSE.txt diff --git a/docs/CC-BY-SA-4.0.txt b/docs/LICENSE.txt similarity index 100% rename from docs/CC-BY-SA-4.0.txt rename to docs/LICENSE.txt diff --git a/setup.py b/setup.py index 00437ccbf..8a289f79b 100644 --- a/setup.py +++ b/setup.py @@ -2,15 +2,19 @@ # Copyright 2019, 2020, 2021, 2022, 2023 Matthew Egan Odendahl # SPDX-License-Identifier: Apache-2.0 import os +import shutil import sys import setuptools -os.chdir("setup") +os.makedirs("setup", exist_ok=True) +shutil.copy("LICENSE.txt", "setup/LICENSE.txt") -with open("../README.md", encoding="utf8") as f: +with open("README.md", encoding="utf8") as f: long_description = f.read() +os.chdir("setup") + sys.path.insert(0, "../src") import hissp