From 527d6a0342639dd08bb26059876e5fed7d8d9473 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 11 Sep 2017 15:31:14 +0800 Subject: [PATCH 01/25] some tests --- .travis.yml | 8 +------- README.rst | 6 +++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 394d36d..a12bbf5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,7 @@ matrix: include: - os: linux env: - - MB_PYTHON_VERSION=2.6 - - os: linux - env: - - MB_PYTHON_VERSION=2.6 - - PLAT=i686 - - os: linux - env: + - JOB="XXX" - MB_PYTHON_VERSION=2.7 - os: linux env: diff --git a/README.rst b/README.rst index 5ff7848..4701f87 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/giampaolo/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 From 54970402342620f63f0db4396020a889ebbb3f42 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 11 Sep 2017 15:41:49 +0800 Subject: [PATCH 02/25] try to fix tests --- .travis.yml | 15 +++++---------- README.rst | 2 +- config.sh | 5 +++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index a12bbf5..78c7da3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,21 +29,11 @@ matrix: include: - os: linux env: - - JOB="XXX" - 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 @@ -75,22 +65,27 @@ matrix: - 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: diff --git a/README.rst b/README.rst index 4701f87..18f7987 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ .. image:: https://img.shields.io/travis/MacPython/psutil/master.svg?maxAge=3600&label=Linux%20/%20OSX - :target: https://travis-ci.org/giampaolo/psutil + :target: https://travis-ci.org/MacPython/psutil :alt: Linux / OSX (Travis) ################## diff --git a/config.sh b/config.sh index 016d3e7..c2be778 100644 --- a/config.sh +++ b/config.sh @@ -20,6 +20,7 @@ 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 + cd .. + PSUTIL_TESTING=1 PYTHONWARNINGS=all python psutil/tests/__main__.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From c688ad873baf8b0b34c91703fc33f489ef0dea1b Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 11 Sep 2017 15:49:41 +0800 Subject: [PATCH 03/25] experiments --- .travis.yml | 114 ++++++++++++++++++++++++++-------------------------- config.sh | 4 +- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78c7da3..a051bea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,63 +30,63 @@ matrix: - os: linux env: - MB_PYTHON_VERSION=2.7 - - 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 + # - 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/config.sh b/config.sh index c2be778..97bd06c 100644 --- a/config.sh +++ b/config.sh @@ -20,7 +20,7 @@ function run_tests { pip install $DEPENDS fi python --version - cd .. - PSUTIL_TESTING=1 PYTHONWARNINGS=all python psutil/tests/__main__.py + pwd + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From 8f43b3cb1bc5a0ea14237d41f903df3e60c21c6d Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 11 Sep 2017 15:55:21 +0800 Subject: [PATCH 04/25] experiments --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index 97bd06c..8c13b35 100644 --- a/config.sh +++ b/config.sh @@ -21,6 +21,7 @@ function run_tests { fi python --version 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 } From 3f1c27fc87c366817d6efa5cd697841e0dd20418 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 11 Sep 2017 16:07:30 +0800 Subject: [PATCH 05/25] experiments --- config.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 8c13b35..894682d 100644 --- a/config.sh +++ b/config.sh @@ -21,7 +21,9 @@ function run_tests { fi python --version pwd + cd .. ls -la - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py + ls -la .. + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From eac7f54f376d0d29c519c80063becd09fbcbe629 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 4 Nov 2017 12:30:27 +0100 Subject: [PATCH 06/25] update psutil version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a051bea..477867a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: - REPO_DIR=psutil # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=c4c6e22ca4dad687d2a8505f9e0207d8ecd64358 + - BUILD_COMMIT=e73ddf4057ed9ea07747b633bf539f6553366049 - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= From 8232b0133d6d536fac016c7cd5f68ee1186b670e Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 11 Nov 2017 10:48:24 +0100 Subject: [PATCH 07/25] progress --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 894682d..0a42d54 100644 --- a/config.sh +++ b/config.sh @@ -24,6 +24,6 @@ function run_tests { cd .. ls -la ls -la .. - # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From 52b5a292d585788b0b776222722a87e388984d0c Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 11 Nov 2017 10:54:08 +0100 Subject: [PATCH 08/25] progress --- config.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config.sh b/config.sh index 0a42d54..11d4e63 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 { @@ -21,9 +19,7 @@ function run_tests { fi python --version pwd - cd .. ls -la - ls -la .. PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From 695d982305942d3f9736c0f089c0205b540b9b26 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 11 Nov 2017 10:59:02 +0100 Subject: [PATCH 09/25] progress --- .travis.yml | 3 ++- config.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb73e5a..fbc726f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,10 @@ 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=e73ddf4057ed9ea07747b633bf539f6553366049 + - BUILD_COMMIT=master - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= diff --git a/config.sh b/config.sh index 11d4e63..9f34e2c 100644 --- a/config.sh +++ b/config.sh @@ -20,6 +20,6 @@ function run_tests { python --version pwd ls -la - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From f4ba9e3004554b4e2fcd5654958cd0c2caa129d0 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 18 Nov 2017 14:07:24 +0100 Subject: [PATCH 10/25] upadte secure key --- .travis.yml | 2 +- README.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbc726f..86c99e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: - TEST_DEPENDS= # Following generated with # travis encrypt -r MacPython/psutil-wheels WHEELHOUSE_UPLOADER_SECRET= - - secure: "TShPxjfYrHIYrf8CcdCfxrUNNCNcajUIiwwN9vd0xa1pnriwBnEiOGsBibYXPHDTtPx936DUfJXpsHuDcWYu023HNv9N7djZpNO1fI++tTCKFQahwln+wnIa/EzEOPK3EqyjmBR5i4Q1EU0LsKP3mNDdfAg5trpY23GTGPYQQto=" + - secure: "CJoUuosDNWnMgdbF8V4N+7x0L1o77KspnUfkRS0bK8Sd2TtLaImrtf1UdOzGSoL/EknG/m8lRHE9znKGwPWKfMPbWVOtWhfYT4xrnoUQ2yKW02fx/m5OiozQoCGYiONws9Nv1nFvzJ6PnyLGdhR5SKv4rWWqEZPSGGEZ4KtU51s=" # Commit when running from daily branch - DAILY_COMMIT=master diff --git a/README.rst b/README.rst index 18f7987..15ee7f0 100644 --- a/README.rst +++ b/README.rst @@ -21,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 From 45a1f318723dc4a0cb1a8fd8916c98f4c765208e Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Sun, 19 Nov 2017 21:37:54 +0000 Subject: [PATCH 11/25] Try wrong key --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86c99e5..87008eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: - TEST_DEPENDS= # Following generated with # travis encrypt -r MacPython/psutil-wheels WHEELHOUSE_UPLOADER_SECRET= - - secure: "CJoUuosDNWnMgdbF8V4N+7x0L1o77KspnUfkRS0bK8Sd2TtLaImrtf1UdOzGSoL/EknG/m8lRHE9znKGwPWKfMPbWVOtWhfYT4xrnoUQ2yKW02fx/m5OiozQoCGYiONws9Nv1nFvzJ6PnyLGdhR5SKv4rWWqEZPSGGEZ4KtU51s=" + - secure: "PCJoUuosDNWnMgdbF8V4N+7x0L1o77KspnUfkRS0bK8Sd2TtLaImrtf1UdOzGSoL/EknG/m8lRHE9znKGwPWKfMPbWVOtWhfYT4xrnoUQ2yKW02fx/m5OiozQoCGYiONws9Nv1nFvzJ6PnyLGdhR5SKv4rWWqEZPSGGEZ4KtU51s=" # Commit when running from daily branch - DAILY_COMMIT=master From 916c83970f0910ba674e1b22f0721843b328b6ac Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Sun, 19 Nov 2017 23:25:19 +0000 Subject: [PATCH 12/25] Fix repository name for encrypted key --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87008eb..a970d2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ env: - BUILD_DEPENDS= - TEST_DEPENDS= # Following generated with - # travis encrypt -r MacPython/psutil-wheels WHEELHOUSE_UPLOADER_SECRET= - - secure: "PCJoUuosDNWnMgdbF8V4N+7x0L1o77KspnUfkRS0bK8Sd2TtLaImrtf1UdOzGSoL/EknG/m8lRHE9znKGwPWKfMPbWVOtWhfYT4xrnoUQ2yKW02fx/m5OiozQoCGYiONws9Nv1nFvzJ6PnyLGdhR5SKv4rWWqEZPSGGEZ4KtU51s=" + # 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 From 570d3467fa512e171651c4780094d38eed47a898 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 20 Nov 2017 15:07:04 +0100 Subject: [PATCH 13/25] try running tests --- .travis.yml | 10 +++++----- config.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a970d2a..36f6a33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,11 +82,11 @@ matrix: # env: # - SYS=OSX # - MB_PYTHON_VERSION=3.5 - # - os: osx - # language: generic - # env: - # - SYS=OSX - # - MB_PYTHON_VERSION=3.6 + - os: osx + language: generic + env: + - SYS=OSX + - MB_PYTHON_VERSION=3.6 before_install: - if [ "$TRAVIS_BRANCH" == "daily" ]; then diff --git a/config.sh b/config.sh index 9f34e2c..11d4e63 100644 --- a/config.sh +++ b/config.sh @@ -20,6 +20,6 @@ function run_tests { python --version pwd ls -la - # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From 1c4329f4812ad0106643ebb1722cba25396ad13a Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Wed, 22 Nov 2017 19:25:17 +0100 Subject: [PATCH 14/25] trigger build --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 36f6a33..647b6ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +# build: 1 # increase this to trigger a new build + language: python python: 3.5 sudo: required From 5f9010317fa94229be2f268adfd4db7aa499881f Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Fri, 24 Nov 2017 08:27:59 +0100 Subject: [PATCH 15/25] build --- .travis.yml | 17 +++++------------ README.rst | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 647b6ed..f80c144 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# build: 1 # increase this to trigger a new build +# build: 2 # increase this to trigger a new build language: python python: 3.5 @@ -32,17 +32,10 @@ matrix: - os: linux env: - MB_PYTHON_VERSION=2.7 - # - 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=2.7 + - PLAT=i686 # - os: linux # env: # - MB_PYTHON_VERSION=3.4 diff --git a/README.rst b/README.rst index 15ee7f0..a0dd87c 100644 --- a/README.rst +++ b/README.rst @@ -20,8 +20,8 @@ want to build a specific commit: * git commit -The wheels get uploaded to a `rackspace container -`__ +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 From 03ecc02c8ad42be75538593a07a457c1e22c4edf Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Fri, 24 Nov 2017 13:55:33 +0100 Subject: [PATCH 16/25] test --- .travis.yml | 18 ++++++++++++------ config.sh | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f80c144..0ecd619 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=master + - BUILD_COMMIT=release-5.4.0 - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= @@ -57,11 +57,17 @@ matrix: # 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=2.7 + - os: osx + language: generic + env: + - SYS=OSX + - PLAT=i686 + - MB_PYTHON_VERSION=2.7 # - os: osx # language: generic # env: diff --git a/config.sh b/config.sh index 11d4e63..9f34e2c 100644 --- a/config.sh +++ b/config.sh @@ -20,6 +20,6 @@ function run_tests { python --version pwd ls -la - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } From bab3ddff18c1f455acad08a26a2889c4cface270 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 25 Nov 2017 11:48:31 +0100 Subject: [PATCH 17/25] add script to download wheels --- .travis.yml | 32 +++++------ Makefile | 7 +++ config.sh | 11 ++++ scripts/download_unix_wheels.py | 99 +++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 16 deletions(-) create mode 100644 Makefile create mode 100644 scripts/download_unix_wheels.py diff --git a/.travis.yml b/.travis.yml index 0ecd619..9e71632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=release-5.4.0 + - BUILD_COMMIT=release-5.4.2 - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= @@ -32,10 +32,10 @@ matrix: - os: linux env: - MB_PYTHON_VERSION=2.7 - - os: linux - env: - - MB_PYTHON_VERSION=2.7 - - PLAT=i686 + # - os: linux + # env: + # - MB_PYTHON_VERSION=2.7 + # - PLAT=i686 # - os: linux # env: # - MB_PYTHON_VERSION=3.4 @@ -57,17 +57,17 @@ matrix: # 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 - - PLAT=i686 - - MB_PYTHON_VERSION=2.7 + # - os: osx + # language: generic + # env: + # - SYS=OSX + # - MB_PYTHON_VERSION=2.7 + # - os: osx + # language: generic + # env: + # - SYS=OSX + # - PLAT=i686 + # - MB_PYTHON_VERSION=2.7 # - os: osx # language: generic # env: diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..784a1a3 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +PYTHON = python + +download-unix-wheels: ## download unix wheels + $(PYTHON) scripts/download_unix_wheels.py + +help: ## display callable targets + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' diff --git a/config.sh b/config.sh index 9f34e2c..4443c06 100644 --- a/config.sh +++ b/config.sh @@ -20,6 +20,17 @@ function run_tests { python --version pwd ls -la + # if [ "$PYVER" == "2.7" ] || [ "$PYVER" == "3.6" ]; then + if [ "$PYVER" == "2.7" ]; then + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_process.py + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_system.py + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_connections.py + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_unicode.py + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_contracts.py + else + python -c "import psutil" + fi + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } diff --git a/scripts/download_unix_wheels.py b/scripts/download_unix_wheels.py new file mode 100644 index 0000000..cf0b6cf --- /dev/null +++ b/scripts/download_unix_wheels.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python + +from pprint import pprint as pp +import os +import re +import requests +import errno +import concurrent.futures + + +URL = "http://a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com/" +TIMEOUT = 30 + + +def bytes2human(n): + """ + >>> bytes2human(10000) + '9.8 K' + >>> bytes2human(100001221) + '95.4 M' + """ + symbols = ('K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y') + prefix = {} + for i, s in enumerate(symbols): + prefix[s] = 1 << (i + 1) * 10 + for s in reversed(symbols): + if n >= prefix[s]: + value = float(n) / prefix[s] + return '%.2f %s' % (value, s) + return '%.2f B' % (n) + + +def safe_makedirs(path): + try: + os.makedirs(path) + except OSError as err: + if err.errno == errno.EEXIST: + if not os.path.isdir(path): + raise + else: + raise + +def get_most_recent(ls): + assert ls + ret = [] + ls.sort(reverse=False) # so that higher versions are listed first + ver = ls[0].split('-')[1] + for item in ls: + if item.split('-')[1] != ver: + break + else: + ret.append(item) + return ret + + +def download_file(url): + local_fname = url.split('/')[-1] + local_fname = os.path.join('dist', local_fname) + safe_makedirs('dist') + r = requests.get(url, stream=True, timeout=TIMEOUT) + with open(local_fname, 'wb') as f: + for chunk in r.iter_content(chunk_size=16384): + if chunk: # filter out keep-alive new chunks + f.write(chunk) + return local_fname + + +def parallel_wget(urls): + completed = 0 + with concurrent.futures.ThreadPoolExecutor() as e: + fut_to_url = {e.submit(download_file, url): url for url in urls} + for fut in concurrent.futures.as_completed(fut_to_url): + url = fut_to_url[fut] + try: + local_fname = fut.result() + except Exception as _: + exc = _ + print("error while downloading %s: %s" % (url, exc)) + else: + completed += 1 + print("downloaded %-10s %s" % ( + bytes2human(os.path.getsize(local_fname)), local_fname)) + return completed + + +def main(): + print("HTTP GET " + URL) + req = requests.get(URL) + req.raise_for_status() + ls = re.findall(r"\"psutil-.*\.whl\"", req.text) + print("found %s psutil-related files" % len(ls)) + ls = [x.strip('"') for x in ls] + ls = get_most_recent(ls) + print("getting the %s most recent versions" % len(ls)) + urls = [os.path.join(URL, x) for x in ls] + parallel_wget(urls) + + +main() From 3aa39341d3011c224497a3408de8070f23271d5b Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 25 Nov 2017 19:55:52 +0100 Subject: [PATCH 18/25] update cset --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9e71632..85d2e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=release-5.4.2 + - BUILD_COMMIT=2ab6417 # 5.4.1 - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= From db85689409f3682a87d0fdbac8aec268838fbfc2 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sun, 26 Nov 2017 08:58:43 +0100 Subject: [PATCH 19/25] try to run some tests --- .travis.yml | 3 +-- config.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85d2e51..1f71f54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=2ab6417 # 5.4.1 + - BUILD_COMMIT=2ab6417 # 5.2.1 - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= @@ -88,7 +88,6 @@ matrix: env: - SYS=OSX - MB_PYTHON_VERSION=3.6 - before_install: - if [ "$TRAVIS_BRANCH" == "daily" ]; then CONTAINER="pre-release"; diff --git a/config.sh b/config.sh index 4443c06..f8b8265 100644 --- a/config.sh +++ b/config.sh @@ -21,7 +21,7 @@ function run_tests { pwd ls -la # if [ "$PYVER" == "2.7" ] || [ "$PYVER" == "3.6" ]; then - if [ "$PYVER" == "2.7" ]; then + if [ "$MB_PYTHON_VERSION" == "2.7" ]; then PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_process.py PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_system.py PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_connections.py From 19a6893079e65be6d757854feb7d581475574b09 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 9 Dec 2017 12:38:36 +0100 Subject: [PATCH 20/25] try it --- .travis.yml | 2 +- config.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f71f54..4798746 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=2ab6417 # 5.2.1 + - BUILD_COMMIT=osx-wheels-debug - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= diff --git a/config.sh b/config.sh index f8b8265..6c52b29 100644 --- a/config.sh +++ b/config.sh @@ -23,10 +23,10 @@ function run_tests { # if [ "$PYVER" == "2.7" ] || [ "$PYVER" == "3.6" ]; then if [ "$MB_PYTHON_VERSION" == "2.7" ]; then PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_process.py - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_system.py - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_connections.py - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_unicode.py - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_contracts.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_system.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_connections.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_unicode.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_contracts.py else python -c "import psutil" fi From 6e7be739b3558a030bc481882082c970354ede7d Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 9 Dec 2017 13:35:37 +0100 Subject: [PATCH 21/25] run tests --- config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 6c52b29..a5c78d3 100644 --- a/config.sh +++ b/config.sh @@ -22,7 +22,8 @@ function run_tests { ls -la # if [ "$PYVER" == "2.7" ] || [ "$PYVER" == "3.6" ]; then if [ "$MB_PYTHON_VERSION" == "2.7" ]; then - PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_process.py + PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py + # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_process.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_system.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_connections.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_unicode.py From 96e1887818a970438033c02fa094f49b5fcc8473 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sat, 9 Dec 2017 13:44:11 +0100 Subject: [PATCH 22/25] run tests --- config.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/config.sh b/config.sh index a5c78d3..044ca4b 100644 --- a/config.sh +++ b/config.sh @@ -35,3 +35,4 @@ function run_tests { # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/__main__.py # PSUTIL_TESTING=1 python -Wa ../psutil/psutil/tests/test_memory_leaks.py } + From 0e0e44a415475452ff9672d9a59d15358ee597be Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sun, 10 Dec 2017 10:39:31 +0100 Subject: [PATCH 23/25] update ver --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4798746..f69b219 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=osx-wheels-debug + - BUILD_COMMIT=b710bf29c36a748fc2f82160f1ae1fa60779c996 - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= From 55666d43061a8e01e594f7b1c9409403c552479b Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sun, 10 Dec 2017 10:47:44 +0100 Subject: [PATCH 24/25] bump up ver --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f69b219..d224901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=b710bf29c36a748fc2f82160f1ae1fa60779c996 + - BUILD_COMMIT=19fa78b4d65dc422351bfe5237e7b08c8b97666c - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS= From 87bbb93d3697bc069116e013c30c8a2444ea185f Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Sun, 10 Dec 2017 11:15:38 +0100 Subject: [PATCH 25/25] bump up ver --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d224901..fd8fed4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: # This is the psutil GIT cset. # Remember to edit appveyor.yml too # Also see DAILY_COMMIT below - - BUILD_COMMIT=19fa78b4d65dc422351bfe5237e7b08c8b97666c + - BUILD_COMMIT=95c202caf90b294ac558844a6464ae6bb7f84117 - PLAT=x86_64 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker - BUILD_DEPENDS=