Obsolete Python 3.12 and modules

build/illumos/files/aarch64.env

@@ -31,12 +31,11 @@ export PERL_PKGVERS=
 
 export PYTHON3_PKGVERS=-${PYTHON3_VERSION//./}
 
-# Until the python migration is complete, continue to deliver the older
-# python modules too.
-export BUILDPY3b=
-export PYTHON3b_VERSION=3.12
-export PYTHON3b_PKGVERS=-312
-export PYTHON3b_SUFFIX=
+# During python migrations, also deliver the older python modules.
+#export BUILDPY3b=
+#export PYTHON3b_VERSION=3.12
+#export PYTHON3b_PKGVERS=-312
+#export PYTHON3b_SUFFIX=
 
 # Populates /etc/versions/build on each nightly run
 export BUILDVERSION_EXEC="git describe --all --long --dirty"

build/meta/illumos-tools.p5m

@@ -32,5 +32,4 @@ depend fmri=system/library/mozilla-nss type=require
 depend fmri=system/header type=require
 depend fmri=system/management/snmp/net-snmp type=require
 depend fmri=text/gnu-gettext type=require
-depend fmri=runtime/python-312 type=require
 depend fmri=runtime/python-313 type=require

build/meta/omnios-build-tools.p5m

@@ -41,19 +41,6 @@ depend fmri=pkg://$(PKGPUBLISHER)/library/libpsl type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/lzlib type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/nspr type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/pcre2 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/coverage-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/crossenv-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/jsonrpclib-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/jsonschema-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/meson-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/packaging-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pip-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pycurl-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pyopenssl-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/pyyaml-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/rapidjson-312 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/setuptools-rust-312 \
-    type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/coverage-313 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/crossenv-313 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/library/python-3/jsonrpclib-313 type=require
@@ -76,7 +63,6 @@ depend fmri=pkg://$(PKGPUBLISHER)/runtime/java/openjdk11 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/runtime/java/openjdk21 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/runtime/perl type=require
 depend fmri=pkg://$(PKGPUBLISHER)/runtime/python-27 type=require
-depend fmri=pkg://$(PKGPUBLISHER)/runtime/python-312 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/runtime/python-313 type=require
 depend fmri=pkg://$(PKGPUBLISHER)/service/network/tftp type=require
 depend fmri=pkg://$(PKGPUBLISHER)/system/header/header-audio type=require

build/obsolete/python-311/python-311.p5m

@@ -4,4 +4,4 @@
 set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/runtime/[email protected],$(SUNOSVER)-$(PVER)
 set name=pkg.renamed value=true
 set name=publisher value=$(PKGPUBEMAIL)
-depend type=require fmri=pkg:/runtime/python-312
+depend type=require fmri=pkg:/runtime/python-313

build/obsolete/python-312/README

@@ -0,0 +1,38 @@
+The following packages were made obsolete in r151053 as part of the migration
+to Python 3.13:
+
+	library/python-3/asn1crypto-312
+	library/python-3/attrs-312
+	library/python-3/cffi-312
+	library/python-3/coverage-312
+	library/python-3/crossenv-312
+	library/python-3/cryptography-312
+	library/python-3/idna-312
+	library/python-3/js-regex-312
+	library/python-3/jsonrpclib-312
+	library/python-3/jsonschema-312
+	library/python-3/meson-312
+	library/python-3/orjson-312
+	library/python-3/packaging-312
+	library/python-3/pip-312
+	library/python-3/pycodestyle-312
+	library/python-3/pycparser-312
+	library/python-3/pycurl-312
+	library/python-3/pyopenssl-312
+	library/python-3/pyrsistent-312
+	library/python-3/pyyaml-312
+	library/python-3/rapidjson-312
+	library/python-3/semantic-version-312
+	library/python-3/setuptools-312
+	library/python-3/setuptools-rust-312
+	library/python-3/six-312
+	library/python-3/tomli-312
+	library/python-3/typing-extensions-312
+	runtime/python-312
+	system/library/python/libbe-312
+	system/library/python/solaris-312
+	system/library/python/zfs-312
+
+All of these obsolete package entries can be removed in the r151055 cycle,
+after r151054 (next LTS) has been released.
+

build/obsolete/python-312/asn1crypto-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/attrs-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/cffi-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/coverage-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/crossenv-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/cryptography-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/idna-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/js-regex-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/jsonrpclib-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/jsonschema-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/meson-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/orjson-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/packaging-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/pip-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/pycodestyle-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/pycparser-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/pycurl-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/pyopenssl-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/pyrsistent-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/python-312.p5m

@@ -0,0 +1,7 @@
+# The version is set to .99 here as it is likely that python 3.12 will continue
+# to be updated in older releases, and this obsolete package needs to be newer
+# for the upgrade to succeed.
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/runtime/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.renamed value=true
+set name=publisher value=$(PKGPUBEMAIL)
+depend type=require fmri=pkg:/runtime/python-313

build/obsolete/python-312/pyyaml-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/rapidjson-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/semantic-version-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/setuptools-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/setuptools-rust-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/six-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/system-libbe-311.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/system/library/python/[email protected],$(SUNOSVER)-$(PVER)
+set name=publisher value=$(PKGPUBEMAIL)
+set name=pkg.obsolete value=true

build/obsolete/python-312/system-solaris-311.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/system/library/python/[email protected],$(SUNOSVER)-$(PVER)
+set name=publisher value=$(PKGPUBEMAIL)
+set name=pkg.obsolete value=true

build/obsolete/python-312/system-zfs-311.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/system/library/python/[email protected],$(SUNOSVER)-$(PVER)
+set name=publisher value=$(PKGPUBEMAIL)
+set name=pkg.obsolete value=true

build/obsolete/python-312/tomli-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)

build/obsolete/python-312/typing-extensions-312.p5m

@@ -0,0 +1,3 @@
+set name=pkg.fmri value=pkg://$(PKGPUBLISHER)/library/python-3/[email protected],$(SUNOSVER)-$(PVER)
+set name=pkg.obsolete value=true
+set name=publisher value=$(PKGPUBEMAIL)