os-apply-config

Bug #1403510
Comment #21

Comment 21 for bug 1403510

Revision history for this message

OpenStack Infra (hudson-openstack) wrote on 2014-12-23: Fix merged to pbr (master)

#21

Reviewed: https://review.openstack.org/142931
Committed: https://git.openstack.org/cgit/openstack-dev/pbr/commit/?id=c01b8dae1e5ad91d30756140d9b591818444db2d
Submitter: Jenkins
Branch: master

commit c01b8dae1e5ad91d30756140d9b591818444db2d
Author: Monty Taylor <email address hidden>
Date: Thu Dec 18 15:09:33 2014 -0800

Port in git sha changes from 0.10 line

Stop including git sha in version strings

We include it in pbr.json now. Including it is contentious in the world
of python, and it's up for debate as to whether or not it provides value.

Write and read more complex git sha info

    Instead of encoding the git sha into the version string, add it to
    a metadata file. This will allow us to get out of the business of
    arguing with pip and setuptools about version info. In order to make
    this really nice, provide a command line utility called "pbr" that has
    subcommands to print out the metadata that we're now including in the
    egg-info dir.

Only import sphinx during hook processing

    When pbr is imported to handle writing the egg_info file because of
    the entry point, it's causing sphinx to get imported. This has a
    cascading effect once docutils is trying to be installed on a system
    with pbr installed. If some of the imports fail along the way, allow
    pbr to continue usefully but without the Sphinx extensions
    available. Eventually, when everything is installed, those
    extensions will work again when the commands for build_sphinx, etc.
    are run separately.

    Also slip in a change to reorder the default list of environments
    run by tox so the testr database is created using a dbm format
    available to all python versions.

Integration test PBR commits

Make sure that if a PBR commit is being tested then we install and
use that source rather than the latest PBR release.

    Change-Id: Ie121e795be2eef30822daaa5fe8ab1c2315577ae
    (cherry picked from commit 65f4fafd907a16ea1952ab7072676db2e9e0c51d)
    (cherry picked from commit cd7da23937b66fea3ec42fa2f5a128f363a97e7e)
    Closes-Bug: #1403510
    Co-Authored-By: Clark Boylan <email address hidden>
    Co-Authored-By: Doug Hellmann <email address hidden>
    Co-Authored-By: Jeremy Stanley <email address hidden>

Reviewed:  https://review.openstack.org/142931
Committed: https://git.openstack.org/cgit/openstack-dev/pbr/commit/?id=c01b8dae1e5ad91d30756140d9b591818444db2d
Submitter: Jenkins
Branch:    master

commit c01b8dae1e5ad91d30756140d9b591818444db2d
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Dec 18 15:09:33 2014 -0800

Port in git sha changes from 0.10 line
    
    Stop including git sha in version strings
    
    We include it in pbr.json now. Including it is contentious in the world
    of python, and it's up for debate as to whether or not it provides value.
    
    Write and read more complex git sha info
    
    Instead of encoding the git sha into the version string, add it to
    a metadata file. This will allow us to get out of the business of
    arguing with pip and setuptools about version info. In order to make
    this really nice, provide a command line utility called "pbr" that has
    subcommands to print out the metadata that we're now including in the
    egg-info dir.
    
    Only import sphinx during hook processing
    
    When pbr is imported to handle writing the egg_info file because of
    the entry point, it's causing sphinx to get imported. This has a
    cascading effect once docutils is trying to be installed on a system
    with pbr installed. If some of the imports fail along the way, allow
    pbr to continue usefully but without the Sphinx extensions
    available. Eventually, when everything is installed, those
    extensions will work again when the commands for build_sphinx, etc.
    are run separately.
    
    Also slip in a change to reorder the default list of environments
    run by tox so the testr database is created using a dbm format
    available to all python versions.
    
    Integration test PBR commits
    
    Make sure that if a PBR commit is being tested then we install and
    use that source rather than the latest PBR release.
    
    Change-Id: Ie121e795be2eef30822daaa5fe8ab1c2315577ae
    (cherry picked from commit 65f4fafd907a16ea1952ab7072676db2e9e0c51d)
    (cherry picked from commit cd7da23937b66fea3ec42fa2f5a128f363a97e7e)
    Closes-Bug: #1403510
    Co-Authored-By: Clark Boylan <clark.boylan@gmail.com>
    Co-Authored-By: Doug Hellmann <doug@doughellmann.com>
    Co-Authored-By: Jeremy Stanley <fungi@yuggoth.org>