From 456c4e5117b362e1a651f0c5b4321c64b3818169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Stucke?= Date: Thu, 18 Feb 2021 10:20:57 +0100 Subject: [PATCH] removed python2 installation --- src/helperFunctions/install.py | 8 -------- src/install/backend.py | 1 - src/install/common.py | 6 ------ 3 files changed, 15 deletions(-) diff --git a/src/helperFunctions/install.py b/src/helperFunctions/install.py index 5825ddc36..0d222c193 100644 --- a/src/helperFunctions/install.py +++ b/src/helperFunctions/install.py @@ -99,14 +99,6 @@ def pip3_remove_packages(*args): return _pip_remove_packages(3, args) -def pip2_install_packages(*args): - return _pip_install_packages(2, args) - - -def pip2_remove_packages(*args): - return _pip_remove_packages(2, args) - - def check_if_command_in_path(command): _, return_code = execute_shell_command_get_return_code('command -v {}'.format(command)) if return_code != 0: diff --git a/src/install/backend.py b/src/install/backend.py index 07fdeb2c6..4e6800e85 100644 --- a/src/install/backend.py +++ b/src/install/backend.py @@ -14,7 +14,6 @@ def main(): # dependencies - apt_install_packages('python-dev', 'python-setuptools') apt_install_packages('libjpeg-dev') apt_install_packages('libssl-dev', 'python3-tk') pip3_install_packages('pluginbase', 'Pillow', 'cryptography', 'pyopenssl', 'matplotlib', 'docker', 'networkx') diff --git a/src/install/common.py b/src/install/common.py index a77f048f7..4d5f67a2b 100644 --- a/src/install/common.py +++ b/src/install/common.py @@ -47,12 +47,6 @@ def main(distribution): # pylint: disable=too-many-statements apt_remove_packages('python3-pip', 'python3-setuptools', 'python3-wheel') install_pip('python3') - # install python2 - apt_install_packages('python', 'python-dev') - with suppress(InstallationError): - apt_remove_packages('python-pip') - install_pip('python2') - # install general python dependencies apt_install_packages('libmagic-dev') apt_install_packages('libfuzzy-dev')