From 55db2f451e34b395d34ffdee39ca3dd7afe7d828 Mon Sep 17 00:00:00 2001 From: Richard Reeve Date: Wed, 2 Apr 2025 07:27:46 +0100 Subject: [PATCH 1/2] Don't add license to Pluto notebooks as Pluto then fails --- LICENSE | 2 +- Project.toml | 2 +- codemeta.json | 6 +++--- src/ResearchSoftwareMetadata.jl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index fcf397b..4c91cc4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2024 Richard Reeve +Copyright (c) 2024-2025 Richard Reeve Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/Project.toml b/Project.toml index 6c59b1c..98185e8 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "ResearchSoftwareMetadata" uuid = "58378933-4625-47fa-851e-05ee27d397bd" license = "BSD-2-Clause" authors = ["Richard Reeve "] -version = "0.1.4" +version = "0.1.5" [deps] DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" diff --git a/codemeta.json b/codemeta.json index 3d72795..597f44e 100644 --- a/codemeta.json +++ b/codemeta.json @@ -14,10 +14,10 @@ "Linux", "macOS" ], - "version": "v0.1.4", - "dateModified": "2024-10-16", + "version": "v0.1.5", + "dateModified": "2025-04-02", "datePublished": "2024-07-18", - "downloadUrl": "https://github.com/boydorr/ResearchSoftwareMetadata.jl/archive/refs/tags/v0.1.4.tar.gz", + "downloadUrl": "https://github.com/boydorr/ResearchSoftwareMetadata.jl/archive/refs/tags/v0.1.5.tar.gz", "license": "https://spdx.org/licenses/BSD-2-Clause", "author": [ { diff --git a/src/ResearchSoftwareMetadata.jl b/src/ResearchSoftwareMetadata.jl index 8a73b69..7794dc7 100644 --- a/src/ResearchSoftwareMetadata.jl +++ b/src/ResearchSoftwareMetadata.jl @@ -637,7 +637,7 @@ function crosswalk(git_dir = readchomp(`$(Git.git()) rev-parse --show-toplevel`) data = readlines(jl_file) if startswith(data[1], "# SPDX-License-Identifier:") data[1] = "# SPDX-License-Identifier: $(project["license"])" - else + elseif !startswith(data[1], "### A Pluto.jl notebook ###") pushfirst!(data, "") pushfirst!(data, "# SPDX-License-Identifier: $(project["license"])") From d67ce1d5afd0e2f97fd161bdd7e18e77f0de7517 Mon Sep 17 00:00:00 2001 From: Richard Reeve Date: Wed, 2 Apr 2025 07:27:57 +0100 Subject: [PATCH 2/2] Update news --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 2422242..4e21bee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # NEWS +- v0.1.5 + - Can't add license info for Pluto notebooks - v0.1.4 - More compatibility fixes - v0.1.3