Skip to content

Commit

Permalink
Merge branch 'python2-fixes'
Browse files Browse the repository at this point in the history
* python2-fixes:
  Remove tests and claims about compatibility with 2.6
  Use only Python 2.7 for CI test runs
  Attempted fix for Travis CI builds for Python 2.6 & 2.7
  • Loading branch information
jmurty committed Dec 30, 2019
2 parents adbb45e + ec88fe7 commit b4288c7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
sudo: false
# Default python version is no longer 2 but 3.6 or later
language: python
# Be specific about which Python version to use for test runs
python:
- "2.7"
cache:
directories:
- $HOME/.pip-cache/
env:
- TOX_ENV=py26
- TOX_ENV=py26-withlxml
- TOX_ENV=py27
- TOX_ENV=py27-withlxml
- TOX_ENV=docs
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
'Natural Language :: English',
'License :: OSI Approved :: MIT License',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
# 'Programming Language :: Python :: 3.0',
# 'Programming Language :: Python :: 3.1',
Expand Down
10 changes: 1 addition & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
[tox]
envlist=py26,py27,py26-withlxml,py27-withlxml,docs
envlist=py27,py27-withlxml,docs

[testenv]
commands=python setup.py test

[testenv:py26]
deps=unittest2

[testenv:py26-withlxml]
deps=
unittest2
lxml

[testenv:py27-withlxml]
deps=lxml

Expand Down

0 comments on commit b4288c7

Please sign in to comment.