Skip to content

Commit

Permalink
Merge pull request #970 from krishjainx/update-python3.11
Browse files Browse the repository at this point in the history
Update from python3.10 to python3.11 in profile
  • Loading branch information
krnowak committed Jul 7, 2023
2 parents 37b1d93 + d3dbe8b commit 3ac8d07
Show file tree
Hide file tree
Showing 88 changed files with 1,621 additions and 1,002 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/portage-stable-packages-list
Expand Up @@ -86,6 +86,7 @@ app-arch/zstd
app-cdr/cdrtools

app-crypt/adcli
app-crypt/libb2
app-crypt/libmd
app-crypt/mit-krb5
app-crypt/pinentry
Expand All @@ -101,9 +102,11 @@ app-eselect/eselect-iptables

app-misc/c_rehash
app-misc/editor-wrapper
app-misc/pax-utils

app-portage/elt-patches
app-portage/portage-utils
app-portage/gentoolkit

app-shells/bash
app-shells/bash-completion
Expand All @@ -116,6 +119,8 @@ app-text/docbook-xsl-stylesheets
app-text/manpager
app-text/sgml-common

dev-cpp/gtest

dev-db/sqlite

dev-lang/duktape
Expand Down Expand Up @@ -423,10 +428,14 @@ sys-fs/multipath-tools
sys-kernel/linux-headers

sys-libs/binutils-libs
sys-libs/ldb
sys-libs/libcap
sys-libs/libcap-ng
sys-libs/libseccomp
sys-libs/readline
sys-libs/talloc
sys-libs/tdb
sys-libs/tevent
sys-libs/zlib

sys-process/tini
Expand All @@ -442,4 +451,6 @@ virtual/perl-Getopt-Long
virtual/perl-IO
virtual/pkgconfig

x11-base/xorg-proto

