Browse Source

install.sh: use python3 virtualenv

master
undeath 6 years ago
parent
commit
63c21a501e
No known key found for this signature in database
GPG Key ID: F0DF5443BD2F3520
  1. 2
      .travis.yml
  2. 2
      install.sh
  3. 2
      test/Dockerfiles/bionic-py3.Dockerfile
  4. 4
      test/Dockerfiles/centos7-py3.Dockerfile
  5. 4
      test/Dockerfiles/fedora27-py3.Dockerfile
  6. 2
      test/Dockerfiles/stretch-py3.Dockerfile
  7. 2
      test/Dockerfiles/xenial-py3.Dockerfile

2
.travis.yml

@ -17,7 +17,7 @@ matrix:
packages: packages:
- python3-dev - python3-dev
- python3-pip - python3-pip
- python-virtualenv - virtualenv
- libsodium18 - libsodium18
- os: linux - os: linux
services: docker services: docker

2
install.sh

@ -31,7 +31,6 @@ http_get ()
deps_install () deps_install ()
{ {
common_deps=( \ common_deps=( \
'python-virtualenv' \
'curl' \ 'curl' \
'build-essential' \ 'build-essential' \
'automake' \ 'automake' \
@ -39,6 +38,7 @@ deps_install ()
'libtool' \ 'libtool' \
'libgmp-dev' \ 'libgmp-dev' \
'python3-dev' \ 'python3-dev' \
'virtualenv' \
'python3-pip' ) 'python3-pip' )
if ! is_python3; then if ! is_python3; then

2
test/Dockerfiles/bionic-py3.Dockerfile

@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-c"]
# dependencies # dependencies
RUN apt-get update RUN apt-get update
RUN apt-get install -y \ RUN apt-get install -y \
python3-dev python3-pip python-virtualenv libsodium23 python3-dev python3-pip virtualenv libsodium23
# curl is a better tool # curl is a better tool
RUN apt-get install -y curl RUN apt-get install -y curl

4
test/Dockerfiles/centos7-py3.Dockerfile

@ -6,7 +6,7 @@ RUN yum -y groups install 'Development tools'
RUN yum -y install epel-release && \ RUN yum -y install epel-release && \
yum -y update yum -y update
RUN yum -y install \ 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 RUN useradd --home-dir /home/chaum --create-home --shell /bin/bash --skel /etc/skel/ chaum
ARG core_version ARG core_version
@ -29,5 +29,5 @@ RUN bitcoind --version | head -1
# install script # install script
WORKDIR ${repo_name} WORKDIR ${repo_name}
RUN virtualenv --python=python3 jmvenv RUN virtualenv-3 --python=python3 jmvenv
RUN source jmvenv/bin/activate && ./test/run_tests.sh RUN source jmvenv/bin/activate && ./test/run_tests.sh

4
test/Dockerfiles/fedora27-py3.Dockerfile

@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-c"]
# dependencies # dependencies
RUN dnf -y groups install 'Development tools' RUN dnf -y groups install 'Development tools'
RUN dnf -y install \ RUN dnf -y install \
python3-devel python3-pip python-virtualenv libsodium python3-devel python3-pip python3-virtualenv libsodium
# needed for build time # needed for build time
# https://stackoverflow.com/questions/34624428/g-error-usr-lib-rpm-redhat-redhat-hardened-cc1-no-such-file-or-directory # 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 # install script
WORKDIR ${repo_name} WORKDIR ${repo_name}
RUN virtualenv --python=python3 jmvenv RUN virtualenv-3 --python=python3 jmvenv
RUN source jmvenv/bin/activate && ./test/run_tests.sh RUN source jmvenv/bin/activate && ./test/run_tests.sh

2
test/Dockerfiles/stretch-py3.Dockerfile

@ -7,7 +7,7 @@ RUN apt-get install -y build-essential
RUN apt-get install -y \ RUN apt-get install -y \
automake pkg-config libtool libgmp-dev automake pkg-config libtool libgmp-dev
RUN apt-get install -y \ 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 # curl is a better tool
RUN apt-get install -y curl RUN apt-get install -y curl

2
test/Dockerfiles/xenial-py3.Dockerfile

@ -7,7 +7,7 @@ RUN apt-get install -y build-essential
RUN apt-get install -y \ RUN apt-get install -y \
automake pkg-config libtool libgmp-dev automake pkg-config libtool libgmp-dev
RUN apt-get install -y \ 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 # curl is a better tool
RUN apt-get install -y curl RUN apt-get install -y curl

Loading…
Cancel
Save