From 8e5c5d6cf4f90a4389860ff9ab937cf2224200cf Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 2 Jul 2014 00:56:48 +0200 Subject: [PATCH 1/5] Add OSX wheel generation instructions and upload script --- RELEASE.txt | 4 ++++ tools/osx_wheel_upload.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100755 tools/osx_wheel_upload.sh diff --git a/RELEASE.txt b/RELEASE.txt index b56b5bb8..5a7cfd97 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -34,6 +34,10 @@ How to make a new release of ``skimage`` python setup.py register python setup.py sdist upload + Go to https://travis-ci.org/scikit-image/scikit-image-wheels, + select the "Current" tab, and click (on the right) on the "Restart Build" + icon. After that finished, execute ``tools/osx_wheel_upload.sh``. + - Increase the version number - In ``setup.py``, set to ``0.Xdev``. diff --git a/tools/osx_wheel_upload.sh b/tools/osx_wheel_upload.sh new file mode 100755 index 00000000..411aefb7 --- /dev/null +++ b/tools/osx_wheel_upload.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# Script to download / check and upload scikit_image wheels for release +RACKSPACE_URL=http://a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com +if [ "`which twine`" == "" ]; then + echo "twine not on path; need to pip install twine?" + exit 1 +fi +cd scikit-image +SK_VERSION=`git describe --tags` +if [ "${SK_VERSION:0:1}" != 'v' ]; then + echo "scikit image version $SK_VERSION does not start with 'v'" + exit 1 +fi +WHEEL_HEAD="scikit_image-${SK_VERSION:1}" +WHEEL_TAIL="macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.whl" +mkdir -p wheels +cd wheels +rm -rf *.whl +for py_tag in cp27-none cp33-cp33m cp34-cp34m +do + wheel_name="$WHEEL_HEAD-$py_tag-$WHEEL_TAIL" + wheel_url="${RACKSPACE_URL}/${wheel_name}" + curl -O $wheel_url + if [ "$?" != "0" ]; then + echo "Failed downloading $wheel_url; check travis build?" + exit $? + fi +done +cd .. +twine upload wheels/*.whl From 6926b6f9ec4049323605dd09e153d7db0fd5f3cc Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 2 Jul 2014 01:06:43 +0200 Subject: [PATCH 2/5] Update wheel URL --- tools/osx_wheel_upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/osx_wheel_upload.sh b/tools/osx_wheel_upload.sh index 411aefb7..c557b56e 100755 --- a/tools/osx_wheel_upload.sh +++ b/tools/osx_wheel_upload.sh @@ -1,6 +1,6 @@ #!/bin/bash # Script to download / check and upload scikit_image wheels for release -RACKSPACE_URL=http://a365fff413fe338398b6-1c8a9b3114517dc5fe17b7c3f8c63a43.r19.cf2.rackcdn.com +RACKSPACE_URL=http://wheels.scikit-image.org if [ "`which twine`" == "" ]; then echo "twine not on path; need to pip install twine?" exit 1 From 9002eebfcc7e871b7cd40ce4e796ff20c286d902 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 2 Jul 2014 01:40:31 +0200 Subject: [PATCH 3/5] Get tags from current repo --- tools/osx_wheel_upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/osx_wheel_upload.sh b/tools/osx_wheel_upload.sh index c557b56e..7d757379 100755 --- a/tools/osx_wheel_upload.sh +++ b/tools/osx_wheel_upload.sh @@ -5,7 +5,6 @@ if [ "`which twine`" == "" ]; then echo "twine not on path; need to pip install twine?" exit 1 fi -cd scikit-image SK_VERSION=`git describe --tags` if [ "${SK_VERSION:0:1}" != 'v' ]; then echo "scikit image version $SK_VERSION does not start with 'v'" @@ -20,6 +19,7 @@ for py_tag in cp27-none cp33-cp33m cp34-cp34m do wheel_name="$WHEEL_HEAD-$py_tag-$WHEEL_TAIL" wheel_url="${RACKSPACE_URL}/${wheel_name}" + echo "Fetching $wheel_url" curl -O $wheel_url if [ "$?" != "0" ]; then echo "Failed downloading $wheel_url; check travis build?" From b6c8ee9546b34fff3272d21b10f8985fc01b204e Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 2 Jul 2014 14:32:00 +0200 Subject: [PATCH 4/5] Indicate waiting time before wheels become available --- RELEASE.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 5a7cfd97..63de588f 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -34,9 +34,11 @@ How to make a new release of ``skimage`` python setup.py register python setup.py sdist upload - Go to https://travis-ci.org/scikit-image/scikit-image-wheels, - select the "Current" tab, and click (on the right) on the "Restart Build" - icon. After that finished, execute ``tools/osx_wheel_upload.sh``. + Go to https://travis-ci.org/scikit-image/scikit-image-wheels, select the + "Current" tab, and click (on the right) on the "Restart Build" icon. After + the wheels become available at http://wheels.scikit-image.org/ (approx 15 + mins), execute ``tools/osx_wheel_upload.sh``. Note that, if you rebuild the + same wheels, the Rackspace server may only update in another 15 minutes. - Increase the version number From 0fca535caa5d19871b2ccf0fef2c7a9668278557 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 2 Jul 2014 18:30:18 +0200 Subject: [PATCH 5/5] Remember to update stable docs link. Check timestamp on wheels before posting. --- RELEASE.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE.txt b/RELEASE.txt index 63de588f..836d2222 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -19,6 +19,7 @@ How to make a new release of ``skimage`` place. Double check ``random.js``, otherwise the skimage.org front page gets broken! - Build using ``make gh-pages``. + - Update the symlink to ``stable``. - Push upstream: ``git push origin gh-pages`` in ``doc/gh-pages``. - Add the version number as a tag in git:: @@ -38,7 +39,10 @@ How to make a new release of ``skimage`` "Current" tab, and click (on the right) on the "Restart Build" icon. After the wheels become available at http://wheels.scikit-image.org/ (approx 15 mins), execute ``tools/osx_wheel_upload.sh``. Note that, if you rebuild the - same wheels, the Rackspace server may only update in another 15 minutes. + same wheels, it can take up to 15 minutes for the the files in the http + directory to update to the versions that Travis-CI uploaded. You may want to + check the timestamps in the http directory listing to check that you will get + the latest version. - Increase the version number