Skip to content

Commit 921e661

Browse files
cpburnzcpburnz
committed
Licensing
1 parent 2d6020e commit 921e661

9 files changed

Lines changed: 53 additions & 17 deletions

File tree

‎CHANGES.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@ Change History
22
==============
33

44

5+
1.2.0 (TBD)
6+
-----------
7+
8+
Major changes:
9+
10+
- TODO `Issue #116`_: Change license from MPL-2.0 to dual MIT and MPL-2.0.
11+
12+
13+
.. _`Issue #116`: https://github.com/cpburnz/python-pathspec/issues/116
14+
15+
516
1.1.1 (2026-04-26)
617
------------------
718

‎CHANGES_1.in.rst‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11

2+
1.2.0 (TBD)
3+
-----------
4+
5+
Major changes:
6+
7+
- TODO `Issue #116`_: Change license from MPL-2.0 to dual MIT and MPL-2.0.
8+
9+
10+
.. _`Issue #116`: https://github.com/cpburnz/python-pathspec/issues/116
11+
12+
213
1.1.1 (2026-04-26)
314
------------------
415

‎LICENSING.md‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# Licensing
22

3-
*pathspec* was originally licensed under the Mozilla Public License 2.0 only (see LICENSE-MPL-2.0). It is currently being relicensed. New code is available
3+
*pathspec* was originally licensed under the Mozilla Public License 2.0 only (see LICENSE-MPL-2.0). It is being relicensed to MIT. New code is available
44
under both licenses (see LICENSE-MIT and LICENSE-MPL-2.0).
55

6+
## Original Code (before May 24, 2025)
7+
8+
All code committed before May 24, 2025 is licensed under the Mozilla Public License 2.0 only (see LICENSE-MPL-2.0).
9+
610
## New Code (on or after May 24, 2025)
711

8-
All contributions made on or after May 24, 2025 are dual-licensed under:
12+
All code committed on or after May 24, 2025 is dual-licensed under:
913
- MIT License (see LICENSE-MIT).
1014
- Mozilla Public License 2.0 (see LICENSE-MPL-2.0).
1115

1216
You may use this code under the terms of either license.
13-
14-
## Original Code (before May 24, 2025)
15-
16-
All code contributed before May 24, 2025 is licensed under the
17-
Mozilla Public License 2.0 only (see LICENSE-MPL-2.0).

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include *.py
66
include *.rst
77
include *.toml
88
include pathspec/py.typed
9-
include LICENSE
9+
include LICENSE-*
1010
recursive-include benchmarks *
1111
recursive-include doc *
1212
recursive-include tests *

‎README-dist.rst‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ the files to keep, and exclude files like *.gitignore*, you need to set
145145
License
146146
-------
147147

148-
*pathspec* is licensed under the `Mozilla Public License Version 2.0`_. See
149-
`LICENSE`_ or the `FAQ`_ for more information.
148+
*pathspec* is currently licensed under the `Mozilla Public License Version 2.0`_. See `LICENSING.md`_, `LICENSE-MPL-2.0`_ or the `FAQ`_ for more information.
150149

151150
In summary, you may use *pathspec* with any closed or open source project
152151
without affecting the license of the larger work so long as you:
@@ -156,7 +155,8 @@ without affecting the license of the larger work so long as you:
156155
- and release any custom changes made to *pathspec*.
157156

158157
.. _`Mozilla Public License Version 2.0`: http://www.mozilla.org/MPL/2.0
159-
.. _`LICENSE`: LICENSE
158+
.. _`LICENSE-MPL-2.0`: LICENSE-MPL-2.0
159+
.. _`LICENSING.md`: LICENSING.md
160160
.. _`FAQ`: http://www.mozilla.org/MPL/2.0/FAQ.html
161161

162162

@@ -227,6 +227,17 @@ Change History
227227
==============
228228

229229

230+
1.2.0 (TBD)
231+
-----------
232+
233+
Major changes:
234+
235+
- TODO `Issue #116`_: Change license from MPL-2.0 to dual MIT and MPL-2.0.
236+
237+
238+
.. _`Issue #116`: https://github.com/cpburnz/python-pathspec/issues/116
239+
240+
230241
1.1.1 (2026-04-26)
231242
------------------
232243

‎README.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ the files to keep, and exclude files like *.gitignore*, you need to set
145145
License
146146
-------
147147

148-
*pathspec* is licensed under the `Mozilla Public License Version 2.0`_. See
149-
`LICENSE`_ or the `FAQ`_ for more information.
148+
*pathspec* is currently licensed under the `Mozilla Public License Version 2.0`_. See `LICENSING.md`_, `LICENSE-MPL-2.0`_ or the `FAQ`_ for more information.
150149

151150
In summary, you may use *pathspec* with any closed or open source project
152151
without affecting the license of the larger work so long as you:
@@ -156,7 +155,8 @@ without affecting the license of the larger work so long as you:
156155
- and release any custom changes made to *pathspec*.
157156

158157
.. _`Mozilla Public License Version 2.0`: http://www.mozilla.org/MPL/2.0
159-
.. _`LICENSE`: LICENSE
158+
.. _`LICENSE-MPL-2.0`: LICENSE-MPL-2.0
159+
.. _`LICENSING.md`: LICENSING.md
160160
.. _`FAQ`: http://www.mozilla.org/MPL/2.0/FAQ.html
161161

162162

‎justfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ _venv_pypy_update:
137137
################################################################################
138138

139139
_dist_build: _dist_prebuild
140-
find ./dist -type f -delete
140+
if [ -d ./dist ]; then find ./dist -type f -delete; fi
141141
{{cpy_run}} python -m build
142142

143143
_dist_prebuild:

‎pyproject.in.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ classifiers = [
2525
"Topic :: Utilities",
2626
]
2727
description = "Utility library for gitignore style pattern matching of file paths."
28+
# TODO: Once fully relicensed, use:
29+
#license = {text = "MIT OR MPL-2.0"}
2830
license = {text = "MPL 2.0"}
2931
name = "pathspec"
3032
readme = "README-dist.rst"
@@ -65,7 +67,7 @@ include = [
6567
"*.py",
6668
"*.rst",
6769
"*.toml",
68-
"LICENSE",
70+
"LICENSE-*",
6971
"benchmarks/",
7072
"doc/",
7173
"tests/",

‎pyproject.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ classifiers = [
2626
"Topic :: Utilities",
2727
]
2828
description = "Utility library for gitignore style pattern matching of file paths."
29+
# TODO: Once fully relicensed, use:
30+
#license = {text = "MIT OR MPL-2.0"}
2931
license = {text = "MPL 2.0"}
3032
name = "pathspec"
3133
readme = "README-dist.rst"
@@ -66,7 +68,7 @@ include = [
6668
"*.py",
6769
"*.rst",
6870
"*.toml",
69-
"LICENSE",
71+
"LICENSE-*",
7072
"benchmarks/",
7173
"doc/",
7274
"tests/",

0 commit comments

Comments
 (0)