Skip to content

Commit 66a6ad6

Browse files
committed
Relicence under MIT Licence
1 parent e993f31 commit 66a6ad6

File tree

7 files changed

+65
-231
lines changed

7 files changed

+65
-231
lines changed

LICENSE

Lines changed: 19 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,19 @@
1-
GNU LESSER GENERAL PUBLIC LICENSE
2-
Version 3, 29 June 2007
3-
4-
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5-
Everyone is permitted to copy and distribute verbatim copies
6-
of this license document, but changing it is not allowed.
7-
8-
9-
This version of the GNU Lesser General Public License incorporates
10-
the terms and conditions of version 3 of the GNU General Public
11-
License, supplemented by the additional permissions listed below.
12-
13-
0. Additional Definitions.
14-
15-
As used herein, "this License" refers to version 3 of the GNU Lesser
16-
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17-
General Public License.
18-
19-
"The Library" refers to a covered work governed by this License,
20-
other than an Application or a Combined Work as defined below.
21-
22-
An "Application" is any work that makes use of an interface provided
23-
by the Library, but which is not otherwise based on the Library.
24-
Defining a subclass of a class defined by the Library is deemed a mode
25-
of using an interface provided by the Library.
26-
27-
A "Combined Work" is a work produced by combining or linking an
28-
Application with the Library. The particular version of the Library
29-
with which the Combined Work was made is also called the "Linked
30-
Version".
31-
32-
The "Minimal Corresponding Source" for a Combined Work means the
33-
Corresponding Source for the Combined Work, excluding any source code
34-
for portions of the Combined Work that, considered in isolation, are
35-
based on the Application, and not on the Linked Version.
36-
37-
The "Corresponding Application Code" for a Combined Work means the
38-
object code and/or source code for the Application, including any data
39-
and utility programs needed for reproducing the Combined Work from the
40-
Application, but excluding the System Libraries of the Combined Work.
41-
42-
1. Exception to Section 3 of the GNU GPL.
43-
44-
You may convey a covered work under sections 3 and 4 of this License
45-
without being bound by section 3 of the GNU GPL.
46-
47-
2. Conveying Modified Versions.
48-
49-
If you modify a copy of the Library, and, in your modifications, a
50-
facility refers to a function or data to be supplied by an Application
51-
that uses the facility (other than as an argument passed when the
52-
facility is invoked), then you may convey a copy of the modified
53-
version:
54-
55-
a) under this License, provided that you make a good faith effort to
56-
ensure that, in the event an Application does not supply the
57-
function or data, the facility still operates, and performs
58-
whatever part of its purpose remains meaningful, or
59-
60-
b) under the GNU GPL, with none of the additional permissions of
61-
this License applicable to that copy.
62-
63-
3. Object Code Incorporating Material from Library Header Files.
64-
65-
The object code form of an Application may incorporate material from
66-
a header file that is part of the Library. You may convey such object
67-
code under terms of your choice, provided that, if the incorporated
68-
material is not limited to numerical parameters, data structure
69-
layouts and accessors, or small macros, inline functions and templates
70-
(ten or fewer lines in length), you do both of the following:
71-
72-
a) Give prominent notice with each copy of the object code that the
73-
Library is used in it and that the Library and its use are
74-
covered by this License.
75-
76-
b) Accompany the object code with a copy of the GNU GPL and this license
77-
document.
78-
79-
4. Combined Works.
80-
81-
You may convey a Combined Work under terms of your choice that,
82-
taken together, effectively do not restrict modification of the
83-
portions of the Library contained in the Combined Work and reverse
84-
engineering for debugging such modifications, if you also do each of
85-
the following:
86-
87-
a) Give prominent notice with each copy of the Combined Work that
88-
the Library is used in it and that the Library and its use are
89-
covered by this License.
90-
91-
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92-
document.
93-
94-
c) For a Combined Work that displays copyright notices during
95-
execution, include the copyright notice for the Library among
96-
these notices, as well as a reference directing the user to the
97-
copies of the GNU GPL and this license document.
98-
99-
d) Do one of the following:
100-
101-
0) Convey the Minimal Corresponding Source under the terms of this
102-
License, and the Corresponding Application Code in a form
103-
suitable for, and under terms that permit, the user to
104-
recombine or relink the Application with a modified version of
105-
the Linked Version to produce a modified Combined Work, in the
106-
manner specified by section 6 of the GNU GPL for conveying
107-
Corresponding Source.
108-
109-
1) Use a suitable shared library mechanism for linking with the
110-
Library. A suitable mechanism is one that (a) uses at run time
111-
a copy of the Library already present on the user's computer
112-
system, and (b) will operate properly with a modified version
113-
of the Library that is interface-compatible with the Linked
114-
Version.
115-
116-
e) Provide Installation Information, but only if you would otherwise
117-
be required to provide such information under section 6 of the
118-
GNU GPL, and only to the extent that such information is
119-
necessary to install and execute a modified version of the
120-
Combined Work produced by recombining or relinking the
121-
Application with a modified version of the Linked Version. (If
122-
you use option 4d0, the Installation Information must accompany
123-
the Minimal Corresponding Source and Corresponding Application
124-
Code. If you use option 4d1, you must provide the Installation
125-
Information in the manner specified by section 6 of the GNU GPL
126-
for conveying Corresponding Source.)
127-
128-
5. Combined Libraries.
129-
130-
You may place library facilities that are a work based on the
131-
Library side by side in a single library together with other library
132-
facilities that are not Applications and are not covered by this
133-
License, and convey such a combined library under terms of your
134-
choice, if you do both of the following:
135-
136-
a) Accompany the combined library with a copy of the same work based
137-
on the Library, uncombined with any other library facilities,
138-
conveyed under the terms of this License.
139-
140-
b) Give prominent notice with the combined library that part of it
141-
is a work based on the Library, and explaining where to find the
142-
accompanying uncombined form of the same work.
143-
144-
6. Revised Versions of the GNU Lesser General Public License.
145-
146-
The Free Software Foundation may publish revised and/or new versions
147-
of the GNU Lesser General Public License from time to time. Such new
148-
versions will be similar in spirit to the present version, but may
149-
differ in detail to address new problems or concerns.
150-
151-
Each version is given a distinguishing version number. If the
152-
Library as you received it specifies that a certain numbered version
153-
of the GNU Lesser General Public License "or any later version"
154-
applies to it, you have the option of following the terms and
155-
conditions either of that published version or of any later version
156-
published by the Free Software Foundation. If the Library as you
157-
received it does not specify a version number of the GNU Lesser
158-
General Public License, you may choose any version of the GNU Lesser
159-
General Public License ever published by the Free Software Foundation.
160-
161-
If the Library as you received it specifies that a proxy can decide
162-
whether future versions of the GNU Lesser General Public License shall
163-
apply, that proxy's public statement of acceptance of any version is
164-
permanent authorization for you to choose that version for the
165-
Library.
1+
Copyright (c) 2020-2021 Dominic Davis-Foster
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
14+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
15+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
16+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
17+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
18+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
19+
OR OTHER DEALINGS IN THE SOFTWARE.

