← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
15
15
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
16
16
#    License for the specific language governing permissions and limitations
17
17
#    under the License.
18
 
 
19
18
import glob
20
19
import os
21
20
 
22
21
import setuptools
 
22
from setuptools.command import sdist
23
23
 
 
24
from nova.openstack.common import setup as common_setup
24
25
from nova import version
25
26
 
26
 
nova_cmdclass = {}
 
27
 
 
28
class local_sdist(sdist.sdist):
 
29
    """Customized sdist hook - builds the ChangeLog file from VC first."""
 
30
    def run(self):
 
31
        common_setup.write_git_changelog()
 
32
        # sdist.sdist is an old style class, can't user super()
 
33
        sdist.sdist.run(self)
 
34
 
 
35
nova_cmdclass = {'sdist': local_sdist}
27
36
 
28
37
try:
29
38
    from sphinx import setup_command
76
85
               'bin/nova-console',
77
86
               'bin/nova-consoleauth',
78
87
               'bin/nova-dhcpbridge',
79
 
               'bin/nova-direct-api',
80
88
               'bin/nova-manage',
81
89
               'bin/nova-network',
82
90
               'bin/nova-objectstore',
84
92
               'bin/nova-scheduler',
85
93
               'bin/nova-volume',
86
94
               'bin/nova-xvpvncproxy',
87
 
               'bin/stack',
88
 
               'tools/nova-debug'],
 
95
               'bin/volume-usage-audit',
 
96
              ],
89
97
        py_modules=[])