Merge pull request #509 from citrus-it/py

Stop shipping python 3.12 modules
omniosorg · Feb 3, 2025 · 66fb66b · 66fb66b
2 parents a1e9480 + 453bc94
commit 66fb66b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 17 deletions.
diff --git a/src/Makefile.com b/src/Makefile.com
@@ -34,7 +34,7 @@ CFLAGS = -m64 -Wall -Werror -Wextra -gdwarf-2 -gstrict-dwarf \
 CPPFLAGS = -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 
 # Whitespace separated list of versions to build and test.
-PYVERSIONS = 3.12 3.13
+PYVERSIONS = 3.13
 # The single version used for shebang lines and packaging.
 PYVER = 3.13
 

diff --git a/src/pkg/Makefile b/src/pkg/Makefile
@@ -108,7 +108,7 @@ INCORP            = consolidation\:ips\:ips-incorporation
 
 PM_TRANSFORMS     = defaults
 # For python version migrations
-PM_TRANSFORMS     += pynext
+#PM_TRANSFORMS     += pynext
 
 i386_DEFINES      = \
 	i386_ONLY=''    \

diff --git a/src/pkg/external_deps.txt b/src/pkg/external_deps.txt
@@ -1,16 +1,4 @@
     #
-    pkg:/runtime/python-312
-    pkg:/library/python-3/cffi-312
-    pkg:/library/python-3/coverage-312
-    pkg:/library/python-3/cryptography-312
-    pkg:/library/python-3/jsonrpclib-312
-    pkg:/library/python-3/jsonschema-312
-    pkg:/library/python-3/pybonjour-312
-    pkg:/library/python-3/pycurl-312
-    pkg:/library/python-3/pyopenssl-312
-    pkg:/library/python-3/rapidjson-312
-    pkg:/library/python-3/setuptools-312
-    #
     pkg:/runtime/python-313
     pkg:/library/python-3/cffi-313
     pkg:/library/python-3/coverage-313
@@ -23,7 +11,6 @@
     pkg:/library/python-3/rapidjson-313
     pkg:/library/python-3/setuptools-313
     #
-    pkg:/system/library/python/libbe-312
     pkg:/system/library/python/libbe-313
     #
     pkg:/SUNWcs

diff --git a/src/pkg/manifests/package:pkg.p5m b/src/pkg/manifests/package:pkg.p5m
@@ -28,7 +28,6 @@
 #
 <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
@@ -15,7 +15,6 @@
 
 <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"