Merge ~bryce/ubuntu/+source/python-seamicroclient:python-seamicroclient-merge-v0.4.0-3-eoan into ubuntu/+source/python-seamicroclient:debian/sid

[Bryce Harrington]

[Bryce Harrington (bryce)]

Past Ubuntu delta had added support for python3 to python2, but in the interim upstream has moved to python3. Debian opted to drop python2 support. I'm not sure if we want to keep python2 (i.e. if OpenStack still needs it?) but am assuming we don't. The Ubuntu python3 support had included version requirements on the python3 libs, which Debian is not specifying.

PPA with test packages:
  $ sudo add-apt-repository -yus ppa:bryce/python-seamicroclient-merge-v0.4.0-3

There are not autopkgtest cases for python-seamicroclient, and felt out of scope to add them, but I did check install/remove/purge in an lxc container.

Usual tags pushed for review

[Andreas Hasenack (ahasenack)]

I'm looking at the split tag, and I think you squashed two commits together that should be apart.

Specifically, this d/changelog entry:
        - debian/control: Depends on python3-mock and python3-requests.

is part of this commit:
commit 03f8b87d16ed315495fa84139c0ed49142208050 (HEAD, tag: bryce/split/0.4.0-1ubuntu1)
Author: Bryce Harrington <email address hidden>
Date: Thu Aug 1 14:44:58 2019 -0700

        - Add python3 support

Unless this is needed for python3 support, i.e., not just some extra build-deps that was missing also in py2. Then it's fine.

review: Needs Information

[Bryce Harrington (bryce)]

I'm not sure why they called that out specifically in that changelog entry. Both python-mock and python-requests were already present in the 0.4.0-1 control file in Debian, for python2. I am not seeing any special reason why they would be mentioned, except perhaps in relation to the ubuntu-side python3 support; since that's being dropped with this merge I don't think the details of that work need carried forward.

Notice also that this changelog entry was indented under debian/patches, which is odd. Since there doesn't seem to be a distinct change associated with it, I am assuming it's misplaced, and was intended to go with the python3 support section.

[Andreas Hasenack (ahasenack)]

Ok, this is dropping the py2 version of the package: python-seamicroclient

reverse-depends seems fine (i.e., it's empty), and that package is in universe:
No reverse dependencies found
ubuntu@eoan:~$ reverse-depends python3-seamicroclient
Reverse-Depends
===============
* python3-maas-provisioningserver

Packages without architectures listed are reverse-dependencies in: amd64, arm64, armhf, i386, ppc64el, s390x

Do you think the version in our PKG-INFO patch should be changed? It still says 0.4.0, but now this is a git snapshot.

[Andreas Hasenack (ahasenack)]

I just tried a build without that patch and it worked. I couldn't find a good reference in d/changelog as to what the ftbfs was, maybe Andres still remembers? He is roaksoax on irc.

[Bryce Harrington (bryce)]

Yes, the dropping of the py2 version of the package is the noteworthy change for this upload. From what I could tell, OpenStack has been the major reason for retaining it previously.

I'm not sure which ftbfs you're referring to?

Regarding updating the PKG-INFO, yes I can update the version in that.

[Bryce Harrington (bryce)]

Oh, you must have meant add-pkg-info.patch

    - add-pkg-info.patch: Add PKG-INFO in top level dir so it doesn't FTBFS.

Yes, in the 0.4.0 package in eoan with quilt pop -a, I reproduce a build error running

    python setup.py build

    (...)
    File "/usr/lib/python2.7/dist-packages/pbr/packaging.py", line 755, in get_version
    name=package_name))
    Exception: Versioning for this project requires either an sdist tarball, or access to an upstream git repository. It's also possible that there is a mismatch between the package name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name python-seamicroclient was given, but was not able to be found.

With quilt push -a, no error.

However, with 0.4.0+2016.05.20.git.40ee44c664, I confirm your findings that it neither fails with or without the patches applied.

The reason for this is the new upstream version generates its own PKG-INFO file, which is essentially identical to the one we're patching in except it has a generic version number:

    Version: 0.0.1.dev10

With our patch in place, this file gets generated with the intended version. So while add-pkg-info.patch is no longer required for fixing a FTBS it's still necessary to get the right version into the egg packaging.