README.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,6 @@ coverage_pyver_pragma
122122

123123
.. end shields
124124
125-
|
126-
127125
Installation
128126
--------------
129127

coverage_pyver_pragma/__init__.py

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@
66
to selectively ignore branches depending on the Python version.
77
""" # noqa: D400
88
#
9-
# Copyright (c) 2020 Dominic Davis-Foster <[email protected]>
9+
# Copyright © 2020-2021 Dominic Davis-Foster <[email protected]>
1010
#
11-
# This program is free software; you can redistribute it and/or modify
12-
# it under the terms of the GNU General Public License as published by
13-
# the Free Software Foundation; either version 3 of the License, or
14-
# (at your option) any later version.
11+
# Permission is hereby granted, free of charge, to any person obtaining a copy
12+
# of this software and associated documentation files (the "Software"), to deal
13+
# in the Software without restriction, including without limitation the rights
14+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15+
# copies of the Software, and to permit persons to whom the Software is
16+
# furnished to do so, subject to the following conditions:
1517
#
16-
# This program is distributed in the hope that it will be useful,
17-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
18-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19-
# GNU General Public License for more details.
20-
#
21-
# You should have received a copy of the GNU General Public License
22-
# along with this program; if not, write to the Free Software
23-
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
24-
# MA 02110-1301, USA.
18+
# The above copyright notice and this permission notice shall be included in all
19+
# copies or substantial portions of the Software.
2520
#
21+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
22+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
23+
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
24+
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
25+
# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
26+
# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
27+
# OR OTHER DEALINGS IN THE SOFTWARE.
2628
#
2729

2830
# stdlib
@@ -34,27 +36,26 @@
3436
# 3rd party
3537
import coverage # type: ignore
3638

37-
__all__ = [
38-
"regex_main",
39-
"Version",
40-
"make_regexes",
41-
"PyVerPragmaPlugin",
42-
"make_not_exclude_regexs",
43-
"coverage_init",
44-
]
45-
4639
if TYPE_CHECKING:
4740

4841
# stdlib
4942
from sys import _version_info as VersionInfo # pragma: no cover (typing only)
5043

5144
__author__: str = "Dominic Davis-Foster"
52-
__copyright__: str = "2020 Dominic Davis-Foster"
53-
54-
__license__: str = "LGPLV3+"
45+
__copyright__: str = "2020-2021 Dominic Davis-Foster"
46+
__license__: str = "MIT License"
5547
__version__: str = "0.0.6"
5648
__email__: str = "[email protected]"
5749

50+
__all__ = [
51+
"regex_main",
52+
"Version",
53+
"make_regexes",
54+
"PyVerPragmaPlugin",
55+
"make_not_exclude_regexs",
56+
"coverage_init",
57+
]
58+
5859
regex_main: str = re.compile(r"(?i)#\s*pragma[:\s]?\s*no\s*cover").pattern
5960

6061

doc-source/index.rst

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
======================
1+
######################
22
coverage_pyver_pragma
3-
======================
3+
######################
44

55
.. start short_desc
66
@@ -123,6 +123,19 @@ coverage_pyver_pragma
123123

124124
.. end shields
125125
126+
Installation
127+
---------------
128+
129+
.. start installation
130+
131+
.. installation:: coverage_pyver_pragma
132+
:pypi:
133+
:github:
134+
:anaconda:
135+
:conda-channels: conda-forge, domdfcoding
136+
137+
.. end installation
138+
126139
.. toctree::
127140
:hidden:
128141

repo_helper.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
modname: coverage_pyver_pragma
22
repo_name: coverage_pyver_pragma
3-
copyright_years: "2020"
3+
copyright_years: "2020-2021"
44
author: "Dominic Davis-Foster"
55
66
version: "0.0.6"
77
username: "domdfcoding"
8-
license: 'LGPLv3+'
8+
license: 'MIT'
99
short_desc: "Plugin for Coverage.py to selectively ignore branches depending on the Python version."
1010

1111
conda_channels:
@@ -22,18 +22,11 @@ python_versions:
2222
- "3.9"
2323
- "pypy3"
2424

25-
# travis secure password for PyPI
26-
27-
# directory that contains tests
2825
tests_dir: "tests"
2926

3027
classifiers:
3128
- 'Development Status :: 4 - Beta'
32-
# - "Development Status :: 5 - Production/Stable"
33-
# - "Development Status :: 6 - Mature"
34-
# - "Development Status :: 7 - Inactive"
3529
- 'Intended Audience :: Developers'
36-
- 'Topic :: Software Development :: Libraries :: Python Modules'
3730
- "Topic :: Utilities"
3831

3932
sphinx_html_theme: domdf_sphinx_theme

setup.cfg

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
name = coverage_pyver_pragma
1111
author = Dominic Davis-Foster
1212
author_email = [email protected]
13-
license = GNU Lesser General Public License v3 or later (LGPLv3+)
13+
license = MIT License
1414
keywords =
1515
long_description = file: README.rst
1616
long_description_content_type = text/x-rst
@@ -23,7 +23,7 @@ project_urls =
2323
classifiers =
2424
Development Status :: 4 - Beta
2525
Intended Audience :: Developers
26-
License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)
26+
License :: OSI Approved :: MIT License
2727
Operating System :: OS Independent
2828
Programming Language :: Python
2929
Programming Language :: Python :: 3 :: Only
@@ -33,7 +33,6 @@ classifiers =
3333
Programming Language :: Python :: 3.9
3434
Programming Language :: Python :: Implementation :: CPython
3535
Programming Language :: Python :: Implementation :: PyPy
36-
Topic :: Software Development :: Libraries :: Python Modules
3736
Topic :: Utilities
3837
Typing :: Typed
3938

tox.ini

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -145,27 +145,3 @@ package = coverage_pyver_pragma
145145
[pytest]
146146
addopts = --color yes --durations 25
147147
timeout = 300
148-
149-
[gh-actions]
150-
python =
151-
3.6: py36, build, mypy
152-
3.7: py37, build
153-
3.8: py38, build
154-
3.9: py39, build
155-
pypy3: pypy3, build
156-
157-
[travis]
158-
python =
159-
3.6: py36, build, mypy
160-
3.7: py37, build
161-
3.8: py38, build
162-
3.9: py39, build
163-
pypy3: pypy3, build
164-
165-
[testenv:yapf]
166-
basepython = python3.7
167-
changedir = {toxinidir}
168-
skip_install = True
169-
ignore_errors = True
170-
deps = yapf
171-
commands = yapf -i --recursive coverage_pyver_pragma tests

0 commit comments

Comments
 (0)