tag.py broken for releases .0 releases after an rc

[TomAugspurger]

We would tag of master rather than 1.0.x for example.

[TomAugspurger]

Hack for this release

diff --git a/scripts/tag.py b/scripts/tag.py
index 4820436..3dc4611 100755
--- a/scripts/tag.py
+++ b/scripts/tag.py
@@ -28,6 +28,7 @@ def checkout(tag):
     else:
         base = '.'.join([tag[1:].rsplit('.', 1)[0], 'x'])
 
+    base = '1.0.x'
     subprocess.check_call(['git', 'checkout', base])
     subprocess.check_call(['git', 'pull', '--ff-only', 'upstream', base])
 

[TomAugspurger]

Same for push-tag.py

diff --git a/scripts/push-tag.py b/scripts/push-tag.py
index 89c75b0..bbcdc32 100755
--- a/scripts/push-tag.py
+++ b/scripts/push-tag.py
@@ -31,6 +31,7 @@ def get_branch(tag):
         base = 'master'
     else:
         base = '.'.join([tag[1:].rsplit('.', 1)[0], 'x'])
+    base = '1.0.x'
 
     return base
 
diff --git a/scripts/tag.py b/scripts/tag.py
index 4820436..3dc4611 100755
--- a/scripts/tag.py
+++ b/scripts/tag.py
@@ -28,6 +28,7 @@ def checkout(tag):
     else:
         base = '.'.join([tag[1:].rsplit('.', 1)[0], 'x'])
 
+    base = '1.0.x'
     subprocess.check_call(['git', 'checkout', base])
     subprocess.check_call(['git', 'pull', '--ff-only', 'upstream', base])
 

[jorisvandenbossche]

That reminded me, we also should "start" the 1.1 dev cycle on master

[TomAugspurger]

Mmm I thought we didn't need to. I thought master already had changes for 1.1.

Actually, shouldn't we have already tagged 1.1.dev0, immediately after 1.0.0rc0?

[jorisvandenbossche]

Actually, shouldn't we have already tagged 1.1.dev0, immediately after 1.0.0rc0?

Yes, that's what I meant

[TomAugspurger]

The 1.1.0.dev0 tag has been pushed.