Skip to content

Commit

Permalink
Merge pull request #11 from merixstudio/remove-python27-mentions
Browse files Browse the repository at this point in the history
Removed Python2.7 mentions from docs, travis and tox  conf
  • Loading branch information
bbisk committed Nov 8, 2018
2 parents b79cfd4 + e0fa290 commit 3f4232e
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ sudo: false
matrix:
fast_finish: true
include:
- { python: "2.7", env: DJANGO=1.11 }

- { python: "3.4", env: DJANGO=1.11 }
- { python: "3.4", env: DJANGO=2.0 }

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Requirements

Supported versions
*******************
* Python 2.7, 3.4, 3.5, 3.6, 3.7
* Python 3.4, 3.5, 3.6, 3.7
* Django 1.11, 2.0, 2.1
* Django REST Framework 3.8

Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Requirements

Supported versions
*******************
* Python 2.7, 3.4, 3.5, 3.6, 3.7
* Python 3.4, 3.5, 3.6, 3.7
* Django 1.11, 2.0, 2.1
* Django REST Framework 3.8

Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
Expand Down
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ omit =
usedevelop = true
passenv = HOME CI TRAVIS TRAVIS_*
basepython =
py27: python2.7
py34: python3.4
py35: python3.5
py36: python3.6
Expand All @@ -39,7 +38,6 @@ deps =
django20: django>=2.0,<2.1
drf37: djangorestframework>=3.7,<3.8
drf38: djangorestframework>=3.8,<3.9
py27: mock
-r{toxinidir}/testproject/requirements/common.txt
setenv =
PYTHONPATH = {toxinidir}/testproject
Expand Down

0 comments on commit 3f4232e

Please sign in to comment.