Skip to content

Commit

Permalink
ci fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sfermigier committed May 14, 2020
1 parent b36ea30 commit a5ccc3d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ services:
- mysql
- postgresql

before_install:
- psql -c 'create database olapy_test;' -U postgres
- mysql -e 'create database olapy_test;'

install:
- pip install -U pip setuptools tox tox-travis wheel poetry
- poetry --version

python:
- '2.7'
- '3.6'
Expand All @@ -27,13 +19,20 @@ python:
env:
- SQLALCHEMY_DATABASE_URI=
- SQLALCHEMY_DATABASE_URI=postgresql://postgres@localhost/olapy_test
- SQLALCHEMY_DATABASE_URI=mysql+pymysql://travis@localhost/olapy_test
- SQLALCHEMY_DATABASE_URI=mysql://travis@localhost/olapy_test

matrix:
include:
- python: 3.6
env: TOXENV=lint

install:
- pip install -U pip setuptools tox tox-travis wheel poetry

before_script:
- psql -c 'create database olapy_test;' -U postgres
- mysql -e 'create database olapy_test;'

script:
- tox

Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = {py27,py36,py37,py38}, lint
envlist = py27, py36, py37, py38, lint
skip_missing_interpreters = True


Expand All @@ -15,14 +15,13 @@ passenv =
commands=
poetry install
pip install mysqlclient psycopg2-binary
# pip install psycopg2-binary

pytest

# Not used under travis. Use 'tox -e py27-postgres' manually, for instance
setenv =
postgres: SQLALCHEMY_DATABASE_URI=postgres://localhost/olapy_test
mysql: SQLALCHEMY_DATABASE_URI=mysql+pymysql://localhost/olapy_test
mysql: SQLALCHEMY_DATABASE_URI=mysql://localhost/olapy_test


[testenv:lint]
Expand Down

0 comments on commit a5ccc3d

Please sign in to comment.