Skip to content

Commit

Permalink
cut support for django 1.10 and below jazzband#82
Browse files Browse the repository at this point in the history
  • Loading branch information
tony committed Dec 7, 2017
1 parent 31a77db commit 86cf942
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 40 deletions.
25 changes: 1 addition & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,15 @@ python:
- 3.6
- 3.5
- 3.4
- 3.3
- 2.7
env:
matrix:
- TOXENV='pep8'
- TOXENV='isort'
- DJANGO='django111'
- DJANGO='django110'
- DJANGO='django19'
- DJANGO='django18'
install:
- pip install -U tox>=1.8 codecov
- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PYVER=py36; fi
Expand All @@ -31,16 +26,6 @@ matrix:
env: TOXENV='pep8'
- python: 2.7
env: TOXENV='isort'
- python: 3.3
env: DJANGO='django19'
- python: 3.3
env: DJANGO='django110'
- python: 3.3
env: DJANGO='django111'
- python: 3.3
env: TOXENV='pep8'
- python: 3.3
env: TOXENV='isort'
- python: 3.4
env: TOXENV='pep8'
- python: 3.4
Expand All @@ -49,14 +34,6 @@ matrix:
env: TOXENV='pep8'
- python: 3.5
env: TOXENV='isort'
- python: 3.5
env: DJANGO='django16'
- python: 3.5
env: DJANGO='django17'
- python: 3.6
env: DJANGO='django16'
- python: 3.6
env: DJANGO='django17'
deploy:
provider: pypi
user: jazzband
Expand All @@ -66,4 +43,4 @@ deploy:
on:
tags: true
repo: jazzband/django-robots
condition: "$TOXENV = py27-django19"
condition: "$TOXENV = py27-django111"
9 changes: 3 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,18 @@ for instructions on how to use this application, and on
what it provides, see the file "overview.txt" in the "docs/"
directory or on ReadTheDocs: https://django-robots.readthedocs.io/


Supported Django versions
-------------------------

* Django 1.8
* Django 1.9
* Django 1.10
* Django 1.11

Older Django versions, 1.6 to 1.10, use ``django-robots==3.0``.

Supported Python version
------------------------

* Python 2.7
* Python 3.3, 3.4, 3.5, 3.6

* Python 3.4, 3.5, 3.6

.. _install section: https://django-robots.readthedocs.io/en/latest/#installation
.. _robots exclusion protocol: http://en.wikipedia.org/wiki/Robots_exclusion_standard
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,10 @@ def find_version(*file_paths):
'Topic :: Software Development',
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
]
)
7 changes: 1 addition & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
[tox]
envlist = pep8,isort,py{36,35,34,27}-django{111,110,19},py{36,35,34,33,27}-django{18}
envlist = pep8,isort,py{36,35,34,27}-django{111}

[testenv]
commands = {env:COMMAND:python} runtests.py
deps =
-r{toxinidir}/requirements-test.txt
django16: Django>=1.6,<1.7
django17: Django>=1.7,<1.8
django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10
django110: Django>=1.10,<1.11
django111: Django>=1.11,<2.0
coverage

Expand Down

0 comments on commit 86cf942

Please sign in to comment.