Skip to content

Commit 7cd4ac0

Browse files
radarhereradarhere
authored
Merge branch 'main' into sbom
2 parents 990905d + b893310 commit 7cd4ac0

7 files changed

Lines changed: 239 additions & 73 deletions

File tree

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
tidelift: "pypi/pillow"
1+
github: python-pillow
2+
tidelift: pypi/pillow

‎.github/dependencies.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"brotli": "1.2.0",
3+
"bzip2": "1.0.8",
4+
"freetype": "2.14.3",
5+
"fribidi": "1.0.16",
6+
"harfbuzz": "13.2.1",
7+
"jpegturbo": "3.1.4.1",
8+
"lcms2": "2.18",
9+
"libavif": "1.4.1",
10+
"libimagequant": "4.4.1",
11+
"libpng": "1.6.56",
12+
"libwebp": "1.6.0",
13+
"libxcb": "1.17.0",
14+
"openjpeg": "2.5.4",
15+
"tiff": "4.7.1",
16+
"xz": "5.8.3",
17+
"zlib-ng": "2.3.3",
18+
"zstd": "1.5.7"
19+
}

‎.github/renovate.json‎

Lines changed: 158 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,168 @@
77
"Dependency"
88
],
99
"minimumReleaseAge": "7 days",
10+
"schedule": [
11+
"* * 3 * *"
12+
],
13+
"customManagers": [
14+
{
15+
"customType": "regex",
16+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
17+
"matchStrings": ["\"brotli\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
18+
"depNameTemplate": "brotli",
19+
"packageNameTemplate": "google/brotli",
20+
"datasourceTemplate": "github-releases",
21+
"extractVersionTemplate": "^v(?<version>.+)$"
22+
},
23+
{
24+
"customType": "regex",
25+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
26+
"matchStrings": ["\"bzip2\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
27+
"depNameTemplate": "bzip2",
28+
"packageNameTemplate": "bzip2/bzip2",
29+
"datasourceTemplate": "gitlab-tags",
30+
"extractVersionTemplate": "^bzip2-(?<version>.+)$"
31+
},
32+
{
33+
"customType": "regex",
34+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
35+
"matchStrings": ["\"freetype\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
36+
"depNameTemplate": "freetype",
37+
"packageNameTemplate": "freetype/freetype",
38+
"datasourceTemplate": "gitlab-tags",
39+
"registryUrlTemplate": "https://gitlab.freedesktop.org",
40+
"extractVersionTemplate": "^VER-(?<version>[\\d-]+)$",
41+
"versioningTemplate": "regex:^(?<major>\\d+)[.-](?<minor>\\d+)[.-](?<patch>\\d+)$"
42+
},
43+
{
44+
"customType": "regex",
45+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
46+
"matchStrings": ["\"fribidi\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
47+
"depNameTemplate": "fribidi",
48+
"packageNameTemplate": "fribidi/fribidi",
49+
"datasourceTemplate": "github-releases",
50+
"extractVersionTemplate": "^v(?<version>.+)$"
51+
},
52+
{
53+
"customType": "regex",
54+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
55+
"matchStrings": ["\"harfbuzz\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
56+
"depNameTemplate": "harfbuzz",
57+
"packageNameTemplate": "harfbuzz/harfbuzz",
58+
"datasourceTemplate": "github-releases"
59+
},
60+
{
61+
"customType": "regex",
62+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
63+
"matchStrings": ["\"jpegturbo\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
64+
"depNameTemplate": "jpegturbo",
65+
"packageNameTemplate": "libjpeg-turbo/libjpeg-turbo",
66+
"datasourceTemplate": "github-releases"
67+
},
68+
{
69+
"customType": "regex",
70+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
71+
"matchStrings": ["\"lcms2\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
72+
"depNameTemplate": "lcms2",
73+
"packageNameTemplate": "mm2/Little-CMS",
74+
"datasourceTemplate": "github-releases",
75+
"extractVersionTemplate": "^lcms(?<version>.+)$"
76+
},
77+
{
78+
"customType": "regex",
79+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
80+
"matchStrings": ["\"libavif\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
81+
"depNameTemplate": "libavif",
82+
"packageNameTemplate": "AOMediaCodec/libavif",
83+
"datasourceTemplate": "github-releases",
84+
"extractVersionTemplate": "^v(?<version>.+)$"
85+
},
86+
{
87+
"customType": "regex",
88+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
89+
"matchStrings": ["\"libimagequant\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
90+
"depNameTemplate": "libimagequant",
91+
"packageNameTemplate": "ImageOptim/libimagequant",
92+
"datasourceTemplate": "github-tags"
93+
},
94+
{
95+
"customType": "regex",
96+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
97+
"matchStrings": ["\"libpng\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
98+
"depNameTemplate": "libpng",
99+
"packageNameTemplate": "pnggroup/libpng",
100+
"datasourceTemplate": "github-tags",
101+
"extractVersionTemplate": "^v(?<version>.+)$"
102+
},
103+
{
104+
"customType": "regex",
105+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
106+
"matchStrings": ["\"libwebp\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
107+
"depNameTemplate": "libwebp",
108+
"packageNameTemplate": "webmproject/libwebp",
109+
"datasourceTemplate": "github-tags",
110+
"extractVersionTemplate": "^v(?<version>.+)$"
111+
},
112+
{
113+
"customType": "regex",
114+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
115+
"matchStrings": ["\"libxcb\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
116+
"depNameTemplate": "libxcb",
117+
"packageNameTemplate": "xorg/lib/libxcb",
118+
"datasourceTemplate": "gitlab-tags",
119+
"registryUrlTemplate": "https://gitlab.freedesktop.org",
120+
"extractVersionTemplate": "^libxcb-(?<version>.+)$"
121+
},
122+
{
123+
"customType": "regex",
124+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
125+
"matchStrings": ["\"openjpeg\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
126+
"depNameTemplate": "openjpeg",
127+
"packageNameTemplate": "uclouvain/openjpeg",
128+
"datasourceTemplate": "github-releases",
129+
"extractVersionTemplate": "^v(?<version>.+)$"
130+
},
131+
{
132+
"customType": "regex",
133+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
134+
"matchStrings": ["\"tiff\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
135+
"depNameTemplate": "tiff",
136+
"packageNameTemplate": "libtiff/libtiff",
137+
"datasourceTemplate": "gitlab-tags",
138+
"extractVersionTemplate": "^v(?<version>.+)$"
139+
},
140+
{
141+
"customType": "regex",
142+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
143+
"matchStrings": ["\"xz\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
144+
"depNameTemplate": "xz",
145+
"packageNameTemplate": "tukaani-project/xz",
146+
"datasourceTemplate": "github-releases",
147+
"extractVersionTemplate": "^v(?<version>.+)$"
148+
},
149+
{
150+
"customType": "regex",
151+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
152+
"matchStrings": ["\"zlib-ng\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
153+
"depNameTemplate": "zlib-ng",
154+
"packageNameTemplate": "zlib-ng/zlib-ng",
155+
"datasourceTemplate": "github-releases"
156+
},
157+
{
158+
"customType": "regex",
159+
"managerFilePatterns": ["/^\\.github/dependencies\\.json$/"],
160+
"matchStrings": ["\"zstd\":\\s*\"(?<currentValue>\\d+[^\"]*)\""],
161+
"depNameTemplate": "zstd",
162+
"packageNameTemplate": "facebook/zstd",
163+
"datasourceTemplate": "github-releases",
164+
"extractVersionTemplate": "^v(?<version>.+)$"
165+
}
166+
],
10167
"packageRules": [
11168
{
12169
"groupName": "github-actions",
13-
"matchManagers": [
14-
"github-actions"
15-
],
170+
"matchManagers": ["github-actions"],
16171
"separateMajorMinor": false
17172
}
18-
],
19-
"schedule": [
20-
"* * 3 * *"
21173
]
22174
}

‎.github/workflows/cifuzz.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ on:
55
branches:
66
- "**"
77
paths:
8+
- ".github/dependencies.json"
89
- ".github/workflows/cifuzz.yml"
910
- ".github/workflows/wheels-dependencies.sh"
1011
- "**.c"
1112
- "**.h"
1213
pull_request:
1314
paths:
15+
- ".github/dependencies.json"
1416
- ".github/workflows/cifuzz.yml"
1517
- ".github/workflows/wheels-dependencies.sh"
1618
- "**.c"

‎.github/workflows/wheels-dependencies.sh‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,23 @@ fi
8989

9090
ARCHIVE_SDIR=pillow-depends-main
9191

92-
# Package versions for fresh source builds.
93-
FREETYPE_VERSION=2.14.3
94-
HARFBUZZ_VERSION=13.2.1
95-
LIBPNG_VERSION=1.6.56
96-
JPEGTURBO_VERSION=3.1.4.1
97-
OPENJPEG_VERSION=2.5.4
98-
XZ_VERSION=5.8.3
99-
ZSTD_VERSION=1.5.7
100-
TIFF_VERSION=4.7.1
101-
LCMS2_VERSION=2.18
102-
ZLIB_NG_VERSION=2.3.3
103-
LIBWEBP_VERSION=1.6.0
104-
BZIP2_VERSION=1.0.8
105-
LIBXCB_VERSION=1.17.0
106-
BROTLI_VERSION=1.2.0
107-
LIBAVIF_VERSION=1.4.1
92+
VERSIONS_FILE="$PROJECTDIR/.github/dependencies.json"
93+
_get_ver() { python3 -c "import json; print(json.load(open('$VERSIONS_FILE'))['$1'])"; }
94+
FREETYPE_VERSION=$(_get_ver freetype)
95+
HARFBUZZ_VERSION=$(_get_ver harfbuzz)
96+
LIBPNG_VERSION=$(_get_ver libpng)
97+
JPEGTURBO_VERSION=$(_get_ver jpegturbo)
98+
OPENJPEG_VERSION=$(_get_ver openjpeg)
99+
XZ_VERSION=$(_get_ver xz)
100+
ZSTD_VERSION=$(_get_ver zstd)
101+
TIFF_VERSION=$(_get_ver tiff)
102+
LCMS2_VERSION=$(_get_ver lcms2)
103+
ZLIB_NG_VERSION=$(_get_ver zlib-ng)
104+
LIBWEBP_VERSION=$(_get_ver libwebp)
105+
BZIP2_VERSION=$(_get_ver bzip2)
106+
LIBXCB_VERSION=$(_get_ver libxcb)
107+
BROTLI_VERSION=$(_get_ver brotli)
108+
LIBAVIF_VERSION=$(_get_ver libavif)
108109

109110
function build_pkg_config {
110111
if [ -e pkg-config-stamp ]; then return; fi

‎.github/workflows/wheels.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ on:
1212
push:
1313
paths:
1414
- ".ci/requirements-cibw.txt"
15+
- ".github/dependencies.json"
1516
- ".github/generate-sbom.py"
16-
- ".github/workflows/wheel*"
17+
- ".github/workflows/wheels*"
1718
- "pyproject.toml"
1819
- "setup.py"
1920
- "wheels/*"
@@ -24,8 +25,9 @@ on:
2425
pull_request:
2526
paths:
2627
- ".ci/requirements-cibw.txt"
28+
- ".github/dependencies.json"
2729
- ".github/generate-sbom.py"
28-
- ".github/workflows/wheel*"
30+
- ".github/workflows/wheels*"
2931
- "pyproject.toml"
3032
- "setup.py"
3133
- "wheels/*"

0 commit comments

Comments
 (0)