Skip to content

Commit

Permalink
Change license to BSD3 (#78)
Browse files Browse the repository at this point in the history
  • Loading branch information
fmaussion committed Jan 4, 2020
1 parent 5f8a8e7 commit dc01d14
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 169 deletions.
165 changes: 0 additions & 165 deletions LICENSE

This file was deleted.

27 changes: 27 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Copyright (c) 2014-2020, OGGM e.V. and OGGM 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: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Educational material about glaciers, powered by [OGGM](https://oggm.org) and [Bi

This is the repository of the website: http://edu.oggm.org

License: [BSD-3-Clause](https://github.com/OGGM/oggm-edu/blob/master/LICENSE.txt)

**For the notebooks and tutorials, visit https://github.com/OGGM/oggm-edu-notebooks**

![img](docs/_static/oggm.gif)
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Interested in OGGM-Edu? We would love to hear from you!
- Follow us on `Twitter`_.
- Or you can always send us an `e-mail`_ the good old way.

.. _e-mail: https://mailman.zfn.uni-bremen.de/cgi-bin/mailman/listinfo/oggm-users
.. _e-mail: info@oggm.org
.. _on GitHub: https://github.com/OGGM/oggm-edu
.. _issue tracker: https://github.com/OGGM/oggm-edu/issues
.. _pull request: https://github.com/OGGM/oggm-edu/pulls
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
#
# This field corresponds to the "Home-Page" metadata field:
# https://packaging.python.org/specifications/core-metadata/#home-page-optional
url='https://github.com/fmaussion/scispack', # Optional
url='https://edu.oggm.org', # Optional

# This should be your name or the name of the organization which owns the
# project.
author='OGGM Developers', # Optional
author='OGGM Contributors', # Optional

# This should be a valid email address corresponding to the author listed
# above.
Expand All @@ -95,7 +95,7 @@
'Topic :: Scientific/Engineering :: Visualization',

# Pick your license as you wish
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'License :: OSI Approved :: BSD License',

# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
Expand Down

0 comments on commit dc01d14

Please sign in to comment.