Skip to content

Commit 5a40ca4

Browse files
committed
Switch to python 3.13 primary
1 parent b2c33f8 commit 5a40ca4

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

src/Makefile.com

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CPPFLAGS = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
3636
# Whitespace separated list of versions to build and test.
3737
PYVERSIONS = 3.12 3.13
3838
# The single version used for shebang lines and packaging.
39-
PYVER = 3.12
39+
PYVER = 3.13
4040

4141
SHELL= /usr/bin/ksh93
4242
INSTALL = /usr/sbin/install

src/pkg/manifests/package:pkg.p5m

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<transform file path=$(PYDIRVP)/pkg/solver -> \
2727
set pkg.depend.bypass-generate libm.so.0>
2828
#
29-
<include bundledlicences.3.12.core.p5m>
30-
<include bundledmodules.3.12.core.p5m>
29+
<include bundledlicences.3.13.core.p5m>
3130
<include bundledmodules.3.13.core.p5m>
31+
<include bundledmodules.3.12.core.p5m>
3232
set name=pkg.fmri value=pkg:/package/pkg@$(PKGVERS)
3333
set name=pkg.summary value="Image Packaging System - pkg(7)"
3434
set name=pkg.description \

src/pkg/manifests/system:zones:brand:bhyve.p5m

+12-7
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1414
#
1515

16-
<include bundledlicences.3.12.bhyve.p5m>
17-
<include bundledmodules.3.12.bhyve.p5m>
16+
<include bundledlicences.3.13.bhyve.p5m>
1817
<include bundledmodules.3.13.bhyve.p5m>
18+
<include bundledmodules.3.12.bhyve.p5m>
1919
set name=pkg.fmri value=pkg:/system/zones/brand/bhyve@$(PKGVERS)
2020
set name=pkg.summary value="Image Packaging System branded zone - bhyve zones"
2121
set name=pkg.description value="Support for bhyve branded zones"
@@ -31,8 +31,10 @@ dir path=usr/lib
3131
dir path=usr/lib/brand
3232
dir path=usr/lib/brand/bhyve
3333
dir path=usr/lib/brand/bhyve/__pycache__
34-
file path=usr/lib/brand/bhyve/__pycache__/bootlib.cpython-312.pyc mode=0444
35-
file path=usr/lib/brand/bhyve/__pycache__/bundle.cpython-312.pyc mode=0444
34+
file path=usr/lib/brand/bhyve/__pycache__/bootlib.cpython$(PYPKGVERS).pyc \
35+
mode=0444
36+
file path=usr/lib/brand/bhyve/__pycache__/bundle.cpython$(PYPKGVERS).pyc \
37+
mode=0444
3638
file path=usr/lib/brand/bhyve/boot mode=0555
3739
file path=usr/lib/brand/bhyve/bootlib.py mode=0444
3840
file path=usr/lib/brand/bhyve/bundle.py mode=0444
@@ -45,10 +47,13 @@ file path=usr/lib/brand/bhyve/support mode=0555
4547
dir path=usr/lib/brand/bhyve/uefi
4648
file path=usr/lib/brand/bhyve/uefi/__init__.py mode=0444
4749
dir path=usr/lib/brand/bhyve/uefi/__pycache__
48-
file path=usr/lib/brand/bhyve/uefi/__pycache__/__init__.cpython-312.pyc \
50+
file \
51+
path=usr/lib/brand/bhyve/uefi/__pycache__/__init__.cpython$(PYPKGVERS).pyc \
52+
mode=0444
53+
file path=usr/lib/brand/bhyve/uefi/__pycache__/align.cpython$(PYPKGVERS).pyc \
54+
mode=0444
55+
file path=usr/lib/brand/bhyve/uefi/__pycache__/vars.cpython$(PYPKGVERS).pyc \
4956
mode=0444
50-
file path=usr/lib/brand/bhyve/uefi/__pycache__/align.cpython-312.pyc mode=0444
51-
file path=usr/lib/brand/bhyve/uefi/__pycache__/vars.cpython-312.pyc mode=0444
5257
file path=usr/lib/brand/bhyve/uefi/align.py mode=0444
5358
file path=usr/lib/brand/bhyve/uefi/vars.py mode=0444
5459
file path=usr/lib/brand/bhyve/uninstall mode=0555

src/pkg/transforms/pynext

+6-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@
2828
<transform path=TBD -> delete pkg.depend.bypass-generate notfound>
2929

3030
# Deliver new modules alongside the old ones (temporary, during migration)
31-
<transform path=TBD -> edit path 312 313>
32-
<transform path=TBD -> edit path 3.12 3.13>
31+
#<transform path=TBD -> edit path 312 313>
32+
#<transform path=TBD -> edit path 3.12 3.13>
33+
34+
# Deliver old modules alongside the new ones (temporary, during migration)
35+
<transform path=TBD -> edit path 313 312>
36+
<transform path=TBD -> edit path 3.13 3.12>
3337

3438
<transform path=TBD -> edit path TBD ''>
3539

0 commit comments

Comments
 (0)