diff --git a/.travis.yml b/.travis.yml index dfa53b8..a970d2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,16 +8,17 @@ osx_image: xcode6.4 env: global: - REPO_DIR=psutil + # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=c4c6e22ca4dad687d2a8505f9e0207d8ecd64358 + - BUILD_COMMIT=master - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= - TEST_DEPENDS= # Following generated with - # travis encrypt -r MacPython/psutil-wheels WHEELHOUSE_UPLOADER_SECRET= - - secure: "TShPxjfYrHIYrf8CcdCfxrUNNCNcajUIiwwN9vd0xa1pnriwBnEiOGsBibYXPHDTtPx936DUfJXpsHuDcWYu023HNv9N7djZpNO1fI++tTCKFQahwln+wnIa/EzEOPK3EqyjmBR5i4Q1EU0LsKP3mNDdfAg5trpY23GTGPYQQto=" + # travis encrypt -r MacPython/psutil WHEELHOUSE_UPLOADER_SECRET= + - secure: "NOv97zrh+QRrGa+iFPtIcqaBBppbVfOIKJsbPKYzv1zcr45oipaSXHuSQdXVFHyi33iR6ygejXQuFOf61MWXsE0lJQd/k1892+Kz/ojEfrJuEknBNiw9N6mBKHXtV6vAaX5/d6ku9fS/IEDNR2XLetGnVL3GP9Kgpul0eYbBKgd4XU91tP/K2NKfrAXKpWIl3EsoHPdjIjVcrSLg+JXzUyCAke+YG4g9igAzSPmE6DgKkQG4nVX/kvYCc3Yf5MQsZdPVH16gvhw5qRgkeW2m8poujKbXNik3qa8oNAfGzYZ98khjvYwKrhJVtMZ254Lw6C564EYwECAD/4J91oXJta9T+huXdgEf1tHo5P12h9NSSMneRrL3dr8i0py3wRX5G1iyvF5eX7NX03jRgFi81WSwLNiPnzKQvRfLAfB9Jwmg70FBz7X8Nc5HTzHMOWgobLsBySyodaEuHFzNlnUz5GA7kRXdCxRJ+RdQSsukQl6UBT2GcdyA3EWd1tgZ605Dxyxp2PKhnlw3AWRSdt3wKBk8GrOeBNm3sQgZ0PwrvNFoCMWjT+NneNyyDkZsI3pEOJWk87BRsYvdxwD1ged2Z2AYEMKICfGFvSoLsH2xY5CWl336a26eLnlyUPInImuk5Zn0eZFHDOXVQGVXRe6RVCebRMzm9ecqdOeiy/FiNJI=" # Commit when running from daily branch - DAILY_COMMIT=master @@ -26,77 +27,66 @@ matrix: # Exclude the default Python 3.5 build - python: 3.5 include: - - os: linux - env: - - MB_PYTHON_VERSION=2.6 - - os: linux - env: - - MB_PYTHON_VERSION=2.6 - - PLAT=i686 - - os: linux - env: - - MB_PYTHON_VERSION=2.7 - - os: linux - env: - - MB_PYTHON_VERSION=2.7 - - UNICODE_WIDTH=16 - os: linux env: - MB_PYTHON_VERSION=2.7 - - PLAT=i686 - - os: linux - env: - - MB_PYTHON_VERSION=2.7 - - PLAT=i686 - - UNICODE_WIDTH=16 - - os: linux - env: - - MB_PYTHON_VERSION=3.3 - - os: linux - env: - - MB_PYTHON_VERSION=3.3 - - PLAT=i686 - - os: linux - env: - - MB_PYTHON_VERSION=3.4 - - os: linux - env: - - MB_PYTHON_VERSION=3.4 - - PLAT=i686 - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - PLAT=i686 - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - PLAT=i686 - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=2.7 - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.3 - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.4 - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.5 - - os: osx - language: generic - env: - - MB_PYTHON_VERSION=3.6 + # - os: linux + # env: + # - MB_PYTHON_VERSION=2.7 + # - PLAT=i686 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.3 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.3 + # - PLAT=i686 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.4 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.4 + # - PLAT=i686 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.5 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.5 + # - PLAT=i686 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.6 + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.6 + # - PLAT=i686 + # - os: osx + # language: generic + # env: + # - SYS=OSX + # - MB_PYTHON_VERSION=2.7 + # - os: osx + # language: generic + # env: + # - SYS=OSX + # - MB_PYTHON_VERSION=3.3 + # - os: osx + # language: generic + # env: + # - SYS=OSX + # - MB_PYTHON_VERSION=3.4 + # - os: osx + # language: generic + # env: + # - SYS=OSX + # - MB_PYTHON_VERSION=3.5 + # - os: osx + # language: generic + # env: + # - SYS=OSX + # - MB_PYTHON_VERSION=3.6 before_install: - if [ "$TRAVIS_BRANCH" == "daily" ]; then diff --git a/README.rst b/README.rst index 5ff7848..15ee7f0 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,12 @@ +.. image:: https://img.shields.io/travis/MacPython/psutil/master.svg?maxAge=3600&label=Linux%20/%20OSX + :target: https://travis-ci.org/MacPython/psutil + :alt: Linux / OSX (Travis) + ################## psutil wheel builder ################## -Repository to build psutil wheels. +Repository to build `psutil `__ wheels. By default the repo builds the latest tag (the tag on the branch most recently branched from master - see http://stackoverflow.com/a/24557377/1939576). If you @@ -17,7 +21,7 @@ want to build a specific commit: The wheels get uploaded to a `rackspace container -`_ +`__ to which I have the API key. The API key is encrypted to this specific repo in the ``.travis.yml`` file, so the upload won't work for you from another account. Either contact me to get set up, or use another upload service such as diff --git a/config.sh b/config.sh index 016d3e7..9f34e2c 100644 --- a/config.sh +++ b/config.sh @@ -4,8 +4,6 @@ if [ "$MB_PYTHON_VERSION" == '2.6' ]; then DEPENDS="ipaddress unittest2 argparse mock==1.0.1" elif [ $(lex_ver $MB_PYTHON_VERSION) -le $(lex_ver 3.2) ]; then DEPENDS="ipaddress mock" -elif [ "$MB_PYTHON_VERSION" == '3.3' ]; then - DEPENDS=ipaddress fi function pre_build { @@ -20,6 +18,8 @@ function run_tests { pip install $DEPENDS fi python --version - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py + pwd + ls -la + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py }