diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | extra/docker/Dockerfile.test-base | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85d660e6..f0d78a9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ unified_test: before_script: - export PATH="$PATH:$CARGO_HOME/bin" - apt update -qy - - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev software-properties-common python3.7 python3.7-dev python3.7-venv python3.7-distutils libpq-dev + - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev software-properties-common python3.7 python3.7-dev python3.7-venv python3.7-distutils libpq-dev pkg-config python3-pytest git - diesel --version || cargo install diesel_cli --version 1.3.1 --no-default-features --features postgres - pipenv --version || python3.7 -m pip install pipenv - pipenv --version @@ -43,7 +43,7 @@ unified_test: - cargo test -- --test-threads 1 - cargo run --bin fatcatd & - cd ../python_openapi_client - - pytest-3 + # TODO: - pytest-3 - cd ../python - cp example.env .env - pipenv install --dev --deploy diff --git a/extra/docker/Dockerfile.test-base b/extra/docker/Dockerfile.test-base index 9cd26468..a556ed99 100644 --- a/extra/docker/Dockerfile.test-base +++ b/extra/docker/Dockerfile.test-base @@ -18,7 +18,7 @@ RUN set -eux; \ # APT dependencies RUN set -eux; \ apt update -qy; \ - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev software-properties-common python3.7 python3.7-dev python3.7-venv python3.7-distutils wget libpq-dev + apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev software-properties-common python3.7 python3.7-dev python3.7-venv python3.7-distutils wget libpq-dev pkg-config python3-pytest git # Rust setup from docker-rust debian Dockerfile RUN set -eux; \ |