Skip to content

Commit 4afc23f

Browse files
committed
Use python 3.11.
1 parent 2806b46 commit 4afc23f

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

bundle.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ for cmd in ${CMDS}; do
2626
done
2727

2828
# kill some useless files
29-
rm -Rf "$APP_PREFIX"/lib/python3.9/test
30-
rm -Rvf "$APP_PREFIX"/lib/python3.9/*/test
31-
rm -f "$APP_PREFIX"/lib/python3.9/config/libpython3.9.a
32-
find "$APP_PREFIX"/lib/python3.9 -name '*.pyc' -delete
33-
find "$APP_PREFIX"/lib/python3.9 -name '*.pyo' -delete
29+
rm -Rf "$APP_PREFIX"/lib/python3.11/test
30+
rm -Rvf "$APP_PREFIX"/lib/python3.11/*/test
31+
rm -f "$APP_PREFIX"/lib/python3.11/config/libpython3.11.a
32+
find "$APP_PREFIX"/lib/python3.11 -name '*.pyc' -delete
33+
find "$APP_PREFIX"/lib/python3.11 -name '*.pyo' -delete
3434

3535
echo checking for dynamic linking consistency : nothing should reference gtk/inst
3636
find "$APP_PREFIX" -name '*.so' -and -print -and -exec sh -c 'otool -L $1 | grep /gtk/inst' '{}' '{}' ';'

