Skip to content

Commit 6e42bc5

Browse files
authored
Merge pull request #77 from Doist/jacobo/license
Disambiguate license
2 parents 1b9b4cc + 873fe00 commit 6e42bc5

6 files changed

Lines changed: 32 additions & 6 deletions

File tree

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ series [How to Contribute to an Open Source Project on GitHub][egghead]
99

1010
If you want to contribute with code, please open a Pull Request. A few things to keep in mind:
1111

12-
- The BSD project is released under the [BSD license](./LICENSE)
12+
- The project is released under the [BSD-3-Clause license](./LICENSE)
1313
- Please use [pre-commit](https://pre-commit.com/) to ensure some formatting rules and basic consistency checks are applied before each Git commit
1414
- Please add tests for your changes!
1515
- Please document any changes using the [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention

LICENSE

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Copyright 2012 Doist Ltd.
2+
3+
Redistribution and use in source and binary forms, with or without modification,
4+
are permitted provided that the following conditions are met:
5+
6+
1. Redistributions of source code must retain the above copyright notice, this
7+
list of conditions and the following disclaimer.
8+
9+
2. Redistributions in binary form must reproduce the above copyright notice,
10+
this list of conditions and the following disclaimer in the documentation and/or
11+
other materials provided with the distribution.
12+
13+
3. Neither the name of the copyright holder nor the names of its contributors
14+
may be used to endorse or promote products derived from this software without
15+
specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
21+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
24+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,4 +367,4 @@ poetry run pytest
367367

368368
Copyright: 2012 by Doist Ltd.
369369

370-
License: BSD
370+
License: BSD-3-Clause

bitmapist/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
7777
:copyright: 2012 by Doist Ltd.
7878
:developer: Amir Salihefendic ( http://amix.dk )
79-
:license: BSD
79+
:license: BSD-3-Clause
8080
"""
8181

8282
from __future__ import annotations

bitmapist/cohort/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
6060
:copyright: 2012 by Doist Ltd.
6161
:developer: Amir Salihefendic ( http://amix.dk )
62-
:license: BSD
62+
:license: BSD-3-Clause
6363
"""
6464

6565
from datetime import date, datetime, timedelta, timezone

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ authors = [
66
"Amir Salihefendic <dev@doist.com>",
77
"Doist Developers <dev@doist.com>",
88
]
9-
license="BSD"
9+
license="BSD-3-Clause"
1010
readme = "README.md"
1111
repository = "https://github.com/Doist/bitmapist"
1212
keywords=[ "redis", "bitmap", "analytics", "bitmaps", "realtime", "cohort", ]
1313
classifiers=[
1414
"Development Status :: 5 - Production/Stable",
1515
"Intended Audience :: Developers",
16-
"License :: OSI Approved :: BSD License",
16+
"License :: OSI Approved :: BSD 3-Clause \"New\" or \"Revised\" License (BSD-3-Clause)",
1717
"Operating System :: OS Independent",
1818
"Programming Language :: Python",
1919
"Programming Language :: Python :: 3",

0 commit comments

Comments
 (0)