From 4665fd6b8b589e5a97d9d2849b7d813e8ec56c1a Mon Sep 17 00:00:00 2001 From: Martin Koistinen Date: Sun, 22 Oct 2017 17:44:32 -0400 Subject: [PATCH] Another attempt to fix travis --- test_requirements/django-1.10.txt | 1 + tox.ini | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test_requirements/django-1.10.txt b/test_requirements/django-1.10.txt index e9f540f..26d822e 100644 --- a/test_requirements/django-1.10.txt +++ b/test_requirements/django-1.10.txt @@ -1,2 +1,3 @@ -r base.txt + django>=1.10,<1.11 diff --git a/tox.ini b/tox.ini index 324a8b3..b0c7714 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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