misc/bundle/launcher.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,16 @@ set_python_path(void)
9191
CFStringRef str = make_filesystem_string(bundle_url);
9292
CFRelease(bundle_url);
9393
mstr = CFStringCreateMutableCopy(NULL, 5 * PATH_MAX, str);
94-
CFStringAppendCString(mstr, "/lib/python3.9:",
94+
CFStringAppendCString(mstr, "/lib/python3.11:",
9595
kCFStringEncodingUTF8);
9696
CFStringAppend(mstr, str);
97-
CFStringAppendCString(mstr, "/lib/python3.9/plat-darwin:",
97+
CFStringAppendCString(mstr, "/lib/python3.11/plat-darwin:",
9898
kCFStringEncodingUTF8);
9999
CFStringAppend(mstr, str);
100-
CFStringAppendCString(mstr, "/lib/python3.9/lib-dynload:",
100+
CFStringAppendCString(mstr, "/lib/python3.11/lib-dynload:",
101101
kCFStringEncodingUTF8);
102102
CFStringAppend(mstr, str);
103-
CFStringAppendCString(mstr, "/lib/python3.9/site-packages",
103+
CFStringAppendCString(mstr, "/lib/python3.11/site-packages",
104104
kCFStringEncodingUTF8);
105105
CFRelease(str);
106106
path = widen_cfstring(mstr);

misc/bundle/launcher.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
# for forked python
4242
os.environ['PYTHONHOME'] = bundle_res
4343
#Set $PYTHON to point inside the bundle
44-
PYVER = 'python3.9'
44+
PYVER = 'python3.11'
4545
sys.path.append(bundle_res)
4646
print('System Path:\n','\n'.join(sys.path))
4747

misc/bundle/pythonbase.bundle

+38-38
Original file line numberDiff line numberDiff line change
@@ -99,59 +99,59 @@
9999

100100
<!-- standard install minus unused -->
101101
<data>
102-
${prefix}/lib/python3.9/*.py
102+
${prefix}/lib/python3.11/*.py
103103
</data>
104-
<data>${prefix}/lib/python3.9/asyncio</data>
105-
<data>${prefix}/lib/python3.9/collections</data>
106-
<data>${prefix}/lib/python3.9/concurrent</data>
107-
<data>${prefix}/lib/python3.9/config-3.9-darwin</data>
108-
<data>${prefix}/lib/python3.9/ctypes</data>
109-
<data>${prefix}/lib/python3.9/curses</data>
110-
<!--<data>${prefix}/lib/python3.9/dbm</data>-->
111-
<data>${prefix}/lib/python3.9/email</data>
112-
<data>${prefix}/lib/python3.9/encodings</data>
113-
<data>${prefix}/lib/python3.9/html</data>
114-
<data>${prefix}/lib/python3.9/http</data>
115-
<!--<data>${prefix}/lib/python3.9/idlelib</data>-->
116-
<data>${prefix}/lib/python3.9/importlib</data>
117-
<data>${prefix}/lib/python3.9/json</data>
118-
<binary>${prefix}/lib/python3.9/lib-dynload</binary>
119-
<!--<data>${prefix}/lib/python3.9/lib2to3</data>-->
120-
<data>${prefix}/lib/python3.9/logging</data>
121-
<data>${prefix}/lib/python3.9/multiprocessing</data>
122-
<!--<data>${prefix}/lib/python3.9/pydoc_data</data>-->
123-
<data>${prefix}/lib/python3.9/sqlite3</data>
124-
<!--<data>${prefix}/lib/python3.9/test</data>-->
125-
<!--<data>${prefix}/lib/python3.9/tkinter</data>-->
126-
<!--<data>${prefix}/lib/python3.9/turtledemo</data>-->
127-
<data>${prefix}/lib/python3.9/unittest</data>
128-
<data>${prefix}/lib/python3.9/urllib</data>
129-
<!--<data>${prefix}/lib/python3.9/venv</data>-->
130-
<data>${prefix}/lib/python3.9/wsgiref</data>
131-
<data>${prefix}/lib/python3.9/xml</data>
104+
<data>${prefix}/lib/python3.11/asyncio</data>
105+
<data>${prefix}/lib/python3.11/collections</data>
106+
<data>${prefix}/lib/python3.11/concurrent</data>
107+
<data>${prefix}/lib/python3.11/config-3.11-darwin</data>
108+
<data>${prefix}/lib/python3.11/ctypes</data>
109+
<data>${prefix}/lib/python3.11/curses</data>
110+
<!--<data>${prefix}/lib/python3.11/dbm</data>-->
111+
<data>${prefix}/lib/python3.11/email</data>
112+
<data>${prefix}/lib/python3.11/encodings</data>
113+
<data>${prefix}/lib/python3.11/html</data>
114+
<data>${prefix}/lib/python3.11/http</data>
115+
<!--<data>${prefix}/lib/python3.11/idlelib</data>-->
116+
<data>${prefix}/lib/python3.11/importlib</data>
117+
<data>${prefix}/lib/python3.11/json</data>
118+
<binary>${prefix}/lib/python3.11/lib-dynload</binary>
119+
<!--<data>${prefix}/lib/python3.11/lib2to3</data>-->
120+
<data>${prefix}/lib/python3.11/logging</data>
121+
<data>${prefix}/lib/python3.11/multiprocessing</data>
122+
<!--<data>${prefix}/lib/python3.11/pydoc_data</data>-->
123+
<data>${prefix}/lib/python3.11/sqlite3</data>
124+
<!--<data>${prefix}/lib/python3.11/test</data>-->
125+
<!--<data>${prefix}/lib/python3.11/tkinter</data>-->
126+
<!--<data>${prefix}/lib/python3.11/turtledemo</data>-->
127+
<data>${prefix}/lib/python3.11/unittest</data>
128+
<data>${prefix}/lib/python3.11/urllib</data>
129+
<!--<data>${prefix}/lib/python3.11/venv</data>-->
130+
<data>${prefix}/lib/python3.11/wsgiref</data>
131+
<data>${prefix}/lib/python3.11/xml</data>
132132

133133
<!-- only required extra modules (no dbus, for instance) -->
134134
<data recurse="True">
135-
${prefix}/lib/python3.9/site-packages/gi/*.py
135+
${prefix}/lib/python3.11/site-packages/gi/*.py
136136
</data>
137-
<data>${prefix}/lib/python3.9/site-packages/cairo/*.py</data>
137+
<data>${prefix}/lib/python3.11/site-packages/cairo/*.py</data>
138138

139139
<binary>
140-
${prefix}/lib/python3.9/lib-dynload/*.so
140+
${prefix}/lib/python3.11/lib-dynload/*.so
141141
</binary>
142142

143143
<!-- every bundled .so must have its dynamic links rewritten to point to the bundle.
144144
Can't specify site-packages/*/*.so, so list them based on the output of postproc.sh.
145145
-->
146146
<binary>
147-
${prefix}/lib/python3.9/site-packages/cairo/*.so
147+
${prefix}/lib/python3.11/site-packages/cairo/*.so
148148
</binary>
149149
<binary>
150-
${prefix}/lib/python3.9/site-packages/gi/*.so
150+
${prefix}/lib/python3.11/site-packages/gi/*.so
151151
</binary>
152152

153153
<data>
154-
${prefix}/include/python3.9
154+
${prefix}/include/python3.11
155155
</data>
156156

157157

@@ -215,8 +215,8 @@
215215

216216
<!-- pip support -->
217217
<data>${prefix}/bin/pip3*</data>
218-
<data>${prefix}/lib/python3.9/distutils</data>
219-
<data>${prefix}/lib/python3.9/site-packages/pip</data>
220-
<data>${prefix}/lib/python3.9/xmlrpc</data>
218+
<data>${prefix}/lib/python3.11/distutils</data>
219+
<data>${prefix}/lib/python3.11/site-packages/pip</data>
220+
<data>${prefix}/lib/python3.11/xmlrpc</data>
221221

222222
</app-bundle>

0 commit comments

Comments
 (0)