Merge pull request #508 from citrus-it/shebang

Switch to python 3.13 primary
omniosorg · Jan 3, 2025 · a1e9480 · a1e9480
2 parents b2c33f8 + 5a40ca4
commit a1e9480
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/src/Makefile.com b/src/Makefile.com
@@ -36,7 +36,7 @@ CPPFLAGS = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 # Whitespace separated list of versions to build and test.
 PYVERSIONS = 3.12 3.13
 # The single version used for shebang lines and packaging.
-PYVER = 3.12
+PYVER = 3.13
 
 SHELL= /usr/bin/ksh93
 INSTALL = /usr/sbin/install

diff --git a/src/pkg/manifests/package:pkg.p5m b/src/pkg/manifests/package:pkg.p5m
@@ -26,9 +26,9 @@
 <transform file path=$(PYDIRVP)/pkg/solver -> \
     set pkg.depend.bypass-generate libm.so.0>
 #
-<include bundledlicences.3.12.core.p5m>
-<include bundledmodules.3.12.core.p5m>
+<include bundledlicences.3.13.core.p5m>
 <include bundledmodules.3.13.core.p5m>
+<include bundledmodules.3.12.core.p5m>
 set name=pkg.fmri value=pkg:/package/pkg@$(PKGVERS)
 set name=pkg.summary value="Image Packaging System - pkg(7)"
 set name=pkg.description \

diff --git a/src/pkg/manifests/system:zones:brand:bhyve.p5m b/src/pkg/manifests/system:zones:brand:bhyve.p5m
@@ -13,9 +13,9 @@
 # Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 #
 
-<include bundledlicences.3.12.bhyve.p5m>
-<include bundledmodules.3.12.bhyve.p5m>
+<include bundledlicences.3.13.bhyve.p5m>
 <include bundledmodules.3.13.bhyve.p5m>
+<include bundledmodules.3.12.bhyve.p5m>
 set name=pkg.fmri value=pkg:/system/zones/brand/bhyve@$(PKGVERS)
 set name=pkg.summary value="Image Packaging System branded zone - bhyve zones"
 set name=pkg.description value="Support for bhyve branded zones"
@@ -31,8 +31,10 @@ dir  path=usr/lib
 dir  path=usr/lib/brand
 dir  path=usr/lib/brand/bhyve
 dir  path=usr/lib/brand/bhyve/__pycache__
-file path=usr/lib/brand/bhyve/__pycache__/bootlib.cpython-312.pyc mode=0444
-file path=usr/lib/brand/bhyve/__pycache__/bundle.cpython-312.pyc mode=0444
+file path=usr/lib/brand/bhyve/__pycache__/bootlib.cpython$(PYPKGVERS).pyc \
+    mode=0444
+file path=usr/lib/brand/bhyve/__pycache__/bundle.cpython$(PYPKGVERS).pyc \
+    mode=0444
 file path=usr/lib/brand/bhyve/boot mode=0555
 file path=usr/lib/brand/bhyve/bootlib.py mode=0444
 file path=usr/lib/brand/bhyve/bundle.py mode=0444
@@ -45,10 +47,13 @@ file path=usr/lib/brand/bhyve/support mode=0555
 dir  path=usr/lib/brand/bhyve/uefi
 file path=usr/lib/brand/bhyve/uefi/__init__.py mode=0444
 dir  path=usr/lib/brand/bhyve/uefi/__pycache__
-file path=usr/lib/brand/bhyve/uefi/__pycache__/__init__.cpython-312.pyc \
+file \
+    path=usr/lib/brand/bhyve/uefi/__pycache__/__init__.cpython$(PYPKGVERS).pyc \
+    mode=0444
+file path=usr/lib/brand/bhyve/uefi/__pycache__/align.cpython$(PYPKGVERS).pyc \
+    mode=0444
+file path=usr/lib/brand/bhyve/uefi/__pycache__/vars.cpython$(PYPKGVERS).pyc \
     mode=0444
-file path=usr/lib/brand/bhyve/uefi/__pycache__/align.cpython-312.pyc mode=0444
-file path=usr/lib/brand/bhyve/uefi/__pycache__/vars.cpython-312.pyc mode=0444
 file path=usr/lib/brand/bhyve/uefi/align.py mode=0444
 file path=usr/lib/brand/bhyve/uefi/vars.py mode=0444
 file path=usr/lib/brand/bhyve/uninstall mode=0555

diff --git a/src/pkg/transforms/pynext b/src/pkg/transforms/pynext
@@ -28,8 +28,12 @@
 <transform path=TBD -> delete pkg.depend.bypass-generate notfound>
 
 # Deliver new modules alongside the old ones (temporary, during migration)
-<transform path=TBD -> edit path 312 313>
-<transform path=TBD -> edit path 3.12 3.13>
+#<transform path=TBD -> edit path 312 313>
+#<transform path=TBD -> edit path 3.12 3.13>
+
+# Deliver old modules alongside the new ones (temporary, during migration)
+<transform path=TBD -> edit path 313 312>
+<transform path=TBD -> edit path 3.13 3.12>
 
 <transform path=TBD -> edit path TBD ''>