~paelzer/cloud-init:fix-check-version-hickups

Last commit made on 2016-08-10
Get this branch:
git clone -b fix-check-version-hickups https://git.launchpad.net/~paelzer/cloud-init
Only Christian Ehrhardt  can upload to this branch. If you are Christian Ehrhardt  please log in for upload directions.

Branch merges

Branch information

Name:
fix-check-version-hickups
Repository:
lp:~paelzer/cloud-init

Recent commits

facd053... by Christian Ehrhardt 

build: fix check_version blocking developers

check_version is meant to block a release without updating the official
version. But as-is this fails as soon as one commits something.

To solve that move check_version to a check_release target and call that
from debian/rules. It will still be part of all, but not of a usual
"make check".

Signed-off-by: Christian Ehrhardt <email address hidden>

3aa094b... by Scott Moser

release 0.7.7

Bump the version in cloudinit/version.py to be 0.7.7.

3973223... by Scott Moser

make-tarball: older versions of git with --format=tar.

Some older versions of git (Centos 6) do not have --format=tar.gz.
To work around this, create a .tar file and then compress it.

5374773... by Scott Moser

read-version: do not attempt git-describe if no git.

Even if there is a .git directory, we can't use git if there
is no git executable in the path. In that case just fall back
to the cloud-init version.

b56d7a1... by Joshua Harlow

Newer requests have strong type validation

Only use strings in headers, as newer requests
actually do stricter validation of this, so ensure
that we comply by only having string objects in
header dicts.

48ec60a... by Scott Moser

For upstream snapshot versions do not modify git-describe output.

For upstream version directly use the output of git-describe
(X.Y.Z-number.gHASH) rather than rather than changing it to
(X.Y.Z+number.gHASH).

The rpm version does not allow '-' in Version, so we create and use
rpm_upstream_version in the rpm spec file. That is of format:
X.Y.Z+number.gHASH

d0b2863... by Scott Moser

adjust signal_handler for version changes.

signal_handler was still using vr.version().

78ec0f0... by Scott Moser

revert unintended change to ubuntu sources list

templates/sources.list.ubuntu.tmpl was inadvertantely
changed in a previous commit. Simply revert to older version.

42bed11... by Scott Moser

drop modification of version during make-tarball, tools changes.

Modification of the tarball became problematic, as it meant that
any tool extracting source would find the orig source tarball different.
I found this unusable when trying to use 'gbp buildpackage'.

Other changes here are to better support using python3 or python2
for the build. Makefile will try to call the right python version
and can be told which python to use.

read-version: by adding 'tiny_p' and avoiding the import of
cloudinit.util, we need less dependencies to run this.

10f82bd... by Scott Moser

adjust tools and version information.

upstream snapshots are versioned in the format 'X.Y.Z+<distance>.g<commit>'
where X.Y.Z are major, minor, and micro. Distance is number of commits
since last annotated tag, and commit is the git commit.

bddeb and brpm will now create and use the "upstream version" like above.

Things changed here:
 - tools/make-tarball
   update cloudinit/version.py to contain the full version
   support --output
   support '--long' to always create the long format version string.

 - bddeb:
   - use quilt debian source format
   - use read-version and long version in changelog.

 - brpm:
   - change to use read-version and upstream long version in the spec.
   - flake8 changes

 - tools/read-version
   - read version from git or from cloudinit/version.
   - provide --json output with more nicely formed data.