Merge lp:~dobey/cupstream2distro/native-versions into lp:cupstream2distro

[dobey]

Support native package versions when creating a new packaging version.

[lp:~dobey/cupstream2distro/native-versions]

437. By dobey on 2014-01-07

It's actually 2014 now.

438. By dobey on 2014-01-08

Add more tests.

[Didier Roche-Tolomelli (didrocks)]

That looks good. Thanks a lot for the patch!

Just two small things (which are related):

as you can see in test_create_new_packaging_version_from_native(), we enable transforming a native version in a split mode. This is when upstream are bumping the changelog themselves without really knowing what they do, so we enable that use case.

The test is still passing because you added the "+" check in :
+ elif not "-" in base_package_version and "+" in base_package_version:

However, I think that's a use case to support as well for native packages (and not forcing adding a + for the bootstrapping).

What do you think detecting native reading debian/source/format as well? That way, you can remove the check "+" in base_package_version.

And so adding a test for the additional case:
test_create_new_packaging_version_from_native should still work:
42 to 42+13.10.19830913-0ubuntu1 for split mode

and a new one from:
42 to 42+13.10.19830913 for native mode

What do you think?

review: Needs Information

[dobey (dobey)]

I think it makes sense, but I think it would create excessive complexity to do it in this function, and would make the tests too complex. Supporting that would require a fair bit of refactoring, I think, and I'm not sure it should be done here.

This works, and the previous test work, because native versions without a '+' were already being handled specially, and I followed that concept by treating native versions with a '+' differently, here.

Given that the documentation for migration to daily-release includes adding a changelog entry with a datestamp version that includes the '+' and series/date after it, I think the behavior in this branch is safe, as it will not create any regressions in the existing behavior, while supporting the native daily release behavior for projects that want it.

[Didier Roche-Tolomelli (didrocks)]

Based on discussion on IRC +1

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Seems that the CI team removed the cred for us to deploy the code. I'm asking them to deploy it now.

=== modified file 'cupstream2distro/packagemanager.py'
--- cupstream2distro/packagemanager.py	2014-01-08 10:54:09 +0000
+++ cupstream2distro/packagemanager.py	2014-01-08 15:56:15 +0000
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012 Canonical
+# Copyright (C) 2012-2014 Canonical
 #
 # Authors:
 #  Didier Roche
