Skip to content
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
25 changes: 20 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,39 @@
language: python
dist: xenial
sudo: true
services:
- postgresql
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "3.7"
env:
- DJANGO='django>=1.11,<2'
- DJANGO='django>=2,<2.1'
- DJANGO='django~=2.1.0'
- DJANGO='--pre django'
matrix:
exclude:
- python: "2.7"
env: DJANGO='django>=2,<2.1'
- python: "3.4"
env: DJANGO='--pre django'
- python: "2.7"
env: DJANGO='--pre django'
- python: "2.7"
env: DJANGO='django~=2.1.0'
- python: "2.7"
env: DJANGO='django>=2,<2.1'
- python: "3.4"
env: DJANGO='django~=2.1.0'
- python: "3.4"
env: DJANGO='--pre django'
- python: "3.7"
env: DJANGO='django>=1.11,<2'
allow_failures:
- env: DJANGO='--pre django'
fast_finish: true
install:
before_script:
- psql -c 'CREATE DATABASE orderable' -U postgres;
install:
- pip install $DJANGO
- pip install -r requirements.txt
- pip install -e .
Expand Down
2 changes: 1 addition & 1 deletion orderable/tests/run.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sys
from argparse import ArgumentParser
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not enamoured with this change, TBH, but it's fairly inconsequential.

I'll get this going now, and replace flake8-import-order with isort at another point.

import sys

import django
from django.conf import settings
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage==3.7.1
flake8==2.2.5
flake8-import-order==0.5.3
flake8==3.6.0
flake8-import-order==0.18
hypothesis==2.0.0
psycopg2==2.7.4