Merge lp:~sinzui/juju-release-tools/publish-beta12 into lp:juju-release-tools

[Curtis Hovey]

We need to publish beta12 which has daily versions.

1. Update the rules to parse the version to strip the '~' portion or the -ubuntu portion
2. Stop creating source packages for wily. We accidentally did this for 1.25.6.
   We are not certain we can release without deleting manual intervention
3. I had a dirty branch with template changes per issue I saw with gz's annoucement.
   I the changes are included here, though I don't consider them final.

[lp:~sinzui/juju-release-tools/publish-beta12]

323. By Curtis Hovey on 2016-07-15

Use a single re.

=== modified file 'build_package.py'
--- build_package.py	2016-05-20 14:42:31 +0000
+++ build_package.py	2016-07-15 22:07:12 +0000
@@ -30,7 +30,7 @@
 14.04 trusty LTS
 14.10 utopic HISTORIC
 15.04 vivid HISTORIC
-15.10 wily SUPPORTED
+15.10 wily HITORIC
 16.04 xenial LTS
 16.10 yakkety DEVEL
 """

=== modified file 'generate_agents.py'
--- generate_agents.py	2016-06-17 21:06:59 +0000
+++ generate_agents.py	2016-07-15 22:07:12 +0000
@@ -119,7 +119,7 @@
                                            'control'])
     control = deb822.Deb822(control_str)
     control_version = control['Version']
-    base_version = re.sub('-0ubuntu.*$', '', control_version)
+    base_version = re.sub('(~|-0ubuntu).*$', '', control_version)
     major_minor = '.'.join(base_version.split('-')[0].split('.')[0:2])
     series = juju_series.get_name_from_package_version(control_version)
     architecture = control['Architecture']

=== modified file 'make_release_notes.py'
--- make_release_notes.py	2016-07-15 13:50:50 +0000
+++ make_release_notes.py	2016-07-15 22:07:12 +0000
@@ -18,29 +18,33 @@
 PROPOSED = 'proposed'
 
 DEVEL_TEMPLATE = """\
-A new development release of Juju, {version} is here!
+A new development release of Juju, {version}, is here!
+
 
 ## What's new?
 
 {notable}
 
+
 ## How do I get it?
 
 If you are running ubuntu, you can get it from the juju devel ppa:
 
-sudo apt-add-repository ppa/devel
-sudo apt update; sudo apt install juju-2.0
+    sudo apt-add-repository ppa/devel
+    sudo apt update; sudo apt install juju-2.0
 
 Windows, Centos, and OS X users can get a corresponding installer at:
 
     https://launchpad.net/juju-core/+milestone/{version}
 
+
 ## Feedback Appreciated!
 
 We encourage everyone to subscribe the mailing list at
 [e-mail] and join us on #juju on freenode. We would love to hear
 your feedback and usage of juju.
 
+
 ## Anything else?
 
 You can read more information about what's in this release by viewing the
@@ -51,20 +55,22 @@
 """
 
 PROPOSED_TEMPLATE = """\
-# Juju {version}
-
-A new proposed stable release of Juju, juju {version}, is now available.
+A new proposed stable release of Juju, {version}, is here!
 This release may replace version {previous} on {release_date}.
 
 
-## Getting Juju
-
-juju {version} is available for Yakkety and backported to earlier
-series in the following PPA:
+## What's new?
+
+{notable}
+
+
+## How do I get it?
+
+If you are running ubuntu, you can get it from the juju proposed ppa:
 
     https://launchpad.net/~juju/+archive/proposed
 
-Windows, Centos, and OS X users will find installers at:
+Windows, Centos, and OS X users can get a corresponding installer at:
 
     https://launchpad.net/juju-core/+milestone/{version}
 
@@ -73,20 +79,17 @@
 juju agents.
 
 
-## Notable Changes
+## Feedback Appreciated!
 
-{notable}
+We encourage everyone to subscribe the mailing list at
[e-mail] and join us on #juju on freenode. We would love to hear
+your feedback and usage of juju.
 
 
 ## Resolved issues
 
 {resolved_text}
 
-
-Finally
-
-We encourage everyone to subscribe the mailing list at
[e-mail], or join us on #juju on freenode.
 """
 
 

=== modified file 'tests/test_build_package.py'
--- tests/test_build_package.py	2016-05-20 14:42:31 +0000
+++ tests/test_build_package.py	2016-07-15 22:07:12 +0000
@@ -63,7 +63,7 @@
     def test_get_living_names(self):
         juju_series = _JujuSeries()
         self.assertEqual(
-            ['precise', 'trusty', 'wily', 'xenial', 'yakkety'],
+            ['precise', 'trusty', 'xenial', 'yakkety'],
             juju_series.get_living_names())
 
     def test_get_name(self):

=== modified file 'tests/test_make_release_notes.py'
--- tests/test_make_release_notes.py	2016-06-03 23:12:06 +0000
+++ tests/test_make_release_notes.py	2016-07-15 22:07:12 +0000
@@ -71,29 +71,20 @@
         # Proposed purpose points to the proposed PPA without a warning.
         text = make_notes('1.20.0', PROPOSED, "  * One\n    Lp 1")
         self.assertIn(
-            'A new proposed stable release of Juju, juju 1.20.0, '
-            'is now available.',
-            text)
-        self.assertIn(
-            'https://launchpad.net/~juju/+archive/proposed',
-            text)
-        self.assertIn(
-            '  * One\n    Lp 1',
-            text)
+            'A new proposed stable release of Juju, 1.20.0, is here!', text)
+        self.assertIn(
+            'https://launchpad.net/~juju/+archive/proposed', text)
+        self.assertIn('  * One\n    Lp 1', text)
 
     def test_make_notes_with_devel_purpose(self):
         # Devel purpose points to the devel PPA and a warning is included.
         text = make_notes('1.21-alpha1', DEVEL, "  * One\n    Lp 1")
         self.assertIn(
-            'A new development release of Juju, juju 1.21-alpha1,'
-            ' is now available.',
-            text)
-        self.assertIn(
-            'https://launchpad.net/~juju/+archive/devel',
-            text)
-        self.assertIn(
-            '  * One\n    Lp 1',
-            text)
+            'A new development release of Juju, 1.21-alpha1, is here!',
+            text)
+        self.assertIn('sudo apt-add-repository ppa/devel', text)
+        self.assertIn(
+            'https://jujucharms.com/docs/devel/temp-release-notes', text)
 
     def test_make_notes_with_notable(self):
         # The default value of None implies a stable bug fix release.