Skip to content

Commit

Permalink
Add Django 1.8 support back
Browse files Browse the repository at this point in the history
Mark Django 1.8 as supported in setup.py and add test matrix for testing
Shuup with Django 1.8 and 1.9 by Tox and Travis.
  • Loading branch information
suutari-ai authored and tulimaki committed Dec 6, 2016
1 parent 4e3b458 commit 4f0729e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
14 changes: 10 additions & 4 deletions .travis.yml
Expand Up @@ -12,11 +12,17 @@ env:
matrix:
include:
- python: 2.7
env: TOX_ENV=py27-nomigrations
env: TOX_ENV=py27-django18-nomigrations
- python: 3.4
env: TOX_ENV=py34-nomigrations
env: TOX_ENV=py34-django18-nomigrations
- python: 3.5
env: TOX_ENV=py35-nomigrations
env: TOX_ENV=py35-django18-nomigrations
- python: 2.7
env: TOX_ENV=py27-django19-nomigrations
- python: 3.4
env: TOX_ENV=py34-django19-nomigrations
- python: 3.5
env: TOX_ENV=py35-django19-nomigrations
- python: 3.5
env: TOX_ENV=py35-nomigrations-nocoverage-browser
install:
Expand All @@ -33,7 +39,7 @@ before_install:
- "selenium-standalone start &"
script:
- tox -e $TOX_ENV
after_success: test $TOX_ENV = py35-nomigrations && coveralls
after_success: test $TOX_ENV = py35-django19-nomigrations && coveralls
notifications:
slack:
secure: mkYYYt9ZQc6vR1aJltnEF1DzZ5xsNmllNcdK8fCwjeK5ZOnB1atujZ08tYxx/t57gaxhMWyJHvKdD0gvyQS6R/pAO2epXY9NqOhPVDEhqtXBpd7wUcEMTQqjSy68FSTjO94O8suC18xB55Cq+KSxm8jJt6zSFsjoffhz+4QIA67rkiNPLmAw2AHYymvVaidWMDe5UUGD7qONmdFI5wx4wOE9veboWDQ49oygiq+c4NFC/d4C108jT7l9ZTko/JF7Bim3VQI0LprGuIH2tZ6TI/3LWEhQX6XXuGr6eXuTF3nQp470yRXRs50Gh+CSY++ZUgFdRfOlg0edHt9m2Lk8j2jfeLgXYWYy1QSCnJDPRzzVIkEP4xaZCcIK7pcckV0Ytn7BP3Y09MDzSvt3+0Cm7ou16shiyy5NqW5DonarN21Mlz9/auZPawsXJqYZVDIZQiM7GLJnpg9wBfgKlPxUZKwi5ttsvrS7iPNK1sSLmICFqukrQlMQnpY5h45uGXsqL7fI7z30Ftld6qIGGVFdFjh3K+4dVXV5XKHnynaR518JvugxLwrNcIWwpyB2I3Ak7AsMzd3IWnY4yrB6pSbVdG0W3zZYXR6GUsYmxICKv5pUVnRKtp2tgOKA3EwgnVjSkJahGPp5bc3xJN8mNOaR33f3kieM5jJcNteEWueX+eA=
2 changes: 1 addition & 1 deletion setup.cfg
Expand Up @@ -6,7 +6,7 @@ exclude = .tox,migrations,doc/*,shuup_tests/*,venv*,local_settings*
max-line-length = 120
max-complexity = 10

[pytest]
[tool:pytest]
DJANGO_SETTINGS_MODULE=shuup_workbench.settings
django_find_project = false
norecursedirs = bower_components node_modules .git venv
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -77,7 +77,7 @@

REQUIRES = [
'Babel>=2.2,<3',
'Django>=1.9.0,<1.10',
'Django>=1.8,<1.10',
'django-bootstrap3>=6.1,<7',
'django-countries>=3.3,<4',
'django-enumfields>=0.7.2,<0.8',
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Expand Up @@ -6,7 +6,7 @@ envlist =
isort
license_headers
sanity
{py27,py34,py35}-nomigrations
{py27,py34,py35}-{django18,django19}-nomigrations
py35-nomigrations-nocoverage-browser
py35

Expand All @@ -17,6 +17,9 @@ deps =
pip>=6.0
# Setuptools 8 or newer is needod for "~=" version specifiers
setuptools>=8.0
# Django
django18: django>=1.8,<1.9
django19: django>=1.9,<1.10
# Do not remove the following BEGIN/END comments. setup.py uses them
# BEGIN testing deps
beautifulsoup4==4.4.0
Expand Down

0 comments on commit 4f0729e

Please sign in to comment.