aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2019-10-26 10:56:23 +0200
committerAvatar Marvin Schmidt <marv@exherbo.org> 2020-03-10 06:05:46 +0100
commitfe566c952905b51e9eebd7419a85e162e01a25b6 (patch)
treea9adf1c14897d0069a76be98ebd73ac28ffd0f5c
parent5b8e37aaa5928e8d933725ee43bd880e87a95626 (diff)
downloadpaludis-fe566c952905b51e9eebd7419a85e162e01a25b6.tar.gz
paludis-fe566c952905b51e9eebd7419a85e162e01a25b6.tar.xz
ci: Remove Python 2.7 from docker images
-rw-r--r--ci/docker/exherbo/paludis-exherbo-clang/config/options/10_paludis.conf47
-rw-r--r--ci/docker/exherbo/paludis-exherbo-clang/config/sets/paludis-deps.conf1
-rw-r--r--ci/docker/exherbo/paludis-exherbo-gcc/config/options/10_paludis.conf47
-rw-r--r--ci/docker/exherbo/paludis-exherbo-gcc/config/sets/paludis-deps.conf1
4 files changed, 2 insertions, 94 deletions
diff --git a/ci/docker/exherbo/paludis-exherbo-clang/config/options/10_paludis.conf b/ci/docker/exherbo/paludis-exherbo-clang/config/options/10_paludis.conf
index 52db62d07..45526de7d 100644
--- a/ci/docker/exherbo/paludis-exherbo-clang/config/options/10_paludis.conf
+++ b/ci/docker/exherbo/paludis-exherbo-clang/config/options/10_paludis.conf
@@ -2,52 +2,7 @@
dev-lang/python sqlite
-dev-libs/boost python PYTHON_ABIS: 2.7
-
-dev-python/Babel PYTHON_ABIS: 2.7
-dev-python/Cython PYTHON_ABIS: 2.7
-dev-python/Jinja2 PYTHON_ABIS: 2.7
-dev-python/MarkupSafe PYTHON_ABIS: 2.7
-dev-python/Pygments PYTHON_ABIS: 2.7
-dev-python/Sphinx PYTHON_ABIS: 2.7
-dev-python/alabaster PYTHON_ABIS: 2.7
-dev-python/asn1crypto PYTHON_ABIS: 2.7
-dev-python/atomicwrites PYTHON_ABIS: 2.7
-dev-python/attrs PYTHON_ABIS: 2.7
-dev-python/certifi PYTHON_ABIS: 2.7
-dev-python/cffi PYTHON_ABIS: 2.7
-dev-python/chardet PYTHON_ABIS: 2.7
-dev-python/coverage PYTHON_ABIS: 2.7
-dev-python/cryptography PYTHON_ABIS: 2.7
-dev-python/docutils PYTHON_ABIS: 2.7
-dev-python/enum34 PYTHON_ABIS: 2.7
-dev-python/funcsigs PYTHON_ABIS: 2.7
-dev-python/hypothesis PYTHON_ABIS: 2.7
-dev-python/idna PYTHON_ABIS: 2.7
-dev-python/imagesize PYTHON_ABIS: 2.7
-dev-python/ipaddress PYTHON_ABIS: 2.7
-dev-python/more-itertools PYTHON_ABIS: 2.7
-dev-python/numpy PYTHON_ABIS: 2.7
-dev-python/packaging PYTHON_ABIS: 2.7
-dev-python/pathlib2 PYTHON_ABIS: 2.7
-dev-python/pluggy PYTHON_ABIS: 2.7
-dev-python/py PYTHON_ABIS: 2.7
-dev-python/pycparser PYTHON_ABIS: 2.7
-dev-python/pyopenssl PYTHON_ABIS: 2.7
-dev-python/pyparsing PYTHON_ABIS: 2.7
-dev-python/pytest PYTHON_ABIS: 2.7
-dev-python/pytest-runner PYTHON_ABIS: 2.7
-dev-python/pytz PYTHON_ABIS: 2.7
-dev-python/requests PYTHON_ABIS: 2.7
-dev-python/scandir PYTHON_ABIS: 2.7
-dev-python/setuptools PYTHON_ABIS: 2.7
-dev-python/setuptools_scm PYTHON_ABIS: 2.7
-dev-python/six PYTHON_ABIS: 2.7
-dev-python/snowballstemmer PYTHON_ABIS: 2.7
-dev-python/sphinxcontrib-websupport PYTHON_ABIS: 2.7
-dev-python/typing PYTHON_ABIS: 2.7
-dev-python/urllib3 PYTHON_ABIS: 2.7
-dev-python/zopeinterface PYTHON_ABIS: 2.7
+dev-libs/boost python
# The build fails without any apparant error otherwise
app-text/ghostscript build_options: jobs=1
diff --git a/ci/docker/exherbo/paludis-exherbo-clang/config/sets/paludis-deps.conf b/ci/docker/exherbo/paludis-exherbo-clang/config/sets/paludis-deps.conf
index c3868b000..8b6bef9ce 100644
--- a/ci/docker/exherbo/paludis-exherbo-clang/config/sets/paludis-deps.conf
+++ b/ci/docker/exherbo/paludis-exherbo-clang/config/sets/paludis-deps.conf
@@ -14,7 +14,6 @@
# Bindings
* dev-libs/boost
-* dev-lang/python:2.7
* dev-lang/ruby:2.5
# Search index
diff --git a/ci/docker/exherbo/paludis-exherbo-gcc/config/options/10_paludis.conf b/ci/docker/exherbo/paludis-exherbo-gcc/config/options/10_paludis.conf
index 52db62d07..45526de7d 100644
--- a/ci/docker/exherbo/paludis-exherbo-gcc/config/options/10_paludis.conf
+++ b/ci/docker/exherbo/paludis-exherbo-gcc/config/options/10_paludis.conf
@@ -2,52 +2,7 @@
dev-lang/python sqlite
-dev-libs/boost python PYTHON_ABIS: 2.7
-
-dev-python/Babel PYTHON_ABIS: 2.7
-dev-python/Cython PYTHON_ABIS: 2.7
-dev-python/Jinja2 PYTHON_ABIS: 2.7
-dev-python/MarkupSafe PYTHON_ABIS: 2.7
-dev-python/Pygments PYTHON_ABIS: 2.7
-dev-python/Sphinx PYTHON_ABIS: 2.7
-dev-python/alabaster PYTHON_ABIS: 2.7
-dev-python/asn1crypto PYTHON_ABIS: 2.7
-dev-python/atomicwrites PYTHON_ABIS: 2.7
-dev-python/attrs PYTHON_ABIS: 2.7
-dev-python/certifi PYTHON_ABIS: 2.7
-dev-python/cffi PYTHON_ABIS: 2.7
-dev-python/chardet PYTHON_ABIS: 2.7
-dev-python/coverage PYTHON_ABIS: 2.7
-dev-python/cryptography PYTHON_ABIS: 2.7
-dev-python/docutils PYTHON_ABIS: 2.7
-dev-python/enum34 PYTHON_ABIS: 2.7
-dev-python/funcsigs PYTHON_ABIS: 2.7
-dev-python/hypothesis PYTHON_ABIS: 2.7
-dev-python/idna PYTHON_ABIS: 2.7
-dev-python/imagesize PYTHON_ABIS: 2.7
-dev-python/ipaddress PYTHON_ABIS: 2.7
-dev-python/more-itertools PYTHON_ABIS: 2.7
-dev-python/numpy PYTHON_ABIS: 2.7
-dev-python/packaging PYTHON_ABIS: 2.7
-dev-python/pathlib2 PYTHON_ABIS: 2.7
-dev-python/pluggy PYTHON_ABIS: 2.7
-dev-python/py PYTHON_ABIS: 2.7
-dev-python/pycparser PYTHON_ABIS: 2.7
-dev-python/pyopenssl PYTHON_ABIS: 2.7
-dev-python/pyparsing PYTHON_ABIS: 2.7
-dev-python/pytest PYTHON_ABIS: 2.7
-dev-python/pytest-runner PYTHON_ABIS: 2.7
-dev-python/pytz PYTHON_ABIS: 2.7
-dev-python/requests PYTHON_ABIS: 2.7
-dev-python/scandir PYTHON_ABIS: 2.7
-dev-python/setuptools PYTHON_ABIS: 2.7
-dev-python/setuptools_scm PYTHON_ABIS: 2.7
-dev-python/six PYTHON_ABIS: 2.7
-dev-python/snowballstemmer PYTHON_ABIS: 2.7
-dev-python/sphinxcontrib-websupport PYTHON_ABIS: 2.7
-dev-python/typing PYTHON_ABIS: 2.7
-dev-python/urllib3 PYTHON_ABIS: 2.7
-dev-python/zopeinterface PYTHON_ABIS: 2.7
+dev-libs/boost python
# The build fails without any apparant error otherwise
app-text/ghostscript build_options: jobs=1
diff --git a/ci/docker/exherbo/paludis-exherbo-gcc/config/sets/paludis-deps.conf b/ci/docker/exherbo/paludis-exherbo-gcc/config/sets/paludis-deps.conf
index c3868b000..8b6bef9ce 100644
--- a/ci/docker/exherbo/paludis-exherbo-gcc/config/sets/paludis-deps.conf
+++ b/ci/docker/exherbo/paludis-exherbo-gcc/config/sets/paludis-deps.conf
@@ -14,7 +14,6 @@
# Bindings
* dev-libs/boost
-* dev-lang/python:2.7
* dev-lang/ruby:2.5
# Search index