Skip to content

Commit

Permalink
Another attempt to fix travis
Browse files Browse the repository at this point in the history
  • Loading branch information
mkoistinen committed Oct 22, 2017
1 parent 047793a commit 4665fd6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
1 change: 1 addition & 0 deletions test_requirements/django-1.10.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-r base.txt

django>=1.10,<1.11
13 changes: 4 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ envlist =
passenv =
CI
HOME
; SAUCE_ACCESS_KEY
; SAUCE_USERNAME
; TRAVIS_BUILD_NUMBER
; TRAVIS_PULL_REQUEST
; TRAVIS_REPO_SLUG
; TRAVIS_JOB_NUMBER
TRAVIS_BUILD_NUMBER
TRAVIS_PULL_REQUEST
TRAVIS_REPO_SLUG
TRAVIS_JOB_NUMBER
deps =
dj18: -rtest_requirements/django-1.8.txt
dj19: -rtest_requirements/django-1.9.txt
Expand All @@ -27,9 +25,6 @@ deps =
cms34: django-cms>=3.4,<3.5
cms34: djangocms-text-ckeditor>=3.0,<3.1

cms35: https://github.com/divio/django-cms/archive/develop.zip
cms35: djangocms-text-ckeditor>=3.0

commands =
{envpython} --version
- coverage erase
Expand Down

0 comments on commit 4665fd6

Please sign in to comment.