Update tagging

TomAugspurger · TomAugspurger · commit d4c66ccd1b10 · 2018-06-12T11:33:00.000-05:00
diff --git a/Makefile b/Makefile
@@ -4,11 +4,10 @@ GH_USERNAME ?= TomAugspurger
 
 
 update-repos:
-	pushd pandas           && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas            && git remote update && popd && \
-	pushd pandas-website   && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas-website    && git remote update && popd && \
-	pushd pandas-website   && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas-website    && git remote update && popd && \
-	pushd pandas-wheels    && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas-wheels     && git remote update && popd && \
-	pushd pandas-feedstock && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas-feedstock  && git remote update && popd
+	pushd pandas           && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas            && git remote update && git checkout master && git reset --hard upstream/master && popd && \
+	pushd pandas-website   && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas-website    && git remote update && git checkout master && git reset --hard upstream/master && popd && \
+	pushd pandas-wheels    && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas-wheels     && git remote update && git checkout master && git reset --hard upstream/master && popd && \
+	pushd pandas-feedstock && git remote set-url origin https://github.com/$(GH_USERNAME)/pandas-feedstock  && git remote update && git checkout master && git reset --hard upstream/master && popd
 
 
 conda-test:
@@ -27,7 +26,7 @@ pip-test:
 
 
 tag:
-	pushd pandas && ../scripts/tag.py $(TAG) && podp
+	pushd pandas && ../scripts/tag.py $(TAG) && popd
 
 
 doc:
diff --git a/pandas b/pandas
@@ -1 +1 @@
-Subproject commit 2eb5a67999552d60f7a2a9e1922549d5417d714f
+Subproject commit 2a18a97b3078fa65b5be67434d1fb182066844c3
diff --git a/pandas-feedstock b/pandas-feedstock
@@ -1 +1 @@
-Subproject commit 2ff98bc6a62e9aa2cb51be7ea477b3a4e5653589
+Subproject commit aa7372fdfe115c644f0552cb4d51dcae04e8a1d8
diff --git a/scripts/tag.py b/scripts/tag.py
@@ -17,6 +17,17 @@ def check_tag(tag):
     return tag
 
 
+def checkout(tag):
+    if tag[-1] == '0':
+        # off master
+        base = 'master'
+    else:
+        base = '.'.join([tag[1:].rsplit('.', 1)[0], 'x'])
+
+    subprocess.check_call(['git', 'checkout', base])
+    subprocess.check_call(['git', 'pull', '--ff-only', 'upstream', base])
+
+
 def commit(tag):
     subprocess.check_call(['git', 'clean', '-xdf'])
     print("Creating tag {}".format(tag))
@@ -35,6 +46,7 @@ def parse_args(args=None):
 
 def main(args=None):
     args = parse_args(args)
+    checkout(args.tag)
     commit(args.tag)
 
 
