diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-08 08:59:16 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-02-08 08:59:16 +0100 |
| commit | d1cf8cf1655ade8649e56bfdbf18712974285ada (patch) | |
| tree | 9c64bee60e5f289640b864b5084a4e16bbcb9005 | |
| parent | 5bb315297d3e1cbc12d0532c74b792820363cd39 (diff) | |
| download | psutil-d1cf8cf1655ade8649e56bfdbf18712974285ada.tar.gz | |
try to fix ci tests
| -rwxr-xr-x | .ci/travis/install.sh | 14 | ||||
| -rwxr-xr-x | .ci/travis/run.sh | 2 | ||||
| -rw-r--r-- | appveyor.yml | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/.ci/travis/install.sh b/.ci/travis/install.sh index 23d9ce04..c6774797 100755 --- a/.ci/travis/install.sh +++ b/.ci/travis/install.sh @@ -16,11 +16,11 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then py26) pyenv install 2.6.9 pyenv virtualenv 2.6.9 psutil - ;; + ;; py27) pyenv install 2.7.10 pyenv virtualenv 2.7.10 psutil - ;; + ;; py32) pyenv install 3.2.6 pyenv virtualenv 3.2.6 psutil @@ -38,14 +38,14 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then pyenv activate psutil fi -if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]] || [[ $PYVER == 'py26' ]]; then +if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]] || [[ $PYVER == 'py26' ]]; then pip install -U ipaddress unittest2 mock==1.0.1 -elif [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $PYVER == 'py27' ]]; then +elif [[ $TRAVIS_PYTHON_VERSION == '2.7' ]] || [[ $PYVER == 'py27' ]]; then pip install -U ipaddress mock -elif [[ $TRAVIS_PYTHON_VERSION == '3.2' ]] || [[ $PYVER == 'py32' ]]; then +elif [[ $TRAVIS_PYTHON_VERSION == '3.2' ]] || [[ $PYVER == 'py32' ]]; then pip install -U ipaddress mock -elif [[ $TRAVIS_PYTHON_VERSION == '3.3' ]] || [[ $PYVER == 'py33' ]]; then +elif [[ $TRAVIS_PYTHON_VERSION == '3.3' ]] || [[ $PYVER == 'py33' ]]; then pip install -U ipaddress fi -pip install coverage coveralls flake8 pep8
\ No newline at end of file +pip install coverage coveralls flake8 pep8 setuptools diff --git a/.ci/travis/run.sh b/.ci/travis/run.sh index ce21e8ac..9bb62cbf 100755 --- a/.ci/travis/run.sh +++ b/.ci/travis/run.sh @@ -11,7 +11,7 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then fi python setup.py build -python setup.py install +python setup.py develop coverage run psutil/tests/runner.py --include="psutil/*" --omit="test/*,*setup*" python psutil/tests/test_memory_leaks.py flake8 diff --git a/appveyor.yml b/appveyor.yml index 643d0c66..838e7549 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,10 +63,10 @@ install: # - ps: (new-object net.webclient).DownloadFile('https://raw.github.com/pypa/pip/master/contrib/get-pip.py', 'C:/get-pip.py') # - "%PYTHON%/python.exe C:/get-pip.py" # - "%PYTHON%/python.exe -m pip install ..." + - "%WITH_COMPILER% %PYTHON%/Scripts/pip.exe install unittest2 ipaddress pypiwin32 wmi wheel setuptools --upgrade" - "%WITH_COMPILER% %PYTHON%/python.exe setup.py build" - "%WITH_COMPILER% %PYTHON%/python.exe setup.py build build_ext -i" - - "%WITH_COMPILER% %PYTHON%/python.exe setup.py install" - - "%WITH_COMPILER% %PYTHON%/Scripts/pip.exe install unittest2 ipaddress pypiwin32 wmi wheel --upgrade" + - "%WITH_COMPILER% %PYTHON%/python.exe setup.py develop" # 1.0.1 is the latest release supporting python 2.6 - "%WITH_COMPILER% %PYTHON%/Scripts/pip.exe install mock==1.0.1" @@ -75,8 +75,8 @@ build: off test_script: - "%WITH_COMPILER% %PYTHON%/python psutil/tests/runner.py" -after_test: - - "%WITH_COMPILER% %PYTHON%/python setup.py bdist_wheel" +# after_test: +# - "%WITH_COMPILER% %PYTHON%/python setup.py bdist_wheel" artifacts: - path: dist\* |