diff --git a/.travis.yml b/.travis.yml index ee871e6..dd6db65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: packages: - python3-dev - python3-pip - - python-virtualenv + - virtualenv - libsodium18 - os: linux services: docker diff --git a/install.sh b/install.sh index 9c21114..beda7af 100755 --- a/install.sh +++ b/install.sh @@ -31,7 +31,6 @@ http_get () deps_install () { common_deps=( \ - 'python-virtualenv' \ 'curl' \ 'build-essential' \ 'automake' \ @@ -39,6 +38,7 @@ deps_install () 'libtool' \ 'libgmp-dev' \ 'python3-dev' \ + 'virtualenv' \ 'python3-pip' ) if ! is_python3; then diff --git a/test/Dockerfiles/bionic-py3.Dockerfile b/test/Dockerfiles/bionic-py3.Dockerfile index 6d70bc3..749c0c0 100755 --- a/test/Dockerfiles/bionic-py3.Dockerfile +++ b/test/Dockerfiles/bionic-py3.Dockerfile @@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-c"] # dependencies RUN apt-get update RUN apt-get install -y \ - python3-dev python3-pip python-virtualenv libsodium23 + python3-dev python3-pip virtualenv libsodium23 # curl is a better tool RUN apt-get install -y curl diff --git a/test/Dockerfiles/centos7-py3.Dockerfile b/test/Dockerfiles/centos7-py3.Dockerfile index 94b5776..a9168f9 100755 --- a/test/Dockerfiles/centos7-py3.Dockerfile +++ b/test/Dockerfiles/centos7-py3.Dockerfile @@ -6,7 +6,7 @@ RUN yum -y groups install 'Development tools' RUN yum -y install epel-release && \ yum -y update RUN yum -y install \ - python3-devel python3-pip python-virtualenv libsodium + python3-devel python3-pip python3-virtualenv libsodium RUN useradd --home-dir /home/chaum --create-home --shell /bin/bash --skel /etc/skel/ chaum ARG core_version @@ -29,5 +29,5 @@ RUN bitcoind --version | head -1 # install script WORKDIR ${repo_name} -RUN virtualenv --python=python3 jmvenv +RUN virtualenv-3 --python=python3 jmvenv RUN source jmvenv/bin/activate && ./test/run_tests.sh diff --git a/test/Dockerfiles/fedora27-py3.Dockerfile b/test/Dockerfiles/fedora27-py3.Dockerfile index 167e2a3..c8ca944 100755 --- a/test/Dockerfiles/fedora27-py3.Dockerfile +++ b/test/Dockerfiles/fedora27-py3.Dockerfile @@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-c"] # dependencies RUN dnf -y groups install 'Development tools' RUN dnf -y install \ - python3-devel python3-pip python-virtualenv libsodium + python3-devel python3-pip python3-virtualenv libsodium # needed for build time # https://stackoverflow.com/questions/34624428/g-error-usr-lib-rpm-redhat-redhat-hardened-cc1-no-such-file-or-directory @@ -31,5 +31,5 @@ RUN bitcoind --version | head -1 # install script WORKDIR ${repo_name} -RUN virtualenv --python=python3 jmvenv +RUN virtualenv-3 --python=python3 jmvenv RUN source jmvenv/bin/activate && ./test/run_tests.sh diff --git a/test/Dockerfiles/stretch-py3.Dockerfile b/test/Dockerfiles/stretch-py3.Dockerfile index 9b7b3b8..8b644cf 100755 --- a/test/Dockerfiles/stretch-py3.Dockerfile +++ b/test/Dockerfiles/stretch-py3.Dockerfile @@ -7,7 +7,7 @@ RUN apt-get install -y build-essential RUN apt-get install -y \ automake pkg-config libtool libgmp-dev RUN apt-get install -y \ - python3-dev python3-pip python-virtualenv python3-pyqt4 python3-sip + python3-dev python3-pip virtualenv python3-pyqt4 python3-sip # curl is a better tool RUN apt-get install -y curl diff --git a/test/Dockerfiles/xenial-py3.Dockerfile b/test/Dockerfiles/xenial-py3.Dockerfile index 226505d..0d56874 100755 --- a/test/Dockerfiles/xenial-py3.Dockerfile +++ b/test/Dockerfiles/xenial-py3.Dockerfile @@ -7,7 +7,7 @@ RUN apt-get install -y build-essential RUN apt-get install -y \ automake pkg-config libtool libgmp-dev RUN apt-get install -y \ - python3-dev python3-pip python-virtualenv python3-pyqt4 python3-sip + python3-dev python3-pip virtualenv python3-pyqt4 python3-sip # curl is a better tool RUN apt-get install -y curl