+#  Rodney Dawes
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -295,8 +296,11 @@
     if we already have something delivered today, it will be .minor, then, .minor+1…
 
     We append the destination ppa name if we target a dest ppa and not distro'''
+    # to keep track of whether the package is native or not
+    native_pkg = False
 
     today_version = datetime.date.today().strftime('%Y%m%d')
+    destppa = destppa.replace("-", '.').replace("_", ".").replace("/", ".")
     # bootstrapping mode or direct upload or UNRELEASED for bumping to a new series
     # TRANSITION
     if not ("daily" in base_package_version or "+" in base_package_version):
@@ -305,6 +309,23 @@
         # if we have 42ubuntu1 like a wrong native version
         if "ubuntu" in upstream_version:
             upstream_version = upstream_version.split('ubuntu')[0]
+    elif not "-" in base_package_version and "+" in base_package_version:
+        # extract the day of previous daily upload and bump if already uploaded
+        regexp = re.compile("(.*)\+([\d\.]{5})\.(\d{8})\.?([\d]*).*")
+        try:
+            previous_day = regexp.findall(base_package_version)[0]
+            upstream_version = previous_day[0]
+            native_pkg = True
+            if (previous_day[1] == series_version and
+                previous_day[2] == today_version):
+                minor = 1
+                if previous_day[3]:  # second upload of the day
+                    minor = int(previous_day[3]) + 1
+                today_version = "{}.{}".format(today_version, minor)
+        except IndexError:
+            raise Exception(
+                "Unable to get previous day from native version: %s"
+                % base_package_version)
     else:
         # extract the day of previous daily upload and bump if already uploaded today
         regexp = re.compile("(.*)\+([\d\.]{5})\.(\d{8})\.?([\d]*).*-.*")
@@ -326,10 +347,13 @@
                 minor = int(previous_day[3]) + 1
             today_version = "{}.{}".format(today_version, minor)
 
-    destppa = destppa.replace("-", '.').replace("_", ".").replace("/", ".")
-    new_upstream_version = "{upstream}+{series}.{date}{destppa}".format(upstream=upstream_version, series=series_version,
-                                                                        date=today_version, destppa=destppa)
-    return "{}-0ubuntu1".format(new_upstream_version)
+    new_upstream_version = "{upstream}+{series}.{date}{destppa}".format(
+        upstream=upstream_version, series=series_version,
+        date=today_version, destppa=destppa)
+    if native_pkg is not True:
+        new_upstream_version = "{}-0ubuntu1".format(new_upstream_version)
+
+    return new_upstream_version
 
 
 def get_packaging_sourcename():

=== modified file 'tests/unit/test_packagemanager.py'
--- tests/unit/test_packagemanager.py	2013-11-05 14:52:56 +0000
+++ tests/unit/test_packagemanager.py	2014-01-08 15:56:15 +0000
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Copyright: (C) 2013 Canonical
+# Copyright: (C) 2013-2014 Canonical
 #
 # Authors:
 #  Didier Roche
+#  Rodney Dawes
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -494,6 +495,58 @@
         strftime_call.assert_called_with('%Y%m%d')
 
     @patch('cupstream2distro.packagemanager.datetime')
+    def test_create_new_packaging_version_native(self, datetimeMock):
+        """Verify that native package versions are supported."""
+        strftime_call = datetimeMock.date.today.return_value.strftime
+        strftime_call.side_effect = lambda date: '19830913'
+        self.assertEqual(packagemanager.create_new_packaging_version(
+            '13.10+13.10.19830912', '13.10'),
+                         '13.10+13.10.19830913')
+        strftime_call.assert_called_with('%Y%m%d')
+
+    @patch('cupstream2distro.packagemanager.datetime')
+    def test_create_new_packaging_version_native_epoch(self, datetimeMock):
+        """Verify that native package versions with epoch are supported."""
+        strftime_call = datetimeMock.date.today.return_value.strftime
+        strftime_call.side_effect = lambda date: '19830913'
+        self.assertEqual(packagemanager.create_new_packaging_version(
+            '1:13.10+13.10.19830912', '13.10'),
+                         '1:13.10+13.10.19830913')
+        strftime_call.assert_called_with('%Y%m%d')
+
+    @patch('cupstream2distro.packagemanager.datetime')
+    def test_create_new_packaging_version_native_first_rerelease_sameday(
+            self, datetimeMock):
+        """Verify that native versions re-release on same day is supported."""
+        strftime_call = datetimeMock.date.today.return_value.strftime
+        strftime_call.side_effect = lambda date: '19830913'
+        self.assertEqual(packagemanager.create_new_packaging_version(
+            '13.10+13.10.19830913', '13.10'),
+                         '13.10+13.10.19830913.1')
+        strftime_call.assert_called_with('%Y%m%d')
+
+    @patch('cupstream2distro.packagemanager.datetime')
+    def test_create_new_packaging_version_native_continous_rerelease_sameday(
+            self, datetimeMock):
+        """Verify that native versions continuoed re-release is supported."""
+        strftime_call = datetimeMock.date.today.return_value.strftime
+        strftime_call.side_effect = lambda date: '19830913'
+        self.assertEqual(packagemanager.create_new_packaging_version(
+            '13.10+13.10.19830913.2', '13.10'),
+                         '13.10+13.10.19830913.3')
+        strftime_call.assert_called_with('%Y%m%d')
+
+    @patch('cupstream2distro.packagemanager.datetime')
+    def test_create_new_packaging_version_native_ppa_dest(self, datetimeMock):
+        """Verify that native versions with a ppa dest are supported."""
+        strftime_call = datetimeMock.date.today.return_value.strftime
+        strftime_call.side_effect = lambda date: '19830913'
+        self.assertEqual(packagemanager.create_new_packaging_version(
+            '13.10+13.10.19830912', '13.10', 'didrocks/my-ppa_mine'),
+                         '13.10+13.10.19830913didrocks.my.ppa.mine')
+        strftime_call.assert_called_with('%Y%m%d')
+
+    @patch('cupstream2distro.packagemanager.datetime')
     def test_create_new_packaging_version_from_native(self, datetimeMock):
         '''We create a new packaging version after a native released version'''
         strftime_call = datetimeMock.date.today.return_value.strftime