From 58e0ea5969eb037cb7ed10e191a79ba6e94cd18e Mon Sep 17 00:00:00 2001 From: Freddy Heppell Date: Wed, 3 Jul 2024 17:18:33 +0100 Subject: [PATCH] add NOTICE file --- NOTICE | 4 ++++ README.md | 2 +- pyproject.toml | 2 ++ src/extractor/dl/{LICENSE.txt => LICENSE} | 3 --- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 NOTICE rename src/extractor/dl/{LICENSE.txt => LICENSE} (88%) diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..ef1aaa2 --- /dev/null +++ b/NOTICE @@ -0,0 +1,4 @@ +WordPress Site Extractor +Copyright 2022-2024 The University of Sheffield + +Portions of this code are derived from WPJsonScraper, which is available under the MIT license. For details, see src/extractor/dl/LICENSE. \ No newline at end of file diff --git a/README.md b/README.md index 2b0246b..88a5f35 100644 --- a/README.md +++ b/README.md @@ -212,4 +212,4 @@ The columns of each type are subset and exported as a JSON file each. This software is made available under the terms of the [Apache License version 2.0](LICENSE). -A portion of this software (contained within the `extractor.dl` module) is adapted from [WPJsonScraper](https://github.com/MickaelWalter/wp-json-scraper) by Mickael Walter, made available under the terms of the [MIT license](src/extractor/dl/LICENSE.txt). \ No newline at end of file +Portions of this software are derived from other works, see [the `NOTICE` file](NOTICE) for further information. \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index e3b8af7..8cb0849 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,6 +6,8 @@ authors=["Freddy Heppell "] packages=[ { include = "extractor", from = "src"} ] +repository="https://github.com/GateNLP/wordpress-site-extractor" +license="Apache-2.0" [tool.poetry.scripts] wpextract = "extractor.cli.cli:main" diff --git a/src/extractor/dl/LICENSE.txt b/src/extractor/dl/LICENSE similarity index 88% rename from src/extractor/dl/LICENSE.txt rename to src/extractor/dl/LICENSE index 536fb9d..0b2989a 100644 --- a/src/extractor/dl/LICENSE.txt +++ b/src/extractor/dl/LICENSE @@ -1,6 +1,3 @@ -This module is adapted from WPJsonScraper (https://github.com/MickaelWalter/wp-json-scraper) -The original license of this code is as follows: - Copyright (c) 2018-2020 Mickaƫl "Kilawyn" Walter Permission is hereby granted, free of charge, to any person obtaining a copy