x11-libs/pixman
6 changes: 6 additions & 0 deletions changelog/updates/2023-07-07-python3.11.md
@@ -0,0 +1,6 @@
- pax-utils ([1.3.7](https://gitweb.gentoo.org/proj/pax-utils.git/log/?h=v1.3.7))
- python ([3.11.3](https://www.python.org/downloads/release/python-3113/))
- ldb ([2.4.4](https://gitlab.com/samba-team/samba/-/commit/b686ef00da46d4a0c0aba0c61b1866cbc9b462b6) (includes [2.4.3](https://gitlab.com/samba-team/samba/-/commit/604f94704f30e90ef960aa2be62a14d2e614a002), [2.4.2](https://gitlab.com/samba-team/samba/-/commit/d93892d2e8ed69758c15ab18bc03bba09e715bc6)))
- talloc ([2.4.0](https://gitlab.com/samba-team/samba/-/commit/5224ed98eeba43f22b5f5f87de5947fbb1c1c7c1) (includes [2.3.4](https://gitlab.com/samba-team/samba/-/commit/0189ccf9fc3d2a77cc83cffe180e307bcdccebb4)))
- tdb ([1.4.8](https://gitlab.com/samba-team/samba/-/commit/eab796a4f9172e602dc262f3c99ead35b35929e7) (includes [1.4.7](https://gitlab.com/samba-team/samba/-/commit/27ceb1c3ad786386e746a5e2968780d791393b9e), [1.4.6](https://gitlab.com/samba-team/samba/-/commit/1c776e54cf33b46b2ed73263f093d596a0cdbb2f)))
- tevent ([0.14.1](https://gitlab.com/samba-team/samba/-/commit/d80f28b081e515e32a480daf80b42cf782447a9c) (includes [0.14.0](https://gitlab.com/samba-team/samba/-/commit/3c6d28ebae27dba8e40558ae37ae8138ea0b4bdc), [0.13.0](https://gitlab.com/samba-team/samba/-/commit/63d4db63feda920c8020f8484a8b31065b7f1380), [0.12.1](https://gitlab.com/samba-team/samba/-/commit/53692735c733d01acbd953641f831a1f5e0cf6c5), 0.12.0))
Expand Up @@ -4,7 +4,7 @@

EAPI=7

PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )

inherit multilib python-any-r1 systemd toolchain-funcs

Expand Down
Expand Up @@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=7
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )
TMPFILES_OPTIONAL=1
inherit python-any-r1 systemd tmpfiles

Expand Down
Expand Up @@ -14,7 +14,7 @@ else
KEYWORDS="amd64 arm arm64 x86"
fi

PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )

inherit cros-workon systemd python-any-r1

Expand Down
Expand Up @@ -52,3 +52,6 @@ EOF
# Don't bundle these paths, since they are useless to us.
mv usr/lib/systemd/lib*.so* usr/lib64/
rm -fr boot etc/* usr/lib/systemd var/db/pkg

# Remove test stuff from python - it's quite large.
rm -rf usr/lib/python*/test
Expand Up @@ -14,7 +14,7 @@ else
KEYWORDS="amd64 arm arm64 x86"
fi

PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )

inherit cros-workon python-single-r1

Expand Down
@@ -1,4 +1,4 @@
From e40cd8c76bee4f7c108c1066d60aaf5d8c3adede Mon Sep 17 00:00:00 2001
From b8396c72055ecc90b1a0e824b517a50cee9a843c Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Thu, 8 Dec 2022 16:25:39 +0100
Subject: [PATCH] profile: Default to main repo name
Expand All @@ -11,42 +11,44 @@ Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
Closes: https://github.com/gentoo/gentoolkit/pull/24
Signed-off-by: Sam James <sam@gentoo.org>
---
pym/gentoolkit/profile.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
pym/gentoolkit/profile.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pym/gentoolkit/profile.py b/pym/gentoolkit/profile.py
index dcd02cc..c880137 100644
index f6943be..7469138 100644
--- a/pym/gentoolkit/profile.py
+++ b/pym/gentoolkit/profile.py
@@ -23,19 +23,26 @@ def warning(msg):
print('warning: %s' % msg, file=sys.stderr)
@@ -21,21 +21,26 @@ def warning(msg):
print("warning: %s" % msg, file=sys.stderr)


-def load_profile_data(portdir=None, repo='gentoo'):
+def load_profile_data(portdir=None, repo=''):
"""Load the list of known arches from the tree
-def load_profile_data(portdir=None, repo="gentoo"):
+def load_profile_data(portdir=None, repo=""):
"""Load the list of known arches from the tree

Args:
portdir: The repository to load all data from (and ignore |repo|)
- repo: Look up this repository by name to locate profile data
+ repo: Look up this repository by name to locate profile data (if empty, uses main repo name)
Args:
portdir: The repository to load all data from (and ignore |repo|)
- repo: Look up this repository by name to locate profile data
+ repo: Look up this repository by name to locate profile data (if empty, uses main repo name)

Returns:
A dict mapping the keyword to its preferred state:
{'x86': ('stable', 'arch'), 'mips': ('dev', '~arch'), ...}
"""
if portdir is None:
- portdir = portage.db[portage.root]['vartree'].settings.repositories[repo].location
+ repos = portage.db[portage.root]["vartree"].settings.repositories
+ if repo == "":
+ main_repo = repos.mainRepo()
+ if main_repo is None:
+ repo = "gentoo"
+ else:
+ repo = main_repo.name
+ portdir = repos[repo].location
Returns:
A dict mapping the keyword to its preferred state:
{'x86': ('stable', 'arch'), 'mips': ('dev', '~arch'), ...}
"""
if portdir is None:
- portdir = (
- portage.db[portage.root]["vartree"].settings.repositories[repo].location
- )
+ repos = portage.db[portage.root]["vartree"].settings.repositories
+ if repo == "":
+ main_repo = repos.mainRepo()
+ if main_repo is None:
+ repo = "gentoo"
+ else:
+ repo = main_repo.name
+ portdir = repos[repo].location

arch_status = {}
arch_status = {}

--
2.25.1
Expand Down
Expand Up @@ -3,7 +3,7 @@

EAPI=7

PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )

inherit autotools linux-info python-r1 systemd

Expand Down
Expand Up @@ -3,7 +3,7 @@

EAPI=7

PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+),xml(+)"
TMPFILES_OPTIONAL=1
inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam tmpfiles
Expand Down
Expand Up @@ -3,7 +3,7 @@

EAPI=7

PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )

inherit bash-completion-r1 python-single-r1

Expand Down
Expand Up @@ -18,12 +18,13 @@ LUA_SINGLE_TARGET="lua5-3"
LUA_TARGETS="lua5-3"

# Use Python 3 as the default version
USE="${USE} -python_single_target_python2_7 python_single_target_python3_10"
USE="${USE} -python_targets_python2_7 python_targets_python3_10"
USE="${USE} -python_single_target_python2_7 python_single_target_python3_11"
USE="${USE} -python_targets_python2_7 python_targets_python3_11"

# Use Python 3 as the default version
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_python2_7 python_single_target_python3_10"
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_python2_7 python_targets_python3_10"
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_python2_7 python_single_target_python3_11"
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_python2_7 python_targets_python3_11"


# Never install cron or cron jobs
USE="${USE} -cron"
Expand Down
Expand Up @@ -12,6 +12,9 @@
=app-crypt/rhash-1.4.2 ~arm64
=app-emulation/open-vmdk-1.0 *

# Keep versions on both arches in sync.
=app-misc/pax-utils-1.3.7 ~amd64

# Required for addressing CVE-2022-3715.
=app-shells/bash-5.2_p15-r3 ~amd64 ~arm64

Expand All @@ -26,7 +29,7 @@
=dev-lang/python-3.10.12 ~amd64

# Accept unstable host Rust compilers
=dev-lang/rust-1.70.0 ~amd64 ~arm64
=dev-lang/rust-1.70.0-r1 ~amd64 ~arm64

# Needed by arm64-native SDK.
=dev-lang/yasm-1.3.0-r1 ~arm64
Expand All @@ -50,14 +53,14 @@
=net-misc/curl-8.1.2 ~amd64 ~arm64

# Keep versions on both arches in sync.
=sec-policy/selinux-base-2.20200818-r2 ~arm64
=sec-policy/selinux-base-policy-2.20200818-r2 ~arm64
=sec-policy/selinux-base-2.20200818-r3 ~arm64
=sec-policy/selinux-base-policy-2.20200818-r3 ~arm64
=sec-policy/selinux-unconfined-2.20200818-r2 ~arm64
=sec-policy/selinux-virt-2.20200818-r2 ~arm64
=sys-apps/checkpolicy-3.1 ~arm64
=sys-apps/coreutils-9.3-r2 ~arm64
=sys-apps/kexec-tools-2.0.24 ~arm64
=sys-apps/policycoreutils-3.1-r3 ~arm64
=sys-apps/policycoreutils-3.1-r4 ~arm64
=sys-apps/sandbox-2.30-r1 ~arm64
=sys-apps/semodule-utils-3.1 ~arm64

Expand All @@ -72,8 +75,8 @@

# Keep versions on both arches in sync.
=sys-fs/multipath-tools-0.9.5 ~amd64
=sys-libs/libselinux-3.1-r2 ~arm64
=sys-libs/libsemanage-3.1-r1 ~arm64
=sys-libs/libselinux-3.1-r3 ~arm64
=sys-libs/libsemanage-3.1-r2 ~arm64
=sys-libs/libsepol-3.1 ~arm64

# A dependency of app-shells/bash version that we need for security
Expand All @@ -85,3 +88,6 @@

# Accept unstable host Rust compilers.
=virtual/rust-1.70.0 ~amd64 ~arm64

# Keep versions on both arches in sync.
=x11-base/xorg-proto-2023.2 ~amd64
Expand Up @@ -17,6 +17,6 @@
# libxcrypt -> glibc -> python).
>=virtual/libcrypt-2

# Python 3.11 is stable in portage-stable, so avoid picking it
# Python 3.12 is in portage-stable (currently testing), so avoid picking it
# up. Update this to mask later versions when we switch to 3.11.
>=dev-lang/python-3.11
>=dev-lang/python-3.12
@@ -1,15 +1,17 @@
# Never enable experimental code
kdbus

# We default to python 3.10 for now
# We default to python 3.11 for now
python_targets_python2_7
python_single_target_python2_7
python_targets_python3_8
python_single_target_python3_8
python_targets_python3_9
python_single_target_python3_9
python_targets_python3_11
python_single_target_python3_11
python_targets_python3_10
python_single_target_python3_10
python_targets_python3_12
python_single_target_python3_12

# Unmask selinux so it can be enabled selectively in package.use
-selinux
Expand Up @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PVR}.tar.bz2"
https://dev.gentoo.org/~perfinion/patches/${PN}/patchbundle-${PN}-${PV}-r2.tar.bz2"
KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi

Expand Down
Expand Up @@ -4,8 +4,8 @@
EAPI="7"

# flatcar changes
PYTHON_COMPAT=( python3_{8,9,10} )
PYTHON_REQ_USE="xml"
PYTHON_COMPAT=( python3_{8,9,10,11} )
PYTHON_REQ_USE="xml(+)"
TMPFILES_OPTIONAL=1
inherit systemd tmpfiles python-any-r1

Expand All @@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_${PV/./_}/refpolicy-${PV}.tar.bz2
https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PVR}.tar.bz2"
https://dev.gentoo.org/~perfinion/patches/selinux-base-policy/patchbundle-selinux-base-policy-${PV}-r2.tar.bz2"

KEYWORDS="amd64 -arm ~arm64 ~mips x86"
fi
Expand Down
Expand Up @@ -3,7 +3,7 @@

EAPI=8

PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{8..11} )
TMPFILES_OPTIONAL=1

# At least at the moment, while a CMake port exists, it's not recommended
Expand Down
Expand Up @@ -2,8 +2,8 @@
# Distributed under the terms of the GNU General Public License v2

EAPI="7"
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_REQ_USE="xml"
PYTHON_COMPAT=( python3_{6..11} )
PYTHON_REQ_USE="xml(+)"

inherit multilib python-r1 toolchain-funcs bash-completion-r1

Expand Down
Expand Up @@ -8,7 +8,7 @@

EAPI=7

PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )

TMPFILES_OPTIONAL=1
inherit autotools flag-o-matic linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs tmpfiles
Expand Down
Expand Up @@ -16,7 +16,7 @@ fi
inherit cros-workon

if [[ -n ${GRUB_AUTOGEN} ]]; then
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )
WANT_LIBTOOL=none
inherit autotools python-any-r1
fi
Expand Down
Expand Up @@ -3,7 +3,7 @@

EAPI=8

PYTHON_COMPAT=( python3_{9..10} )
PYTHON_COMPAT=( python3_{9..11} )

inherit bash-completion-r1 python-single-r1 udev

Expand Down
Expand Up @@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2

EAPI="7"
PYTHON_COMPAT=( python3_{6..10} )
PYTHON_COMPAT=( python3_{6..11} )
USE_RUBY="ruby25 ruby26 ruby27"

# No, I am not calling ruby-ng
Expand Down

0 comments on commit 3ac8d07

Please sign in to comment.