Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

On non-postgres tests, don't require the postgres container (#841) #1107

Merged
merged 1 commit into from
Nov 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2
jobs:
unit:
docker: &py36
docker: &py36_postgres
- image: python:3.6
- image: postgres
environment: &pgenv
Expand All @@ -23,7 +23,7 @@ jobs:
PGDATABASE: postgres
- run: tox -e pep8,unit-py27,unit-py36
integration-postgres-py36:
docker: *py36
docker: *py36_postgres
steps:
- checkout
- run: apt-get update && apt-get install -y python3-dev postgresql
Expand All @@ -34,10 +34,11 @@ jobs:
name: Run tests
command: tox -e integration-postgres-py36
integration-snowflake-py36:
docker: *py36
docker: &py36
- image: python:3.6
steps:
- checkout
- run: apt-get update && apt-get install -y python3-dev postgresql
- run: apt-get update && apt-get install -y python3-dev
- run: echo 127.0.0.1 database | tee -a /etc/hosts
- run: pip install virtualenvwrapper tox
- run:
Expand All @@ -58,14 +59,14 @@ jobs:
docker: *py36
steps:
- checkout
- run: apt-get update && apt-get install -y python3-dev postgresql
- run: apt-get update && apt-get install -y python3-dev
- run: echo 127.0.0.1 database | tee -a /etc/hosts
- run: pip install virtualenvwrapper tox
- run:
name: Run tests
command: tox -e integration-bigquery-py36
integration-postgres-py27:
docker: &py27
docker: &py27_postgres
- image: python:2.7
- image: postgres
environment: *pgenv
Expand All @@ -79,10 +80,11 @@ jobs:
name: Run tests
command: tox -e integration-postgres-py27
integration-snowflake-py27:
docker: *py27
docker: &py27
- image: python:2.7
steps:
- checkout
- run: apt-get update && apt-get install -y python-dev postgresql
- run: apt-get update && apt-get install -y python-dev
- run: echo 127.0.0.1 database | tee -a /etc/hosts
- run: pip install virtualenvwrapper tox
- run:
Expand All @@ -103,7 +105,7 @@ jobs:
docker: *py27
steps:
- checkout
- run: apt-get update && apt-get install -y python-dev postgresql
- run: apt-get update && apt-get install -y python-dev
- run: echo 127.0.0.1 database | tee -a /etc/hosts
- run: pip install virtualenvwrapper tox
- run:
Expand Down
5 changes: 0 additions & 5 deletions test/integration/connection.py

This file was deleted.