aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2014-04-22 21:51:31 +0200
committerFabian Groffen <grobian@gentoo.org>2014-04-22 21:51:31 +0200
commit0a8f92ef5e248e0726454769806c1d7b1a60bb67 (patch)
treee42518da61db37bae56192a1ec9f848169affc78 /runtests.sh
parentportage_gid: allow numeric groups (diff)
parent_compute_abi_rebuild_info: deal with non-Package parents (diff)
downloadportage-0a8f92ef5e248e0726454769806c1d7b1a60bb67.tar.gz
portage-0a8f92ef5e248e0726454769806c1d7b1a60bb67.tar.bz2
portage-0a8f92ef5e248e0726454769806c1d7b1a60bb67.zip
Merge tag 'v2.2.10' into prefix
Conflicts: pym/portage/dbapi/bintree.py
Diffstat (limited to 'runtests.sh')
-rwxr-xr-xruntests.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtests.sh b/runtests.sh
index 7f1233a9d..9b7ea4236 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -3,8 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
# These are the versions we care about. The rest are just "nice to have".
-PYTHON_SUPPORTED_VERSIONS="2.6 2.7 3.2 3.3"
-PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 2.7-pypy-1.9 2.7-pypy-2.0 3.1 3.2 3.3 3.4"
+PYTHON_SUPPORTED_VERSIONS="2.6 2.7 3.2 3.3 3.4"
+PYTHON_VERSIONS="2.6 2.7 2.7-pypy-1.8 2.7-pypy-1.9 2.7-pypy-2.0 3.1 3.2 3.3 3.4 3.5"
# has to be run from portage root dir
cd "${0%/*}" || exit 1