Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop shipping python 3.12 modules #509

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makefile.com
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/pkg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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='' \
Expand Down
13 changes: 0 additions & 13 deletions src/pkg/external_deps.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/pkg/manifests/package:pkg.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion src/pkg/manifests/system:zones:brand:bhyve.p5m
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down