From c05855c0fd27e184094c278924b88f8ccd26d4ac Mon Sep 17 00:00:00 2001 From: Magdalena Rother Date: Tue, 4 Oct 2016 09:12:59 +0200 Subject: [PATCH 1/6] Remove hipchat notification --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49ec121..3d1ed12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,12 +22,3 @@ after_success: - pip install "coveralls==1.0" coverage - coverage report - coveralls - -notifications: - hipchat: - on_success: always - rooms: - secure: cKx7sJTc0kqriAcy86XO5/XNVeT/fW6xt9sjkMQaEbJ9FYp0Q0Lm3dteXCXMW+DvwKvD4ppu2hwAIEkxM+QOa5zxaa02m16EyigencuyLt9kWn7Q0i/wC2nQbmH7Ie81l6UAua+TaLt5WCDWxKOBhsik15EzQeWI7xXGGXHPGMA= - template: - - "%{repository_name} build %{build_number} (%{branch}) %{message}. (%{duration})" - format: html From 14f9c833cbebb557e9d9f42f44f44b467ab086f7 Mon Sep 17 00:00:00 2001 From: Magdalena Rother Date: Tue, 4 Oct 2016 09:14:35 +0200 Subject: [PATCH 2/6] Remove pypy --- .travis.yml | 1 - tox.ini | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d1ed12..89d7151 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ python: - '2.7' - '3.4' - '3.5' - - pypy env: - DJANGO_VERSION=1.9.x diff --git a/tox.ini b/tox.ini index 0bdd714..23b0e35 100644 --- a/tox.ini +++ b/tox.ini @@ -42,16 +42,6 @@ basepython = python3.5 deps = {[testenv]deps_django19} -[testenv:pypy-1.8.x] -basepython = pypy -deps = - {[testenv]deps_django18} - -[testenv:pypy-1.9.x] -basepython = pypy -deps = - {[testenv]deps_django19} - [docs] commands = pip install -e {toxinidir} From b939a1cf09a3aebc003525cfae33fde400f814b0 Mon Sep 17 00:00:00 2001 From: Magdalena Rother Date: Tue, 4 Oct 2016 09:16:06 +0200 Subject: [PATCH 3/6] Update tox commands --- tox.ini | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 23b0e35..496c0a7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,12 @@ [testenv] skipsdist = True +usedevelop = True commands = - pip install -e {toxinidir} - pip install -e {toxinidir}[tests] - py.test -vs --junitxml=junit-{envname}.xml --cache-clear --cov {toxinidir}/barbeque --cov-config {toxinidir}/.coveragerc --cov-report xml + pip install wheel + pip wheel -w {homedir}/.wheelhouse/ {toxinidir} -f {homedir}/.wheelhouse/ + pip install --use-wheel --no-index -f {homedir}/.wheelhouse/ -e {toxinidir} + pip install --use-wheel -f {homedir}/.wheelhouse/ -e {toxinidir}[tests] + py.test -vs --junitxml=junit-{envname}.xml --cache-clear --cov {toxinidir}/barbeque --cov-report xml deps_django18 = https://github.com/django/django/archive/stable/1.8.x.tar.gz#egg=django From 14456c89ec0f6d85d219b9e5ec5c4e522eec23d1 Mon Sep 17 00:00:00 2001 From: Magdalena Rother Date: Tue, 4 Oct 2016 09:16:38 +0200 Subject: [PATCH 4/6] Update requirements --- .travis.yml | 2 +- setup.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89d7151..5414f60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ script: - tox -e "$TRAVIS_PYTHON_VERSION-$DJANGO_VERSION" after_success: - - pip install "coveralls==1.0" coverage + - pip install "coveralls" coverage - coverage report - coveralls diff --git a/setup.py b/setup.py index b56a1e8..b6799ad 100644 --- a/setup.py +++ b/setup.py @@ -26,15 +26,17 @@ 'pytest-cov==2.1.0', 'pytest-pep8==1.0.6', 'pytest-flakes==1.0.1', - 'pytest-django==2.8.0', + 'pytest-django==2.9.1', 'factory-boy==2.5.2', - 'Pillow==2.9.0', + 'Pillow==3.4.0', 'django-anylink==0.3.0', 'django-treebeard>=4.0', 'django-cms==3.2.5', 'django-polymorphic==0.8.1', 'django-compressor==1.6', 'django-filer==1.1.1', + 'tox', + 'tox-pyenv', ] From cb59a158cdcef642be328d4a44d9294e9b2d3fad Mon Sep 17 00:00:00 2001 From: Magdalena Rother Date: Tue, 4 Oct 2016 09:51:00 +0200 Subject: [PATCH 5/6] Update requirements --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b6799ad..43c3cdc 100644 --- a/setup.py +++ b/setup.py @@ -35,8 +35,8 @@ 'django-polymorphic==0.8.1', 'django-compressor==1.6', 'django-filer==1.1.1', - 'tox', - 'tox-pyenv', + 'tox==2.3.1', + 'tox-pyenv==1.0.3', ] From 2818c88c0be611c6fa73d328c23c0305df730b3c Mon Sep 17 00:00:00 2001 From: Magdalena Rother Date: Tue, 4 Oct 2016 11:14:20 +0200 Subject: [PATCH 6/6] Update requirements --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 43c3cdc..89d92aa 100644 --- a/setup.py +++ b/setup.py @@ -22,11 +22,11 @@ 'mock==1.3.0', 'openpyxl==2.2.6', 'psutil==3.2.1', - 'pytest==2.8.0', + 'pytest==3.0.3', 'pytest-cov==2.1.0', 'pytest-pep8==1.0.6', 'pytest-flakes==1.0.1', - 'pytest-django==2.9.1', + 'pytest-django==3.0.0', 'factory-boy==2.5.2', 'Pillow==3.4.0', 'django-anylink==0.3.0',