summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2020-10-15 17:07:21 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2020-10-15 20:00:32 +0000
commit35503c46c081960182e28d30b899864318c4c8ef (patch)
treebd5caf7081237106524e97bbbb06fe5b3075e86f
parentb27af292e3ff58f9529871f58dbaff93a6519863 (diff)
downloadarbor-35503c46c081960182e28d30b899864318c4c8ef.tar.gz
arbor-35503c46c081960182e28d30b899864318c4c8ef.tar.xz
python: drop 3.5
Python 3.5 reached its "end of life" at the end of September 2020. https://www.python.org/dev/peps/pep-0478/ https://pythoninsider.blogspot.com/2020/10/python-35-is-no-longer-supported.html
-rw-r--r--exlibs/python.exlib2
-rw-r--r--metadata/repository_mask.conf1
-rw-r--r--packages/dev-lang/python/python-3.5.10.exheres-086
-rw-r--r--profiles/make.defaults4
4 files changed, 3 insertions, 90 deletions
diff --git a/exlibs/python.exlib b/exlibs/python.exlib
index d50fc68bb..8066fe627 100644
--- a/exlibs/python.exlib
+++ b/exlibs/python.exlib
@@ -225,7 +225,7 @@ case ${PYTHON_EXLIB_API} in
# PYTHON_AVAILABLE_ABIS below need to be in sync with
# MULTIBUILD_PYTHON_ABIS_TARGETS in profiles/make.defaults.
- PYTHON_AVAILABLE_ABIS="2.7 3.5 3.6 3.7 3.8"
+ PYTHON_AVAILABLE_ABIS="2.7 3.6 3.7 3.8"
if [[ ${PYTHON_BLACKLIST} == none ]]; then
PYTHON_FILTERED_ABIS="${PYTHON_AVAILABLE_ABIS}"
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 8479c690f..f96f0cf4d 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -141,7 +141,6 @@ dev-lang/python:2.7[<2.7.11-r2] [[
]]
(
- dev-lang/python:3.5[<3.5.10]
dev-lang/python:3.6[<3.6.12]
dev-lang/python:3.7[<3.7.9]
dev-lang/python:3.8[<3.8.5]
diff --git a/packages/dev-lang/python/python-3.5.10.exheres-0 b/packages/dev-lang/python/python-3.5.10.exheres-0
deleted file mode 100644
index e3c99932d..000000000
--- a/packages/dev-lang/python/python-3.5.10.exheres-0
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2009, 2010 Ingmar Vanhassel
-# Distributed under the terms of the GNU General Public License v2
-
-require python-build
-
-PLATFORMS="~amd64 ~arm ~armv7 ~x86"
-
-DEPENDENCIES+="
- build+run:
- app-arch/xz
- !dev-lang/python:3.2[=3.2.5] [[
- description = [ Man file collision ]
- ]]
-"
-
-src_test() {
- local DISABLE_TESTS
-
- DISABLE_TESTS=(
- # Has problems with path resolution
- test_distutils
-
- # Never-ending threads running under gdb
- test_gdb
-
- # Runs forever sometimes (sandboxing issue?)
- test_multiprocessing_fork
- test_multiprocessing_forkserver
- test_multiprocessing_spawn
-
- # Fails in CI environment
- # ERROR: test_localtime_daylight_false_dst_true (test.test_email.test_utils.LocaltimeTests)
- # ERROR: test_localtime_daylight_true_dst_true (test.test_email.test_utils.LocaltimeTests)
- # Both fail with "OverflowError: mktime argument out of range"
- test_email
-
- # Seems to hang
- test_socket
-
- # Want access to DNS
- test_robotparser
- test_smtpnet
- test_ssl
- test_timeout
- test_urllib
- test_urllibnet
- test_urllib2
- test_urllib2_localnet
- test_urllib2net
-
- # Want to bind to 0.0.0.0/::
- # TODO: check which of these tests actually fall in this category
- test_asyncio
- test_fcntl
- test_float
- test_ftplib
- test_httplib
- test_normalization
- test_os
- test_pathlib
- test_pydoc
- test_pyexpat
- test_site
- test_sqlite
- )
-
- # for test_socketserver
- esandbox allow_net "unix:${TEMP%/}"'/unix_socket.*'
-
- # for test_sysconfig
- esandbox allow_net "unix:${TEMP%/}"/'tmp*'
-
- # for test_logging
- esandbox allow_net "unix:${TEMP%/}"'/test_logging_*.sock'
-
- # for test_asyncore
- esandbox allow_net "unix:${PWD%/}"'/build/test_python_*/@test_*_tmp'
-
- python-build_src_test
-
- esandbox disallow_net "unix:${PWD%/}"'/build/test_python_*/@test_*_tmp'
- esandbox disallow_net "unix:${TEMP%/}"'/test_logging_*.sock'
- esandbox disallow_net "unix:${TEMP%/}"/'tmp*'
- esandbox disallow_net "unix:${TEMP%/}"'/unix_socket.*'
-}
-
diff --git a/profiles/make.defaults b/profiles/make.defaults
index 53548b35d..33b8e742f 100644
--- a/profiles/make.defaults
+++ b/profiles/make.defaults
@@ -25,16 +25,16 @@ MULTIBUILD_LUA_ABIS_5_1_PROFILE_LUA="lua5.1"
# MULTIBUILD_PYTHON_ABIS_TARGETS below need to be in sync with
# PYTHON_AVAILABLE_ABIS in exlibs/python.exlib.
-MULTIBUILD_PYTHON_ABIS_TARGETS="2.7 3.5 3.6 3.7 3.8"
+MULTIBUILD_PYTHON_ABIS_TARGETS="2.7 3.6 3.7 3.8"
MULTIBUILD_PYTHON_ABIS_LOCKED_VARS="PYTHON"
MULTIBUILD_PYTHON_ABIS_REQUIRED_VARS="PYTHON"
MULTIBUILD_PYTHON_ABIS_3_8_PROFILE_PYTHON="python3.8"
MULTIBUILD_PYTHON_ABIS_3_7_PROFILE_PYTHON="python3.7"
MULTIBUILD_PYTHON_ABIS_3_6_PROFILE_PYTHON="python3.6"
-MULTIBUILD_PYTHON_ABIS_3_5_PROFILE_PYTHON="python3.5"
MULTIBUILD_PYTHON_ABIS_2_7_PROFILE_PYTHON="python2.7"
# this is kept around to ensure old env can be sourced when replacing packages
+MULTIBUILD_PYTHON_ABIS_3_4_PROFILE_PYTHON="python3.5"
MULTIBUILD_PYTHON_ABIS_3_4_PROFILE_PYTHON="python3.4"
MULTIBUILD_PYTHON_ABIS_3_3_PROFILE_PYTHON="python3.3"
MULTIBUILD_PYTHON_ABIS_3_2_PROFILE_PYTHON="python3.2"