Skip to content

Commit

Permalink
Relicense from LGPL-3 to BSD-3 (#331)
Browse files Browse the repository at this point in the history
* Relicense to BSD

* Apply suggestions from code review

Co-authored-by: Patrick Peglar <[email protected]>

Co-authored-by: Patrick Peglar <[email protected]>
  • Loading branch information
lbdreyer and pp-mo authored Jan 11, 2023
1 parent fedca42 commit e993a9b
Show file tree
Hide file tree
Showing 31 changed files with 89 additions and 926 deletions.
674 changes: 0 additions & 674 deletions COPYING

This file was deleted.

165 changes: 0 additions & 165 deletions COPYING.LESSER

This file was deleted.

29 changes: 29 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
BSD 3-Clause License

Copyright (c) 2015, Met Office.
All rights reserved.

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.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
[![Flake8](https://img.shields.io/badge/lint-flake8-lightgrey)](https://github.com/PyCQA/flake8)
[![isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
\
[![Licence](https://img.shields.io/github/license/SciTools/cf-units)](COPYING)
[![Licence](https://img.shields.io/badge/license-BSD--3-orange)](LICENSE)
[![Contributors](https://img.shields.io/github/contributors/SciTools/cf-units)](https://github.com/SciTools/cf-units/graphs/contributors)
[![Commits since last release](https://img.shields.io/github/commits-since/SciTools/cf-units/latest.svg)](https://github.com/SciTools/cf-units/commits/main)

Expand Down Expand Up @@ -76,8 +76,8 @@ Code is just one of many ways of positively contributing to cf-units, please
see our [contributing guide](.github/CONTRIBUTING.md) for more details on how
you can get involved.

cf-units is released under a LGPL license with a shared copyright model.
See [COPYING](COPYING) and [COPYING.LESSER](COPYING.LESSER) for full terms.
cf-units is released under a BSD-3 license. See [LICENSE](LICENSE) for full
terms.

The [Met Office](https://metoffice.gov.uk) has made a significant
contribution to the development, maintenance and support of this library.
Expand Down
5 changes: 2 additions & 3 deletions cf_units/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
"""
Units of measure.
Expand Down
5 changes: 2 additions & 3 deletions cf_units/_udunits2.pxd
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.

cdef extern from "udunits2.h":
ctypedef struct ut_system:
Expand Down
5 changes: 2 additions & 3 deletions cf_units/_udunits2.pyx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
"""
Units of measure.
Expand Down
5 changes: 2 additions & 3 deletions cf_units/_udunits2_parser/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.

import unicodedata

Expand Down
5 changes: 2 additions & 3 deletions cf_units/_udunits2_parser/compile.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.

"""
Compiles the UDUNITS-2 grammar using ANTLR4.
Expand Down
5 changes: 2 additions & 3 deletions cf_units/_udunits2_parser/graph.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.


class Node:
Expand Down
5 changes: 2 additions & 3 deletions cf_units/config.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.


import configparser
Expand Down
5 changes: 2 additions & 3 deletions cf_units/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
5 changes: 2 additions & 3 deletions cf_units/tests/integration/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
5 changes: 2 additions & 3 deletions cf_units/tests/integration/parse/test_graph.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.

import cf_units._udunits2_parser.graph as g
from cf_units._udunits2_parser import parse
Expand Down
5 changes: 2 additions & 3 deletions cf_units/tests/integration/parse/test_parse.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.

import re

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
"""Test function :func:`cf_units._num2date_to_nearest_second`."""

import datetime
Expand Down
5 changes: 2 additions & 3 deletions cf_units/tests/integration/test_date2num.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
"""Test function :func:`cf_units.date2num`."""

import datetime
Expand Down
5 changes: 2 additions & 3 deletions cf_units/tests/integration/test_num2date.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
"""Test function :func:`cf_units.num2date`."""


Expand Down
5 changes: 2 additions & 3 deletions cf_units/tests/integration/test_num2pydate.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.
"""Test function :func:`cf_units.num2pydate`."""

import datetime
Expand Down
10 changes: 4 additions & 6 deletions cf_units/tests/test_coding_standards.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details.
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details.

import os
import subprocess
Expand All @@ -16,9 +15,8 @@

LICENSE_TEMPLATE = """# Copyright cf-units contributors
#
# This file is part of cf-units and is released under the LGPL license.
# See COPYING and COPYING.LESSER in the root of the repository for full
# licensing details."""
# This file is part of cf-units and is released under the BSD license.
# See LICENSE in the root of the repository for full licensing details."""


# Guess cf_units repo directory of cf_units - realpath is used to mitigate
Expand Down
Loading

0 comments on commit e993a9b

Please sign in to comment.