[Bryce Harrington (bryce)]

Updated the patch with the corrected version, updated changelog, and added some DEP3 while I was at it. Hopefully the new merge diff shows here, if not the branch is at:

https://code.launchpad.net/~bryce/ubuntu/+source/python-seamicroclient/+git/python-seamicroclient/+ref/python-seamicroclient-merge-v0.4.0-3-eoan

[Andreas Hasenack (ahasenack)]

Thanks!

I suggest to squash together these two commits:

commit f42c873f5b3bba01382e0972e6b9893177cfa8c3
Author: Bryce Harrington <email address hidden>
Date: Mon Aug 5 19:18:02 2019 -0700

      * d/p/add-pkg-info.patch: Update Version for PKG-INFO and add DEP3

commit 29516cda51d422cac8df3894c22eb59e1be43661
Author: Bryce Harrington <email address hidden>
Date: Thu Aug 1 14:41:33 2019 -0700

        - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version

And just add a note saying you updated DEP3 and the version. Perhaps like this:
- d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
  [Updated version and DEP3 header]

The same would then appear in the changelog like this:
  * Merge with Debian unstable. Remaining changes:
    - d/control: Drop Build-Depends on python-hacking since we don't use pep8 testing.
    - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
      [Updated version and DEP3 header]

If you prefer it like it is, then this squashing can happen in the next merge, when creating the logical tag. It just looks a bit odd to have the same patch mentioned twice.

81a8329... by Bryce Harrington on 2019-08-06

merge-changelogs

22a9e0b... by Bryce Harrington on 2019-08-06

reconstruct-changelog

c06dd5b... by Bryce Harrington on 2019-08-06

update-maintainer

[Bryce Harrington (bryce)]

Alright, updated with those changes. I had actually assumed you'd prefer a separate commit for the updates, but this is fine. New branch force pushed.

[Andreas Hasenack (ahasenack)]

Nice, thanks!

+1

review: Approve

[Bryce Harrington (bryce)]

Thanks for the review, uploading to proposed:

$ gpg --verify ../python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1_source.changes
gpg: Signature made Tue 06 Aug 2019 05:31:29 PM PDT
gpg: using RSA key A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB
gpg: Good signature from "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]
gpg: aka "Bryce Harrington <email address hidden>" [ultimate]

$ git push pkg upload/0.4.0+2016.05.20.git.40ee44c664-2ubuntu1
Counting objects: 23, done.
Delta compression using up to 6 threads.
Compressing objects: 100% (23/23), done.
Writing objects: 100% (23/23), 4.38 KiB | 2.19 MiB/s, done.
Total 23 (delta 14), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/python-seamicroclient
 * [new tag] upload/0.4.0+2016.05.20.git.40ee44c664-2ubuntu1 -> upload/0.4.0+2016.05.20.git.40ee44c664-2ubuntu1

$ dput ubuntu ../python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1.dsc: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664.orig.tar.xz: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1.debian.tar.xz: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1_source.buildinfo: done.
  Uploading python-seamicroclient_0.4.0+2016.05.20.git.40ee44c664-2ubuntu1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

This appears to have migrated now

diff --git a/debian/changelog b/debian/changelog
index e7aacf6..db9abfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-2ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/control: Drop Build-Depends on python-hacking since we don't use pep8 testing.
+    - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
+      [Updated version and DEP3 header]
+
+ -- Bryce Harrington <[e-mail]>  Tue, 06 Aug 2019 16:49:39 -0700
+
 python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-2) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -37,6 +46,22 @@ python-seamicroclient (0.4.0+2016.05.20.git.40ee44c664-1) experimental; urgency=
 
  -- Thomas Goirand <[e-mail]>  Tue, 26 Mar 2019 11:05:49 +0100
 
