fix six deps
This commit is contained in:
parent
f53d4aa7d0
commit
034e87f450
@ -7,7 +7,8 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
|||||||
build-essential libcap-dev libssl-dev \
|
build-essential libcap-dev libssl-dev \
|
||||||
python-all-dev python-setuptools wget \
|
python-all-dev python-setuptools wget \
|
||||||
git gtk-update-icon-cache \
|
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 armhf
|
||||||
RUN dpkg --add-architecture arm64
|
RUN dpkg --add-architecture arm64
|
||||||
|
@ -8,7 +8,8 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
|||||||
software-properties-common build-essential libcap-dev libffi-dev \
|
software-properties-common build-essential libcap-dev libffi-dev \
|
||||||
libssl-dev python-all-dev python-setuptools \
|
libssl-dev python-all-dev python-setuptools \
|
||||||
python3-dev python3-pip python3.8 python3.8-dev python3.8-venv \
|
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
|
RUN apt-get install -yq sudo
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
|||||||
software-properties-common build-essential libcap-dev libffi-dev \
|
software-properties-common build-essential libcap-dev libffi-dev \
|
||||||
libssl-dev python-all-dev python-setuptools \
|
libssl-dev python-all-dev python-setuptools \
|
||||||
python3-dev python3-pip python3.9 python3.9-dev python3.9-venv \
|
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
|
RUN python3.9 -m pip install --upgrade pip tox virtualenv
|
||||||
|
|
||||||
|
@ -4,5 +4,4 @@ pycryptodome
|
|||||||
PyQt5;python_version>="3.7" and platform_machine=="x86_64"
|
PyQt5;python_version>="3.7" and platform_machine=="x86_64"
|
||||||
mock;python_version<="2.7"
|
mock;python_version<="2.7"
|
||||||
python_prctl;platform_system=="Linux"
|
python_prctl;platform_system=="Linux"
|
||||||
six
|
|
||||||
xvfbwrapper;platform_system=="Linux"
|
xvfbwrapper;platform_system=="Linux"
|
||||||
|
Reference in New Issue
Block a user