Skip to content

Commit 62d8c28

Browse files
authored
Merge pull request #67 from nschloe/gpl3
relicense to GPLv3+
2 parents 20eeaa3 + 8fb195f commit 62d8c28

3 files changed

Lines changed: 18 additions & 25 deletions

File tree

LICENSE

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
The MIT License (MIT)
1+
pygalmesh, a Python frontend to CGAL's 3D meshing capabilities
2+
Copyright (C) 2016-2020 Nico Schlömer
23

3-
Copyright (c) 2016-2020 Nico Schlömer
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation, either version 3 of the License, or
7+
(at your option) any later version.
48

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU General Public License for more details.
1113

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
14+
You should have received a copy of the GNU General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
[![Debian CI](https://badges.debian.net/badges/debian/testing/python3-pygalmesh/version.svg?style=flat-square)](https://tracker.debian.org/pkg/python3-pygalmesh)
1111
[![GitHub stars](https://img.shields.io/github/stars/nschloe/pygalmesh.svg?style=flat-square&label=Stars&logo=github)](https://github.com/nschloe/pygalmesh)
1212
[![PyPi downloads](https://img.shields.io/pypi/dm/pygalmesh.svg?style=flat-square)](https://pypistats.org/packages/pygalmesh)
13-
[![Slack](https://img.shields.io/static/v1?logo=slack&label=chat&message=on%20slack&color=4a154b&style=flat-square)](https://app.slack.com/client/TTL6Q54A3/CTLHRPYLF)
13+
[![Slack](https://img.shields.io/static/v1?logo=slack&label=chat&message=on%20slack&color=4a154b&style=flat-square)](https://join.slack.com/t/nschloe/shared_invite/zt-cofhrwm8-BgdrXAtVkOjnDmADROKD7A
14+
)
1415

1516
pygalmesh is a Python frontend to [CGAL](https://www.cgal.org/)'s [3D mesh generation
1617
capabilities](https://doc.cgal.org/latest/Mesh_3/index.html).
@@ -403,6 +404,4 @@ pytest
403404

404405
### License
405406

406-
pygalmesh is published under the [MIT license](https://en.wikipedia.org/wiki/MIT_License).
407-
408-
CGAL's licenses can be obtained [here](https://www.cgal.org/license.html).
407+
pygalmesh is published under the [GPLv3+ license](https://www.gnu.org/licenses/gpl-3.0.en.html).

setup.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[metadata]
22
name = pygalmesh
3-
version = 0.5.2
3+
version = 0.6.0
44
url = https://github.com/nschloe/pygalmesh
55
author = Nico Schlömer
66
email = nico.schloemer@gmail.com
77
description = Python frontend to CGAL's 3D mesh generation capabilities
88
long_description = file: README.md
99
long_description_content_type = text/markdown
10-
license = MIT
10+
license = GPLv3+
1111
classifiers =
1212
Development Status :: 4 - Beta
13-
License :: OSI Approved :: MIT License
13+
License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
1414
Operating System :: OS Independent
1515
Programming Language :: Python :: 3
1616
Programming Language :: Python :: 3.5

0 commit comments

Comments
 (0)