##// END OF EJS Templates
Switch master to development of 6.0...
Thomas Kluyver -
Show More
@@ -5,30 +5,12 b' python:'
5 - 3.5
5 - 3.5
6 - 3.4
6 - 3.4
7 - 3.3
7 - 3.3
8 - 2.7
9 - pypy
10 sudo: false
8 sudo: false
11 before_install:
9 before_install:
12 - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
10 - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
13 - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'
11 - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'
14 install:
12 install:
15 - pip install "setuptools>=18.5"
13 - pip install "setuptools>=18.5"
16 # Installs PyPy (+ its Numpy). Based on @frol comment at:
17 # https://github.com/travis-ci/travis-ci/issues/5027
18 - |
19 if [ "$TRAVIS_PYTHON_VERSION" = "pypy" ]; then
20 export PYENV_ROOT="$HOME/.pyenv"
21 if [ -f "$PYENV_ROOT/bin/pyenv" ]; then
22 cd "$PYENV_ROOT" && git pull
23 else
24 rm -rf "$PYENV_ROOT" && git clone --depth 1 https://github.com/yyuu/pyenv.git "$PYENV_ROOT"
25 fi
26 export PYPY_VERSION="5.3.1"
27 "$PYENV_ROOT/bin/pyenv" install "pypy-$PYPY_VERSION"
28 virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
29 source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
30 pip install https://bitbucket.org/pypy/numpy/get/master.zip
31 fi
32 - pip install -f travis-wheels/wheelhouse -e file://$PWD#egg=ipython[test]
14 - pip install -f travis-wheels/wheelhouse -e file://$PWD#egg=ipython[test]
33 - pip install codecov
15 - pip install codecov
34 script:
16 script:
@@ -41,4 +23,3 b' after_success:'
41 matrix:
23 matrix:
42 allow_failures:
24 allow_failures:
43 - python: nightly
25 - python: nightly
44 - python: pypy
@@ -19,8 +19,8 b" name = 'ipython'"
19 # IPython version information. An empty _version_extra corresponds to a full
19 # IPython version information. An empty _version_extra corresponds to a full
20 # release. 'dev' as a _version_extra string means this is a development
20 # release. 'dev' as a _version_extra string means this is a development
21 # version
21 # version
22 _version_major = 5
22 _version_major = 6
23 _version_minor = 2
23 _version_minor = 0
24 _version_patch = 0
24 _version_patch = 0
25 _version_extra = '.dev'
25 _version_extra = '.dev'
26 # _version_extra = 'rc1'
26 # _version_extra = 'rc1'
@@ -116,8 +116,6 b' classifiers = ['
116 'Intended Audience :: Science/Research',
116 'Intended Audience :: Science/Research',
117 'License :: OSI Approved :: BSD License',
117 'License :: OSI Approved :: BSD License',
118 'Programming Language :: Python',
118 'Programming Language :: Python',
119 'Programming Language :: Python :: 2',
120 'Programming Language :: Python :: 2.7',
121 'Programming Language :: Python :: 3',
119 'Programming Language :: Python :: 3',
122 'Topic :: System :: Shells'
120 'Topic :: System :: Shells'
123 ]
121 ]
General Comments 0
You need to be logged in to leave comments. Login now