From 527d6a0342639dd08bb26059876e5fed7d8d9473 Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Mon, 11 Sep 2017 15:31:14 +0800 Subject: [PATCH 01/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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