diff --git a/.buildbot/appimage/Dockerfile b/.buildbot/appimage/Dockerfile index c4dde327..2674952c 100644 --- a/.buildbot/appimage/Dockerfile +++ b/.buildbot/appimage/Dockerfile @@ -7,7 +7,8 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \ build-essential libcap-dev libssl-dev \ python-all-dev python-setuptools wget \ git gtk-update-icon-cache \ - binutils-multiarch crossbuild-essential-armhf crossbuild-essential-arm64 + binutils-multiarch crossbuild-essential-armhf crossbuild-essential-arm64 \ + python-six RUN dpkg --add-architecture armhf RUN dpkg --add-architecture arm64 diff --git a/.buildbot/tox-bionic/Dockerfile b/.buildbot/tox-bionic/Dockerfile index 1acf58dc..af7c2002 100644 --- a/.buildbot/tox-bionic/Dockerfile +++ b/.buildbot/tox-bionic/Dockerfile @@ -8,7 +8,8 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \ software-properties-common build-essential libcap-dev libffi-dev \ libssl-dev python-all-dev python-setuptools \ python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \ - python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb + python-msgpack python-qt4 language-pack-en qt5dxcb-plugin tor xvfb \ + python3-six RUN apt-get install -yq sudo diff --git a/.buildbot/tox-focal/Dockerfile b/.buildbot/tox-focal/Dockerfile index fecc0819..a9a2af0d 100644 --- a/.buildbot/tox-focal/Dockerfile +++ b/.buildbot/tox-focal/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \ software-properties-common build-essential libcap-dev libffi-dev \ libssl-dev python-all-dev python-setuptools \ python3-dev python3-pip python3.9 python3.9-dev python3.9-venv \ - language-pack-en qt5dxcb-plugin tor xvfb + language-pack-en qt5dxcb-plugin tor xvfb python3-six RUN python3.9 -m pip install --upgrade pip tox virtualenv diff --git a/requirements.txt b/requirements.txt index c787d2dd..3eb8ba22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,4 @@ pycryptodome PyQt5;python_version>="3.7" and platform_machine=="x86_64" mock;python_version<="2.7" python_prctl;platform_system=="Linux" -six xvfbwrapper;platform_system=="Linux"