From 8510111de85e871c3754e06b653b1c18500cb185 Mon Sep 17 00:00:00 2001 From: Matthew Brett Date: Thu, 3 Jul 2014 15:39:39 +0100 Subject: [PATCH] NF: make git tag fetching more robust --- .travis.yml | 5 +++-- Pillow | 2 +- terryfy | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4456e14ea..8b92bbbf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: global: LATEST_TAG=1 matrix: - VERSION=2.7.7 + - VERSION=3.2.5 - VERSION=3.3.5 - VERSION=3.4.1 @@ -14,9 +15,9 @@ install: - pip install delocate - cd Pillow - if [ -n "$LATEST_TAG" ]; then - git fetch + git fetch ; git fetch --tags ; - git checkout `git describe --abbrev=0 --tags origin/master` ; + git checkout `../terryfy/git-latest-tag` ; fi - python setup.py bdist_wheel - delocate-wheel dist/*.whl diff --git a/Pillow b/Pillow index a45c8aaf6..80d6137c8 160000 --- a/Pillow +++ b/Pillow @@ -1 +1 @@ -Subproject commit a45c8aaf61029bad7fb1e49edc1e8ed811979c94 +Subproject commit 80d6137c860b9322572ee1390514df1975acb2e7 diff --git a/terryfy b/terryfy index 012b66351..42f19f7a4 160000 --- a/terryfy +++ b/terryfy @@ -1 +1 @@ -Subproject commit 012b6635139dd3f52cd17c5c51c17c39aa7f52b1 +Subproject commit 42f19f7a4ea2bdd5b66282e8641d1a7a65615eda