more corrections

This commit is contained in:
Luke Campagnola 2014-03-24 21:17:15 -04:00
parent 527df3bca8
commit e71cd2b23a
2 changed files with 3 additions and 4 deletions

View File

@ -25,7 +25,7 @@ env:
before_install: before_install:
- travis_retry sudo apt-get -qq update; - travis_retry sudo apt-get update;
# - if [ "${PYTHON}" != "2.7" ]; then # - if [ "${PYTHON}" != "2.7" ]; then
# wget http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86_64.sh -O miniconda.sh && # wget http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86_64.sh -O miniconda.sh &&
# chmod +x miniconda.sh && # chmod +x miniconda.sh &&
@ -84,7 +84,7 @@ before_script:
script: script:
# Run unit tests # Run unit tests
- python setup.py test - python${PYTHON} setup.py test
# check line endings # check line endings
- if [ "${TEST}" == "extra" ]; then - if [ "${TEST}" == "extra" ]; then
@ -97,7 +97,7 @@ script:
# Check for style issues # Check for style issues
- if [ "${TEST}" == "extra" ]; then - if [ "${TEST}" == "extra" ]; then
python setup.py style; python${PYTHON} setup.py style;
fi; fi;

View File

@ -107,7 +107,6 @@ setup(
#package_data={'pyqtgraph': ['graphicsItems/PlotItem/*.png']}, #package_data={'pyqtgraph': ['graphicsItems/PlotItem/*.png']},
install_requires = [ install_requires = [
'numpy', 'numpy',
'scipy',
], ],
**setupOpts **setupOpts
) )