From b7febc8df5db6ad7b272e6089705ae3e11c9a16a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 7 Oct 2019 14:39:47 -0400 Subject: [PATCH] Switch CI Python to 3 Signed-off-by: Roberto Rosario --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8afd5b5492..0bfe14d43a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -153,8 +153,8 @@ job_push_python: - locale-gen en_US.UTF-8 - update-locale LANG=en_US.UTF-8 - export LC_ALL=en_US.UTF-8 - - apt-get install -qq curl exiftool gcc ghostscript gnupg1 graphviz libfuse2 libjpeg-dev libmagic1 libpng-dev libtiff-dev poppler-utils libreoffice poppler-utils python-dev python-pip tesseract-ocr tesseract-ocr-deu - - pip install -r requirements.txt -r requirements/testing-base.txt + - apt-get install -qq curl exiftool gcc ghostscript gnupg1 graphviz libfuse2 libjpeg-dev libmagic1 libpng-dev libtiff-dev poppler-utils libreoffice poppler-utils python3-dev python-dev python-pip tesseract-ocr tesseract-ocr-deu + - pip3 install -r requirements.txt -r requirements/testing-base.txt only: - releases/all - releases/docker @@ -172,9 +172,9 @@ test-mysql: - mysql:8.0.3 script: - apt-get install -qq libmysqlclient-dev mysql-client - - pip install mysqlclient + - pip3 install mysqlclient - mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD" -e "set global character_set_server=utf8mb4;" - - python manage.py test --mayan-apps --settings=mayan.settings.testing.gitlab-ci.db_mysql --nomigrations + - python3 manage.py test --mayan-apps --settings=mayan.settings.testing.gitlab-ci.db_mysql --nomigrations tags: - mysql @@ -187,15 +187,15 @@ test-postgres: - postgres script: - apt-get install -qq libpq-dev - - pip install psycopg2 - - python manage.py test --mayan-apps --settings=mayan.settings.testing.gitlab-ci.db_postgres --nomigrations + - pip3 install psycopg2 + - python3 manage.py test --mayan-apps --settings=mayan.settings.testing.gitlab-ci.db_postgres --nomigrations tags: - postgres test-sqlite: <<: *test_base script: - - python manage.py test --mayan-apps --settings=mayan.settings.testing.gitlab-ci --nomigrations + - python3 manage.py test --mayan-apps --settings=mayan.settings.testing.gitlab-ci --nomigrations deploy_demo: environment: