Skip to content

Commit dc098d8

Browse files
committed
Merge pull request #7009 from jreback/python3.4
BLD/TST: Python3.4 testing via travis
2 parents 1827abd + 3972f2a commit dc098d8

File tree

6 files changed

+54
-15
lines changed

6 files changed

+54
-15
lines changed

.travis.yml

+16
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,32 @@ matrix:
4646
- FULL_DEPS=true
4747
- CLIPBOARD=xsel
4848
- JOB_NAME: "33_nslow"
49+
- python: 3.4
50+
env:
51+
- EXPERIMENTAL=true
52+
- NOSE_ARGS="not slow and not disabled"
53+
- FULL_DEPS=true
54+
- CLIPBOARD=xsel
55+
- JOB_NAME: "34_nslow"
4956
- python: 2.7
5057
env:
58+
- EXPERIMENTAL=true
5159
- NOSE_ARGS="not slow and not network and not disabled"
5260
- JOB_NAME: "27_numpy_master"
5361
- JOB_TAG=_NUMPY_DEV_master
5462
- NUMPY_BUILD=master
5563
- PANDAS_TESTING_MODE="numpy_deprecate"
5664
allow_failures:
65+
- python: 3.4
66+
env:
67+
- EXPERIMENTAL=true
68+
- NOSE_ARGS="not slow and not disabled"
69+
- FULL_DEPS=true
70+
- CLIPBOARD=xsel
71+
- JOB_NAME: "34_nslow"
5772
- python: 2.7
5873
env:
74+
- EXPERIMENTAL=true
5975
- NOSE_ARGS="not slow and not network and not disabled"
6076
- JOB_NAME: "27_numpy_master"
6177
- JOB_TAG=_NUMPY_DEV_master

ci/install.sh

+33-8
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,38 @@ edit_init
3131
python_major_version="${TRAVIS_PYTHON_VERSION:0:1}"
3232
[ "$python_major_version" == "2" ] && python_major_version=""
3333

34-
# fix these versions
35-
pip install -I pip==1.5.1
36-
pip install -I setuptools==2.2
34+
home_dir=$(pwd)
35+
36+
# known working
37+
# pip==1.5.1
38+
# setuptools==2.2
39+
# wheel==0.22
40+
# nose==1.3.0 (1.3.1 broken for PY3)
41+
42+
pip install -I -U pip
43+
pip install -I -U setuptools
3744
pip install wheel==0.22
38-
pip install nose==1.3.0
45+
46+
# install nose
47+
pip uninstall nose -y
48+
49+
if [ -n "$EXPERIMENTAL" ]; then
50+
51+
# install from master
52+
rm -Rf /tmp/nose
53+
cd /tmp
54+
git clone --branch master https://github.com/nose-devs/nose.git nose
55+
cd nose
56+
python setup.py install
57+
cd $home_dir
58+
59+
else
60+
61+
# known good version
62+
pip install nose==1.3.0
63+
64+
fi
65+
3966

4067
# comment this line to disable the fetching of wheel files
4168
base_url=http://pandas.pydata.org/pandas-build/dev/wheels
@@ -54,8 +81,8 @@ time sudo apt-get $APT_ARGS install libatlas-base-dev gfortran
5481

5582
if [ -n "$NUMPY_BUILD" ]; then
5683
# building numpy
57-
curdir=$(pwd)
5884

85+
cd $home_dir
5986
echo "cloning numpy"
6087

6188
rm -Rf /tmp/numpy
@@ -70,20 +97,18 @@ if [ -n "$NUMPY_BUILD" ]; then
7097
# clone & install
7198
git clone --branch $NUMPY_BUILD https://github.com/numpy/numpy.git numpy
7299
cd numpy
73-
wd=${pwd}
74100
time pip install .
75101
pip uninstall cython -y
76102

77103
cd $curdir
78-
echo "building numpy: $wd"
79104
numpy_version=$(python -c 'import numpy; print(numpy.__version__)')
80105
echo "[$curdir] numpy current: $numpy_version"
81106
fi
82107

83108
# Force virtualenv to accept system_site_packages
84109
rm -f $VIRTUAL_ENV/lib/python$TRAVIS_PYTHON_VERSION/no-global-site-packages.txt
85110

86-
111+
cd $home_dir
87112
time pip install $PIP_ARGS -r ci/requirements-${wheel_box}.txt
88113

89114
# Need to enable for locale testing. The location of the locale file(s) is

ci/requirements-3.4.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ xlrd==0.9.2
66
html5lib==1.0b2
77
numpy==1.8.0
88
cython==0.20.0
9+
scipy==0.13.3
910
numexpr==2.3
1011
tables==3.1.0
1112
bottleneck==0.8.0
1213
matplotlib==1.3.1
1314
patsy==0.2.1
1415
lxml==3.2.1
15-
scipy==0.13.3
16-
beautifulsoup4==4.2.1
17-
statsmodels==0.5.0
1816
sqlalchemy==0.9.3
1917
pymysql==0.6.1
2018
psycopg2==2.5.2
19+
beautifulsoup4==4.2.1

doc/source/install.rst

+1-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ compiler (MinGW or Visual Studio) installed. `How-to install MinGW on Windows
1616
Python version support
1717
~~~~~~~~~~~~~~~~~~~~~~
1818

19-
Officially Python 2.6 to 2.7 and Python 3.2+. Python 2.4 and Python 2.5 are no
20-
longer supported since the userbase has shrunk significantly. Continuing Python
21-
2.4 and 2.5 support will require either monetary development support or someone
22-
contributing to the project to restore compatibility.
19+
Officially Python 2.6, 2.7, 3.2, 3.3, and 3.4.
2320

2421

2522
Binary installers

doc/source/release.rst

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ pandas 0.14.0
5353
New features
5454
~~~~~~~~~~~~
5555

56+
- Officially support Python 3.4
5657
- ``Index`` returns a MultiIndex if passed a list of tuples
5758
``DataFrame(dict)`` and ``Series(dict)`` create ``MultiIndex``
5859
columns and index where applicable (:issue:`4187`)

doc/source/v0.14.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ users upgrade to this version.
99

1010
- Highlights include:
1111

12+
- Officially support Python 3.4
1213
- SQL interfaces updated to use ``sqlalchemy``, See :ref:`Here<whatsnew_0140.sql>`.
1314
- MultiIndexing Using Slicers, See :ref:`Here<whatsnew_0140.slicers>`.
1415
- Ability to join a singly-indexed DataFrame with a multi-indexed DataFrame, see :ref:`Here <merging.join_on_mi>`

0 commit comments

Comments
 (0)