Skip to content

Commit f76d43d

Browse files
committed
[GR-55062] Rework patch license check
PullRequest: graalpython/3392
2 parents afa79cc + bb07842 commit f76d43d

File tree

90 files changed

+289
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+289
-252
lines changed

graalpython/com.oracle.graal.python.test/src/tests/test_patch_metadata.py

Lines changed: 0 additions & 97 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
[[rules]]
22
version = '== 3.0.10'
33
patch = 'Cython-3.0.10.patch'
4+
license = 'Apache-2.0'
45

56
[[rules]]
67
version = '== 0.29.37'
78
patch = 'Cython-0.29.37.patch'
9+
license = 'Apache-2.0'
810

911
[[rules]]
1012
version = '== 0.29.32'
1113
patch = 'Cython-0.29.32.patch'
14+
license = 'Apache-2.0'

graalpython/lib-graalpython/patches/MarkupSafe/metadata.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
[[rules]]
33
version = "< 2.1.0"
44
patch = "MarkupSafe.patch"
5+
license = "BSD-3-Clause"
56
install-priority = 0 # Don't make pip install prefer this version
67
dist-type = "sdist"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[[rules]]
22
patch = 'PyDriller.patch'
3+
license = 'Apache-2.0'

graalpython/lib-graalpython/patches/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ Configuration files are named `metadata.toml` and can contain the following:
1111
[[rules]]
1212
# Optional. Relative path to a patch file. May be omitted when the entry just specifies `install-priority`
1313
patch = 'foo-1.0.0.patch'
14+
# Required if 'patch' is specified. SPDX license expression for the package (allows parentheses, 'AND', 'OR', 'WITH').
15+
# Allowed licenses are enumerated in mx.graalpython/verify_patches.py
16+
license = 'MIT'
1417
# Optional. Version specifier according to https://peps.python.org/pep-0440/#version-specifiers. If omitted, it will
1518
# match any version
1619
version = '== 1.0.0'
@@ -33,4 +36,5 @@ install-priority = 1
3336
# The next entry will apply to all other artifacts of foo
3437
[[patches]]
3538
patch = 'foo.patch'
39+
license = 'MIT'
3640
```
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[[rules]]
22
version = '== 0.5.1'
33
patch = 'asv-0.5.1.patch'
4+
license = 'BSD-3-Clause'

graalpython/lib-graalpython/patches/atomicwrites/metadata.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ version = '>1.4'
66
install-priority = 0
77
version = '>1.3'
88
patch = 'atomicwrites.patch'
9+
license = 'MIT'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[[rules]]
22
patch = 'autopep8.patch'
3+
license = 'MIT'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[[rules]]
22
version = '== 4.0.1'
33
patch = 'bcrypt-4.0.1.patch'
4+
license = 'Apache-2.0'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
[[rules]]
22
patch = 'blosc2.patch'
3+
license = 'Apache-2.0'

0 commit comments

Comments
 (0)