Skip to content

Commit

Permalink
profiles: Switch default PYTHON_TARGET to Python 3.5
Browse files Browse the repository at this point in the history
Closes: #6330
  • Loading branch information
mgorny committed Nov 28, 2017
1 parent e974a3d commit b62ce3f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 22 deletions.
4 changes: 1 addition & 3 deletions profiles/arch/alpha/use.stable.mask
@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

# This file requires eapi 5 or later. New entries go on top.
Expand All @@ -8,8 +8,6 @@
# Mask python targets until dev-lang/python is stable.
python_single_target_python3_6
python_targets_python3_6
python_single_target_python3_5
python_targets_python3_5

# Tobias Klausmann <klausman@gentoo.org> (17 Mar 2016)
# Webkit itself is enormous (~13h compile+test on our fastest dev machine), so
Expand Down
7 changes: 4 additions & 3 deletions profiles/base/make.defaults
Expand Up @@ -113,12 +113,13 @@ PYTHONDONTWRITEBYTECODE="1"
# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE
# Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}"
# This MUST be kept in sync with the PYTHON_TARGETS below
BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_4 python_targets_python2_7"
BOOTSTRAP_USE="cxx unicode internal-glib python_targets_python3_5 python_targets_python2_7"

# Mike Gilbert <floppym@gentoo.org> (15 May 2012)
# Default target(s) for python-r1.eclass
PYTHON_TARGETS="python2_7 python3_4"
PYTHON_SINGLE_TARGET="python3_4"
# Updated to python3_5 on 28 Nov 2017
PYTHON_TARGETS="python2_7 python3_5"
PYTHON_SINGLE_TARGET="python3_5"

# Michał Górny <mgorny@gentoo.org> (10 Aug 2013)
# Moved from portage's make.globals.
Expand Down
7 changes: 0 additions & 7 deletions profiles/base/package.use
@@ -1,13 +1,6 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

# David Seifert <soap@gentoo.org> (17 Apr 2017)
# Only python 3.5 supported
kde-apps/kajongg:5 python_single_target_python3_5 python_targets_python3_5
dev-python/pygcrypt python_targets_python3_5
dev-python/uvloop python_targets_python3_5
media-gfx/blender python_targets_python3_5

# David Seifert <soap@gentoo.org> (17 Apr 2017)
# These py2-only packages also support pypy, enable
# Python 2.7 as the default implementation, preparing
Expand Down
1 change: 0 additions & 1 deletion profiles/base/package.use.stable.mask
Expand Up @@ -138,7 +138,6 @@ app-emulation/ganeti monitoring

# Mike Gilbert <floppym@gentoo.org> (03 Oct 2015)
# Unmask stable-masked implementations for python-exec
dev-lang/python-exec -python_targets_python3_5
dev-lang/python-exec -python_targets_python3_6

# Pacho Ramos <pacho@gentoo.org> (15 May 2015)
Expand Down
2 changes: 1 addition & 1 deletion profiles/features/prefix/standalone/legacy/make.defaults
Expand Up @@ -14,4 +14,4 @@ ac_cv_func_utimensat=no
ac_cv_func_pipe2=no

# >=python-3 is masked.
PYTHON_TARGETS="-python3_4"
PYTHON_TARGETS="-python3_5"
7 changes: 0 additions & 7 deletions profiles/prefix/use.stable.mask

This file was deleted.

0 comments on commit b62ce3f

Please sign in to comment.