Skip to content
This repository was archived by the owner on Jan 9, 2023. It is now read-only.

Commit 01b8974

Browse files
authored
Merge pull request #49 from chrisburr/add-python-versions
Add tests for Python 3.5 and 3.6
2 parents 9a48756 + 0500040 commit 01b8974

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,26 @@ matrix:
1212
env: PYTHON=3.4 ROOT=5.34.32
1313
- python: 3.4
1414
env: PYTHON=3.4 ROOT=6.04
15-
allow_failures:
16-
- python: 3.4
15+
- python: 3.5
16+
env: PYTHON=3.4 ROOT=5.34.32
17+
- python: 3.5
18+
env: PYTHON=3.4 ROOT=6.04
19+
- python: 3.6
20+
env: PYTHON=3.4 ROOT=5.34.32
21+
- python: 3.6
22+
env: PYTHON=3.4 ROOT=6.04
1723
#install: source ci/install.sh
1824
install:
1925
- if [ "${TRAVIS_OS_NAME}" == "osx" ]; then curl --silent http://repo.continuum.io/miniconda/Miniconda-latest-MacOSX-x86_64.sh -o miniconda.sh; fi
2026
- if [ "${TRAVIS_OS_NAME}" == "linux" ]; then wget -nv http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi
21-
27+
2228
- bash miniconda.sh -b -p $HOME/miniconda
2329
- export PATH="$HOME/miniconda/bin:$PATH"
2430
- hash -r
2531
- conda config --set always_yes yes --set changeps1 no
2632
- conda update -q conda
2733
- conda info -a # Useful for debugging any issues with conda
28-
- conda config --add channels http://conda.anaconda.org/NLeSC
34+
- conda config --add channels http://conda.anaconda.org/NLeSC
2935
- conda config --set show_channel_urls yes
3036
- conda create -q -n testenv python=${PYTHON} root=${ROOT} rootpy pandas nose
3137
- export CONDA_ENV_PATH=$HOME/miniconda/envs/testenv

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ These include
2020
- Selecting several columns at once using `*` globbing and `{A,B}` shell patterns.
2121
- Flattening source files containing arrays by storing one array element each in the DataFrame, duplicating any scalar variables.
2222

23+
Python versions supported:
24+
25+
[![](https://img.shields.io/badge/python-2.7-blue.svg)](https://badge.fury.io/py/root_pandas)
26+
[![](https://img.shields.io/badge/python-3.4-blue.svg)](https://badge.fury.io/py/root_pandas)
27+
[![](https://img.shields.io/badge/python-3.5-blue.svg)](https://badge.fury.io/py/root_pandas)
28+
[![](https://img.shields.io/badge/python-3.6-blue.svg)](https://badge.fury.io/py/root_pandas)
29+
30+
2331
## Reading ROOT files
2432

2533
This is how you can read the contents of a ROOT file into a DataFrame:

0 commit comments

Comments
 (0)