From 94f59db2967e29b7b97e4ecc91321f112d2c9ca8 Mon Sep 17 00:00:00 2001 From: Dmytro Horyslavets Date: Sun, 1 Sep 2024 13:04:13 +0300 Subject: [PATCH] fix inconsistent license names which led to the creation of empty LICENSE files and other minor bugs --- README.md | 2 +- camp_{{cookiecutter.module_slug}}/LICENSE | 8 ++++---- camp_{{cookiecutter.module_slug}}/README.md | 4 ++-- cookiecutter.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a360e16..e234569 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ cookiecutter https://github.com/MetaSUB-CAMP/CAMP_Module_Template 3. Set up the module environment. ```Bash -conda create -f configs/conda/module.yaml +conda env create -f configs/conda/module.yaml conda activate module ``` diff --git a/camp_{{cookiecutter.module_slug}}/LICENSE b/camp_{{cookiecutter.module_slug}}/LICENSE index 27fb856..20b851e 100644 --- a/camp_{{cookiecutter.module_slug}}/LICENSE +++ b/camp_{{cookiecutter.module_slug}}/LICENSE @@ -1,4 +1,4 @@ -{% if cookiecutter.open_source_license == 'MIT license' -%} +{% if cookiecutter.open_source_license == 'MIT' -%} MIT License Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.full_name }} @@ -20,7 +20,7 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -{% elif cookiecutter.open_source_license == 'BSD license' %} +{% elif cookiecutter.open_source_license == 'BSD' -%} BSD License @@ -51,7 +51,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -{% elif cookiecutter.open_source_license == 'ISC license' -%} +{% elif cookiecutter.open_source_license == 'ISCL' -%} ISC License Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.full_name }} @@ -79,7 +79,7 @@ limitations under the License. GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - {{ cookiecutter.project_short_description }} + {{ cookiecutter.module_short_description }} Copyright (C) {% now 'local', '%Y' %} {{ cookiecutter.full_name }} This program is free software: you can redistribute it and/or modify diff --git a/camp_{{cookiecutter.module_slug}}/README.md b/camp_{{cookiecutter.module_slug}}/README.md index 4d4c969..4323f37 100644 --- a/camp_{{cookiecutter.module_slug}}/README.md +++ b/camp_{{cookiecutter.module_slug}}/README.md @@ -19,7 +19,7 @@ Add longer description of your workflow's algorithmic contents ## Installation -1. Clone repo from [Github]() as a simplified version of the [project template](https://github.com/audreyr/cookiecutter-pypackage>). +- This package was created with [Cookiecutter](https://github.com/cookiecutter/cookiecutter) as a simplified version of the [project template](https://github.com/audreyr/cookiecutter-pypackage). {% if is_open_source %} - Free software: {{ cookiecutter.open_source_license }} License - Documentation: https://camp-documentation.readthedocs.io/en/latest/{{ cookiecutter.module_slug }}.html diff --git a/cookiecutter.json b/cookiecutter.json index 4e6d294..ea974ea 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -4,8 +4,8 @@ "github_username": "lauren-mak", "module_name": "Binning", "module_slug": "{{ cookiecutter.module_name.lower().replace(' ', '_') }}", - "module_short_description": "The CAMP binning pipeline replicates the functionality of MetaWRAP (one of the original ensemble `binning methods `_) with i) better dependency conflict management and ii) improved integration with new binning algorithms.", + "module_short_description": "The CAMP binning pipeline replicates the functionality of MetaWRAP (one of the original ensemble [binning methods](https://github.com/bxlab/metaWRAP)) with i) better dependency conflict management and ii) improved integration with new binning algorithms.", "version": "0.1.0", "create_author_file": "y", - "open_source_license": ["MIT", "BSD", "ISCL", "Apache Software License 2.0", "Not open source"] + "open_source_license": ["MIT", "BSD", "ISCL", "Apache Software License 2.0", "GNU General Public License v3", "Not open source"] }