Skip to content

Commit

Permalink
Drop Python 2.6 support
Browse files Browse the repository at this point in the history
Proximate cause: mock 1.1.0 dropped it
(testing-cabal/mock@8a2e870)
  • Loading branch information
mgedmin committed Jul 13, 2015
1 parent 7181b4c commit 93fc3c9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
language: python
sudo: false
python:
- 2.6
- 2.7
- 3.3
- 3.4
install:
- if [ $TRAVIS_PYTHON_VERSION = 2.6 ]; then pip install 'ReportLab<3.0'; fi
- travis_retry pip install coverage coveralls -e .
script:
- coverage run --source=mgp2pdf.py tests.py
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Changelog
0.10.1 (unreleased)
~~~~~~~~~~~~~~~~~~~

- Drop Python 2.6 support.


0.10 (2015-01-06)
~~~~~~~~~~~~~~~~~
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
'Environment :: Console',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
Expand Down
7 changes: 1 addition & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py26,py27,py33,py34
py27,py33,py34

[testenv]
passenv =
Expand All @@ -10,11 +10,6 @@ deps =
commands =
python tests.py

[testenv:py26]
deps =
ReportLab < 3.0
{[testenv]deps}

[testenv:coverage]
basepython = python3.4
deps =
Expand Down

0 comments on commit 93fc3c9

Please sign in to comment.