+python-seamicroclient (0.4.0-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add python3 support:
+      + debian/rules: Build/test with python3
+      + debian/patches/python3-support.patch.
+      + debian/control: Add build-deps/package for python3.
+    - Drop Build-Depends on python-hacking since we don't use pep8 testing.
+  * debian/patches:
+    - fix-tests.patch: Drop. No longer needed.
+    - skip-tests.patch: Drop. No longer needed.
+    - add-pkg-info.patch: Add PKG-INFO in top level dir so it doesn't FTBFS.
+    - debian/control: Depends on python3-mock and python3-requests.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 03 Feb 2016 12:49:38 +0100
+
 python-seamicroclient (0.4.0-1) experimental; urgency=medium
 
   * New upstream release.
@@ -45,6 +70,42 @@ python-seamicroclient (0.4.0-1) experimental; urgency=medium
 
  -- Thomas Goirand <[e-mail]>  Tue, 08 Sep 2015 00:08:05 +0200
 
+python-seamicroclient (0.2.1-0ubuntu2) xenial; urgency=medium
+
+  * Add python3 support.
+  * debian/patches/python3-support.patch
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 17 Nov 2015 09:15:22 -0500
+
+python-seamicroclient (0.2.1-0ubuntu1) trusty-proposed; urgency=medium
+
+  * New upstream bugfix release.
+    - This release only fixes connection issues when trying to power on/off
+      multiple nodes at the same time. (LP: #1311140)
+  * debian/patches/fix-tests.patch: Fix tests.
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 22 Apr 2014 12:18:19 -0400
+
+python-seamicroclient (0.2.0-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release (LP: #1305220)
+    - Remove use of auth_token for REST API. Fixes concurrent access by
+      using user/password each time instead of auth_token (LP: #1302828)
+  * debian/watch: Updated to include correct URL link.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 09 Apr 2014 13:37:27 -0400
+
+python-seamicroclient (0.1.0-2ubuntu1) trusty; urgency=medium
+
+  * debian/control:
+    - Drop Build-Depends on python-hacking since we don't use pep8 testing.
+    - Add Build-Depends on python-requests.
+  * debian/rules: Run tests with testr instead.
+  * debian/patches/skip-tests.patch: Skip various tests as they require to
+    have actual hardware to test against.
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 28 Mar 2014 12:17:18 -0400
+
 python-seamicroclient (0.1.0-2) unstable; urgency=medium
 
   * Added missing build-depends: openstack-pkg-tools (Closes: #741539).
diff --git a/debian/control b/debian/control
index 3ca59fa..18729ec 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-seamicroclient
 Section: python
 Priority: optional
-Maintainer: Debian OpenStack <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OpenStack <[e-mail]>
 Uploaders:
  Thomas Goirand <[e-mail]>,
 Build-Depends:
@@ -16,7 +17,6 @@ Build-Depends-Indep:
  python3-babel,
  python3-coverage,
  python3-fixtures,
- python3-hacking,
  python3-iso8601,
  python3-keyring,
  python3-mock,
diff --git a/debian/patches/add-pkg-info.patch b/debian/patches/add-pkg-info.patch
new file mode 100644
index 0000000..b8b97cf
--- /dev/null
+++ b/debian/patches/add-pkg-info.patch
@@ -0,0 +1,31 @@
+Description: Adds PKG-INFO for the package
+ Without this, the egg is incorrectly set to version 0.0.1.dev10.
+ For version <= 0.4.0, also fixed FTBS with python setup.py build.
+Author: Andres Rodriguez <[e-mail]>
+Origin: vendor
+Reviewed-By: Bryce Harrington <[e-mail]>
+Last-Updated: 2019-08-05
+
+--- /dev/null
++++ python-seamicroclient-0.4.0/PKG-INFO
+@@ -0,0 +1,20 @@
++Metadata-Version: 1.1
++Name: python-seamicroclient
++Version: 0.4.0+2016.05.20.git.40ee44c664
++Summary: Client library for Seamicro chassis API
++Home-page: https://github.com/seamicro/python-seamicroclient
++Author: AMD
++Author-email: [e-mail]
++License: Apache License, Version 2.0
++Description: Python client for consuming SeaMicro REST API v2.0
++        
++        
++Platform: UNKNOWN
++Classifier: Development Status :: 4 - Beta
++Classifier: Environment :: Console
++Classifier: Environment :: Web Environment
++Classifier: Intended Audience :: Developers
++Classifier: Intended Audience :: Information Technology
++Classifier: License :: OSI Approved :: Apache Software License
++Classifier: Operating System :: OS Independent
++Classifier: Programming Language :: Python
diff --git a/debian/patches/series b/debian/patches/series
index 2438367..ca7c4bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-requirements.txt.patch
 removed-failing-tests.patch
+add-pkg-info.patch