From 03db32ae98008f3f211efb69c0f5bebfd47771ce Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 12 Jun 2018 13:36:54 +0000 Subject: [PATCH] profiles: Update Python 3 to 3.6 --- .../coreos-overlay/profiles/coreos/base/make.defaults | 8 ++++---- .../coreos-overlay/profiles/coreos/base/package.mask | 3 --- .../coreos-overlay/profiles/coreos/base/package.use | 10 +++++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 6eb7b5cd05..cab6184a7e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -14,12 +14,12 @@ USE_EXPAND="${USE_EXPAND} GO_VERSION" USE="${USE} cros_host expat -cracklib -introspection -cups -tcpd -berkdb" # Continue using Python 2 as the default version, but build Python 3 support. -USE="${USE} python_single_target_python2_7 -python_single_target_python3_4" -USE="${USE} python_targets_python2_7 python_targets_python3_4" +USE="${USE} python_single_target_python2_7 -python_single_target_python3_5 -python_single_target_python3_6" +USE="${USE} python_targets_python2_7 -python_targets_python3_5 python_targets_python3_6" # Disable Python 3 while building the SDK until we transition off Python 2. -BOOTSTRAP_USE="${BOOTSTRAP_USE} python_single_target_python2_7 -python_single_target_python3_4" -BOOTSTRAP_USE="${BOOTSTRAP_USE} python_targets_python2_7 -python_targets_python3_4" +BOOTSTRAP_USE="${BOOTSTRAP_USE} python_single_target_python2_7 -python_single_target_python3_5 -python_single_target_python3_6" +BOOTSTRAP_USE="${BOOTSTRAP_USE} python_targets_python2_7 -python_targets_python3_5 -python_targets_python3_6" # Never install cron or cron jobs USE="${USE} -cron" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index ce0e4900f3..8e2e86bac9 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -14,6 +14,3 @@ # mask an accidental rkt major version bump to ensure it's not chosen over more # recent releases =app-emulation/rkt-13.0 - -# Temporarily block newer stable Python versions until profiles are updated. ->=dev-lang/python-3.5 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 08042b1104..c1b65bac7e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -19,11 +19,11 @@ sys-devel/gettext -git app-emulation/qemu aio caps curl jpeg ncurses png python threads uuid vhost-net virtfs vnc qemu_softmmu_targets_x86_64 # python3 problems -app-portage/gentoolkit -python_targets_python3_4 -app-portage/gentoolkit-dev -python_targets_python3_4 -app-portage/repoman -python_targets_python3_4 -dev-python/uritemplate -python_targets_python3_4 -sys-apps/portage -python_targets_python3_4 +app-portage/gentoolkit -python_targets_python3_6 +app-portage/gentoolkit-dev -python_targets_python3_6 +app-portage/repoman -python_targets_python3_6 +dev-python/uritemplate -python_targets_python3_6 +sys-apps/portage -python_targets_python3_6 sys-apps/gptfdisk -icu