Skip to content

Commit 70d7571

Browse files
author
David Stephens
committed
BLD: Move python 2.6 & 3.3 to allowed failures
BLD: Add pandas 0.18.0/Python 3.5
1 parent 6c9ceae commit 70d7571

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ sudo: false
33
language: python
44

55
env:
6-
- PYTHON=2.6 PANDAS=0.13.1
76
- PYTHON=2.7 PANDAS=0.15.1
8-
- PYTHON=3.3 PANDAS=0.14.1
97
- PYTHON=3.4 PANDAS=0.16.2
108
- PYTHON=3.4 PANDAS=0.17.1
119
- PYTHON=3.5 PANDAS=0.17.1
10+
- PYTHON=3.5 PANDAS=0.18.0rc1
1211
- PYTHON=2.7 PANDAS=0.12.0
1312
- PYTHON=2.7 PANDAS=0.11.0
1413
- PYTHON=2.7 PANDAS=0.10.1
1514

1615
matrix:
1716
allow_failures:
17+
- env: PYTHON=2.6 PANDAS=0.13.1
1818
- env: PYTHON=2.7 PANDAS=0.12.0
1919
- env: PYTHON=2.7 PANDAS=0.11.0
2020
- env: PYTHON=2.7 PANDAS=0.10.1
21+
- env: PYTHON=3.3 PANDAS=0.14.1
2122

2223
install:
2324
- pip install -qq flake8
@@ -41,7 +42,7 @@ install:
4142
- conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage setuptools html5lib lxml
4243
- source activate test-environment
4344
- pip install beautifulsoup4
44-
- if [[ "$PYTHON" == "2.6" ]]; then
45+
- if [[ "$PYTHON" == "2.6" ]]; then
4546
pip install simplejson;
4647
fi
4748
- pip install coveralls --quiet

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,10 @@ def readme():
4545
'Programming Language :: Cython',
4646
'Programming Language :: Python',
4747
'Programming Language :: Python :: 2',
48-
'Programming Language :: Python :: 2.6',
4948
'Programming Language :: Python :: 2.7',
5049
'Programming Language :: Python :: 3',
51-
'Programming Language :: Python :: 3.2',
52-
'Programming Language :: Python :: 3.3',
5350
'Programming Language :: Python :: 3.4',
51+
'Programming Language :: Python :: 3.5',
5452
'Topic :: Scientific/Engineering',
5553
],
5654
keywords='data',

0 commit comments

Comments
 (0)