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.

Sign up for GitHub

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

Switch to tox-travis #43

Merged
merged 6 commits into from
Dec 4, 2019
Merged

Switch to tox-travis #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c22293
Switch to tox-travis
Dec 3, 2019
79cfbd9
Playing around with travis config
Dec 3, 2019
8719a83
Drop before_install
Dec 3, 2019
38d2c49
PG 10
Dec 3, 2019
485a9ef
More
Dec 3, 2019
c7a8ec2
Fix Django 2.2 in tox
Dec 3, 2019
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
38 changes: 6 additions & 32 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,18 @@
language: python
python:
- "3.5"
- "3.6"
- "3.7"
cache: pip
dist: xenial
branches:
only:
- master
jobs:
include:
- env: TOXENV=flake8
python: 3.7
- env: TOXENV=black
python: 3.7
- env: TOXENV=py35-django111-{postgresql,sqlite}
python: 3.5
- env: TOXENV=py36-django111-{postgresql,sqlite}
python: 3.6
- env: TOXENV=py37-django111-{postgresql,sqlite}
python: 3.7
- env: TOXENV=py35-django20-{postgresql,sqlite}
python: 3.5
- env: TOXENV=py36-django20-{postgresql,sqlite}
python: 3.6
- env: TOXENV=py37-django20-{postgresql,sqlite}
python: 3.7
- env: TOXENV=py35-django21-{postgresql,sqlite}
python: 3.5
- env: TOXENV=py36-django21-{postgresql,sqlite}
python: 3.6
- env: TOXENV=py37-django21-{postgresql,sqlite}
python: 3.7
- env: TOXENV=py35-django22-{postgresql,sqlite}
python: 3.5
- env: TOXENV=py36-django22-{postgresql,sqlite}
python: 3.6
- env: TOXENV=py37-django22-{postgresql,sqlite}
python: 3.7
before_install:
- sudo apt-get update && sudo apt-get build-dep python-imaging
- sudo service postgresql restart
install:
- pip install tox
- pip install tox-travis
addons:
postgresql: "9.6"
apt:
Expand All @@ -51,4 +25,4 @@ before_script:
- psql template1 -c "create extension postgis;"
- psql template1 -c "create extension citext;"
script:
- tox
- tox -v
16 changes: 8 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[tox]
envlist =
py35-django{111,20,21,22}-{postgresql,sqlite}
py36-django{111,20,21,22}-{postgresql,sqlite}
py37-django{111,20,21,22}-{postgresql,sqlite}
py{35,36,37}-django{111,20,21,22}-{postgresql,sqlite}
flake8
black

[travis]
python =
3.5: py35
3.6: py36,flake8,black
3.7: py37

[testenv]
setenv =
PYTHONPATH={toxinidir}
postgresql: TEST_DB=postgis
sqlite: TEST_DB=sqlite
sqlite: USE_TZ=True
basepython =
py35: python3.5
py36: python3.6
py37: python3.7
deps =
pillow
pytest
pytest-django
django111: Django>=1.11,<1.12
django20: Django==2.0
django21: Django==2.1
django22: Django>=2.2
django22: Django==2.2
postgresql: psycopg2-binary
commands =
pytest
Expand Down