From 873fe0085bc1c11a97b2c535899befe83651797b Mon Sep 17 00:00:00 2001 From: Jacobo de Vera Date: Thu, 11 Sep 2025 11:29:03 +0100 Subject: [PATCH] fix: Disambiguate license BSD is not enough to specify the license under which the software is released. This change specifies the license to be the 3-clause BSD license. --- CONTRIBUTING.md | 2 +- LICENSE | 26 ++++++++++++++++++++++++++ README.md | 2 +- bitmapist/__init__.py | 2 +- bitmapist/cohort/__init__.py | 2 +- pyproject.toml | 4 ++-- 6 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 LICENSE diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 51ad01a..1a891a5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ series [How to Contribute to an Open Source Project on GitHub][egghead] If you want to contribute with code, please open a Pull Request. A few things to keep in mind: -- The BSD project is released under the [BSD license](./LICENSE) +- The project is released under the [BSD-3-Clause license](./LICENSE) - Please use [pre-commit](https://pre-commit.com/) to ensure some formatting rules and basic consistency checks are applied before each Git commit - Please add tests for your changes! - Please document any changes using the [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2929174 --- /dev/null +++ b/LICENSE @@ -0,0 +1,26 @@ +Copyright 2012 Doist Ltd. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors +may be used to endorse or promote products derived from this software without +specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, 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. \ No newline at end of file diff --git a/README.md b/README.md index 57af03c..d090f93 100644 --- a/README.md +++ b/README.md @@ -362,4 +362,4 @@ poetry run pytest Copyright: 2012 by Doist Ltd. -License: BSD +License: BSD-3-Clause diff --git a/bitmapist/__init__.py b/bitmapist/__init__.py index 09f9951..7c48b52 100644 --- a/bitmapist/__init__.py +++ b/bitmapist/__init__.py @@ -76,7 +76,7 @@ :copyright: 2012 by Doist Ltd. :developer: Amir Salihefendic ( http://amix.dk ) -:license: BSD +:license: BSD-3-Clause """ from __future__ import annotations diff --git a/bitmapist/cohort/__init__.py b/bitmapist/cohort/__init__.py index 7189595..38720ac 100644 --- a/bitmapist/cohort/__init__.py +++ b/bitmapist/cohort/__init__.py @@ -59,7 +59,7 @@ :copyright: 2012 by Doist Ltd. :developer: Amir Salihefendic ( http://amix.dk ) -:license: BSD +:license: BSD-3-Clause """ from datetime import date, datetime, timedelta, timezone diff --git a/pyproject.toml b/pyproject.toml index 54cbb81..de48084 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,14 +6,14 @@ authors = [ "Amir Salihefendic ", "Doist Developers ", ] -license="BSD" +license="BSD-3-Clause" readme = "README.md" repository = "https://github.com/Doist/bitmapist" keywords=[ "redis", "bitmap", "analytics", "bitmaps", "realtime", "cohort", ] classifiers=[ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", - "License :: OSI Approved :: BSD License", + "License :: OSI Approved :: BSD 3-Clause \"New\" or \"Revised\" License (BSD-3-Clause)", "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3",