Skip to content

Commit

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

* Apply suggestions from code review

Co-authored-by: Greg Lucas <greg.m.lucas@gmail.com>

* Update copyright notices to be Crown and Cartopy contribs; explictly state bsd 3-clause where possible

* Fix trailing whitespace precommit

---------

Co-authored-by: Greg Lucas <greg.m.lucas@gmail.com>
  • Loading branch information
lbdreyer and greglucas committed Jan 29, 2024
1 parent ec891b0 commit 97c6a64
Show file tree
Hide file tree
Showing 126 changed files with 375 additions and 1,452 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) Crown and Cartopy contributors.
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.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include .gitattributes
include .gitignore
exclude .pre-commit-config.yaml
include CHANGES
include COPYING*
include LICENSE
include environment.yml
include INSTALL
recursive-include lib/cartopy *.cpp *.py *.pyx
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ Code is just one of many ways of positively contributing to Cartopy, please see
our [contributing guide](.github/CONTRIBUTING.md) for more details on how
you can get involved.

Cartopy is released under a LGPL license with a shared copyright model.
See [COPYING](COPYING) and [COPYING.LESSER](COPYING.LESSER) for full terms.
Cartopy is released under the 3-Clause BSD license with a shared copyright model.
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
7 changes: 3 additions & 4 deletions benchmarks/cases/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.
7 changes: 3 additions & 4 deletions benchmarks/cases/geodesic.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.

import numpy as np

Expand Down
7 changes: 3 additions & 4 deletions benchmarks/cases/gridliner.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.

import matplotlib.pyplot as plt

Expand Down
7 changes: 3 additions & 4 deletions benchmarks/cases/mpl_redraw.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.

import io

Expand Down
7 changes: 3 additions & 4 deletions benchmarks/cases/project_linear.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.

import cartopy.crs as ccrs
import cartopy.io.shapereader as shpreader
Expand Down
7 changes: 3 additions & 4 deletions docs/make_projection.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.

import inspect
from pathlib import Path
Expand Down
7 changes: 3 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.

# -*- coding: utf-8 -*-
#
Expand Down
28 changes: 7 additions & 21 deletions docs/source/copyright.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,16 @@ Cartopy copyright, licensing and contributors
Cartopy code
------------

All Cartopy source code, unless explicitly stated, is |copy| ``British Crown
copyright, 2016`` and is licensed under the **GNU Lesser General Public
License** as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version. You should find all source
files with the following header:
All Cartopy source code, unless explicitly stated, is ``Copyright Crown and
Cartopy contributors`` and is licensed under the **BSD 3-Clause License**.
You should find all source files with the following header:

.. admonition:: Code License

|copy| British Crown Copyright 2011 - 2016, Met Office

This file is part of cartopy.

Cartopy is free software: you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

Cartopy is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License
along with cartopy. If not, see `<https://www.gnu.org/licenses/>`_.
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy and is released under the BSD 3-Clause license.
# See LICENSE in the root of the repository for full licensing details.


Cartopy documentation and examples
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Getting involved
Cartopy was originally developed at the UK Met Office to allow scientists to visualise
their data on maps quickly, easily and most importantly, accurately.
Cartopy has been made freely available under the terms of the
`GNU Lesser General Public License <https://www.gnu.org/licenses/lgpl.html>`_.
`BSD 3-Clause License <https://opensource.org/license/bsd-3-clause/>`_.
It is suitable to be used in a variety
of scientific fields and has an :doc:`active development community <contributors>`.

Expand Down
7 changes: 3 additions & 4 deletions lib/cartopy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.
import os
from pathlib import Path
import tempfile
Expand Down
7 changes: 3 additions & 4 deletions lib/cartopy/_epsg.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.
"""
Provide support for converting EPSG codes to Projection instances.
Expand Down
7 changes: 3 additions & 4 deletions lib/cartopy/crs.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright Cartopy Contributors
# Copyright Crown and Cartopy Contributors
#
# This file is part of Cartopy 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 Cartopy and is released under the BSD 3-clause license.
# See LICENSE in the root of the repository for full licensing details.

"""
The crs module defines Coordinate Reference Systems and the transformations
Expand Down
3 changes: 0 additions & 3 deletions lib/cartopy/data/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@ HadISST data: https://www.metoffice.gov.uk/hadobs/hadisst/terms_and_conditions.h

The image 50-natural-earth-1-downsampled.png is downsampled from Natural Earth data whose conditions are stated at https://www.naturalearthdata.com/about/terms-of-use/ (public domain).

gshhs is LGPL, but their documentation doesn't state a version https://www.soest.hawaii.edu/pwessel/gshhg/.
The same data sets are part of the GMT package which is packaged in linux distributions, including debian.

The image Miriam.A2012270.2050.2km.jpg is from the Rapid Response section of the NASA LANCE data, which states it is in the public domain https://earthdata.nasa.gov/faq#ed-rapid-response-faq
Loading

0 comments on commit 97c6a64

Please sign in to comment.