From 285687ea5cc1be383b3dd56865b6456d23f9acc0 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 23 Mar 2024 11:34:36 +0100 Subject: [PATCH 1/2] v3.0.0 From 253010f3f2803e01c521673c87cfec54d4ef9e75 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sat, 23 Mar 2024 12:33:02 +0100 Subject: [PATCH 2/2] Switch Spook to MIT license (#672) --- .github/CONTRIBUTING.md | 4 +--- .github/LICENSE.md | 8 ++++---- README.md | 8 ++++---- documentation/about.md | 2 +- documentation/faq.md | 6 ------ documentation/license.md | 16 ++++++++-------- pyproject.toml | 2 +- 7 files changed, 19 insertions(+), 27 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 940308bc..246fbd4b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,8 +1,6 @@ # Contributing -Are you considering doing that? For real? This repository has quite an annoying license... - -Anyways, you can find all information on development and contributing on our website: +You can find all information on development and contributing on our website: https://spook.boo/development diff --git a/.github/LICENSE.md b/.github/LICENSE.md index 8718c13a..8fa9cd6f 100644 --- a/.github/LICENSE.md +++ b/.github/LICENSE.md @@ -1,13 +1,13 @@ -# Passive Aggressive License +# MIT License Copyright (c) 2023-2024 Franck Nijhof Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights -to copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, but NOT including the right to run, execute or use the -Software or any executable binaries built from the source code. +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. diff --git a/README.md b/README.md index 34f6c0dc..7a3127f7 100644 --- a/README.md +++ b/README.md @@ -59,9 +59,9 @@ Copyright (c) 2023-2024 Franck Nijhof Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights -to copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, but NOT including the right to run, execute or use the -Software or any executable binaries built from the source code. +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -76,7 +76,7 @@ SOFTWARE. [contributors]: https://github.com/frenck/spook/graphs/contributors [frenck]: https://github.com/frenck -[license-shield]: https://img.shields.io/badge/license-Passive%20Aggressive%20License-lightgrey.svg +[license-shield]: https://img.shields.io/github/license/frenck/spook.svg [project-stage-shield]: https://img.shields.io/badge/project%20stage-SPOOKED-red.svg [releases-shield]: https://img.shields.io/github/release/frenck/spook.svg [releases]: https://github.com/frenck/spook/releases diff --git a/documentation/about.md b/documentation/about.md index fb3f3945..dd4a632b 100644 --- a/documentation/about.md +++ b/documentation/about.md @@ -13,7 +13,7 @@ Hi! I'm Spook 👻 and I'm a {term}`custom integration ` for use wi :::{warning} Just to be clear from the very start... **Spook is not supported by the Home Assistant project.** -This custom integration is provided as-is, without any warranty or support, and above all, has a very [restrictive license](license). +This custom integration is provided as-is, without any warranty or support. If you experience issues with this integration or as a result of this integration, please go cry a lot on your own. After ignoring this warning, you will not be provided with a tissue to dry up your tears when you are crying in a fetal position under your desk. diff --git a/documentation/faq.md b/documentation/faq.md index 9a50f724..906fb192 100644 --- a/documentation/faq.md +++ b/documentation/faq.md @@ -32,12 +32,6 @@ I'm just sharing what I have [without any warranty](license). No. It does not do random things. It is not a [chaos testing](wiki:Chaos_engineering) thing, and it will not turn lights on/off randomly in the night. Unless it is a bug or broken of course. ``` -```{card} -:header: **Ok, so should I use Spook?** - -No! [The license](license) doesn't allow that. -``` - ```{card} :header: **I want to suggest a new feature for Spook** diff --git a/documentation/license.md b/documentation/license.md index 881d6ed5..13d9af27 100644 --- a/documentation/license.md +++ b/documentation/license.md @@ -4,23 +4,23 @@ title: Spook licenses short_title: License subtitle: The license used by Spook thumbnail: images/social.png -description: The Spook integration from Home Assistant is mostly licensed under the Passive Aggressive License. +description: The Spook integration from Home Assistant is mostly licensed under the MIT License. --- -Spook uses a couple of licenses for different parts of its sources. Our main license is the Passive Agressive Licence, which applies to all source code, unless otherwise specified. +Spook uses a couple of licenses for different parts of its sources. Our main license is the MIT Licence, which applies to all source code, unless otherwise specified. -(pal)= +(mit)= -# Passive Aggressive License +# MIT License Copyright © 2023-2024 Franck Nijhof Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights -to copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, but NOT including the right to run, execute or use the -Software or any executable binaries built from the source code. +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. @@ -81,7 +81,7 @@ For these and/or other purposes and motivations, and without any expectation of All documentation, located in the `documentation` folder of this repository, is licensed under Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International. -⚠️ Please note, that this excludes **all** code samples, like any other code, code is licensed under our main license: [](#pal). +⚠️ Please note, that this excludes **all** code samples, like any other code, code is licensed under our main license: [](#mit). ## Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International diff --git a/pyproject.toml b/pyproject.toml index f432cdf9..08fb6cb8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,7 +11,7 @@ classifiers = [ description = "Spook - Not your homie" documentation = "https://github.com/frenck/spook" homepage = "https://github.com/frenck/spook" -license = "Passive Aggressive License" +license = "MIT" maintainers = ["Franck Nijhof "] name = "spook" packages = []