Merge lp:~jaypipes/glance/versioning into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Add dynamic versioning to Glance

Glance now has non-static versioning. Pulled in r56 from Bexar trunk and version.py stuff from Nova.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Vish Ishaya (vishvananda)]

looks like lots of whitespace fixes too. LGTM, though

review: Approve

[Jay Pipes (jaypipes)]

eh, yeah, the whitespace fixes were from the last revision to the Bexar trunk...slipped by me when I created the Cactus trunk this is going into..

[Rick Harris (rconradharris)]

lgtm

review: Approve

=== modified file 'bin/glance-api'
--- bin/glance-api	2011-01-02 02:47:59 +0000
+++ bin/glance-api	2011-01-27 20:06:13 +0000
@@ -5,17 +5,17 @@
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
 #
-#        http://www.apache.org/licenses/LICENSE-2.0
+#         http://www.apache.org/licenses/LICENSE-2.0
 #
 #    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
 
 """
 Glance API Server

=== modified file 'bin/glance-registry'
--- bin/glance-registry	2011-01-18 21:01:49 +0000
+++ bin/glance-registry	2011-01-27 20:06:13 +0000
@@ -3,19 +3,21 @@
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
 #
-#        http://www.apache.org/licenses/LICENSE-2.0
+#         http://www.apache.org/licenses/LICENSE-2.0
 #
 #    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
 """
 Reference implementation server for Glance Registry
 """

=== modified file 'doc/source/conf.py'
--- doc/source/conf.py	2011-01-27 01:17:54 +0000
+++ doc/source/conf.py	2011-01-27 20:06:13 +0000
@@ -77,9 +77,11 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+from glance import version as glance_version
 # The full version, including alpha/beta/rc tags.
-release = '0.1.6'
+release = glance_version.version_string()
+# The short X.Y version.
+version = glance_version.canonical_version_string()
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -118,7 +120,7 @@
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['glance.']
 
-# -- Options for man page output ----------------------------------------------
+# -- Options for man page output --------------------------------------------
 
 # Grouping the document tree for man pages.
 # List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'

=== modified file 'glance/__init__.py'
--- glance/__init__.py	2010-09-27 22:43:04 +0000
+++ glance/__init__.py	2011-01-27 20:06:13 +0000
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010-2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.

=== modified file 'glance/client.py'
--- glance/client.py	2011-01-21 16:35:11 +0000
+++ glance/client.py	2011-01-27 20:06:13 +0000
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

=== modified file 'glance/common/__init__.py'
--- glance/common/__init__.py	2010-09-29 00:20:11 +0000
+++ glance/common/__init__.py	2011-01-27 20:06:13 +0000
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010-2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.

=== modified file 'glance/common/db/__init__.py'
--- glance/common/db/__init__.py	2010-12-23 19:20:52 +0000
+++ glance/common/db/__init__.py	2011-01-27 20:06:13 +0000
@@ -1,8 +1,8 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -16,6 +16,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 """
 DB abstraction for Nova and Glance
 """

=== modified file 'glance/common/db/sqlalchemy/__init__.py'
--- glance/common/db/sqlalchemy/__init__.py	2010-10-01 19:51:29 +0000
+++ glance/common/db/sqlalchemy/__init__.py	2011-01-27 20:06:13 +0000
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010-2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.

=== modified file 'glance/common/db/sqlalchemy/session.py'
--- glance/common/db/sqlalchemy/session.py	2010-10-15 05:35:15 +0000
+++ glance/common/db/sqlalchemy/session.py	2011-01-27 20:06:13 +0000
@@ -15,6 +15,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 """
 Session Handling for SQLAlchemy backend
 """

=== modified file 'glance/registry/db/__init__.py'
--- glance/registry/db/__init__.py	2010-12-16 22:04:58 +0000
+++ glance/registry/db/__init__.py	2011-01-27 20:06:13 +0000
@@ -1,8 +1,8 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -16,6 +16,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 """
 DB abstraction for Nova and Glance
 """

=== modified file 'glance/registry/db/api.py'
--- glance/registry/db/api.py	2010-12-14 02:23:42 +0000
+++ glance/registry/db/api.py	2011-01-27 20:06:13 +0000
@@ -2,6 +2,7 @@
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,6 +16,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 """
 Defines interface for DB access
 """

=== modified file 'glance/registry/db/sqlalchemy/api.py'
--- glance/registry/db/sqlalchemy/api.py	2011-01-22 19:15:55 +0000
+++ glance/registry/db/sqlalchemy/api.py	2011-01-27 20:06:13 +0000
@@ -2,6 +2,7 @@
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
+# Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -15,6 +16,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 """
 Implementation of SQLAlchemy backend
 """

=== modified file 'glance/registry/server.py'
--- glance/registry/server.py	2011-01-05 00:06:31 +0000
+++ glance/registry/server.py	2011-01-27 20:06:13 +0000
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack LLC.
+# Copyright 2010-2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

=== added file 'glance/version.py'
--- glance/version.py	1970-01-01 00:00:00 +0000
+++ glance/version.py	2011-01-27 20:06:13 +0000
@@ -0,0 +1,46 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    Copyright 2011 OpenStack LLC
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+try:
+    from glance.vcsversion import version_info
+except ImportError:
+    version_info = {'branch_nick': u'LOCALBRANCH',
+                    'revision_id': 'LOCALREVISION',
+                    'revno': 0}
+
+GLANCE_VERSION = ['2011', '2']
+YEAR, COUNT = GLANCE_VERSION
+
+FINAL = False   # This becomes true at Release Candidate time
+
+
+def canonical_version_string():
+    return '.'.join([YEAR, COUNT])
+
+
+def version_string():
+    if FINAL:
+        return canonical_version_string()
+    else:
+        return '%s-dev' % (canonical_version_string(),)
+
+
+def vcs_version_string():
+    return "%s:%s" % (version_info['branch_nick'], version_info['revision_id'])
+
+
+def version_string_with_vcs():
+    return "%s-%s" % (canonical_version_string(), vcs_version_string())

=== modified file 'setup.py'
--- setup.py	2011-01-27 01:17:54 +0000
+++ setup.py	2011-01-27 20:06:13 +0000
@@ -20,6 +20,16 @@
 from setuptools import setup, find_packages
 from setuptools.command.sdist import sdist
 
+from glance import version
+
+
+if os.path.isdir('.bzr'):
+    with open("glance/vcsversion.py", 'w') as version_file:
+        vcs_cmd = subprocess.Popen(["bzr", "version-info", "--python"],
+                                   stdout=subprocess.PIPE)
+        vcsversion = vcs_cmd.communicate()[0]
+        version_file.write(vcsversion)
+
 
 class local_sdist(sdist):
     """Customized sdist hook - builds the ChangeLog file from VC first"""
@@ -37,8 +47,12 @@
 
 cmdclass = {'sdist': local_sdist}
 
+# If Sphinx is installed on the box running setup.py,
+# enable setup.py to build the documentation, otherwise,
+# just ignore it
 try:
     from sphinx.setup_command import BuildDoc
+
     class local_BuildDoc(BuildDoc):
         def run(self):
             for builder in ['html', 'man']:
@@ -51,21 +65,19 @@
     pass
 
 
-name = 'glance'
-version = '0.1.6'
-
-
 setup(
-    name=name,
-    version=version,
-    description='Glance',
+    name='glance',
+    version=version.canonical_version_string(),
+    description='The Glance project provides services for discovering, '
+                'registering, and retrieving virtual machine images',
     license='Apache License (2.0)',
-    author='OpenStack, LLC.',
-    author_email='[e-mail]',
-    url='https://launchpad.net/glance',
+    author='OpenStack',
+    author_email='[e-mail]',
+    url='http://glance.openstack.org/',
     packages=find_packages(exclude=['tests', 'bin']),
     test_suite='nose.collector',
     cmdclass=cmdclass,
+    include_package_data=True,
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: Apache Software License',
@@ -73,7 +85,6 @@
         'Programming Language :: Python :: 2.6',
         'Environment :: No Input/Output (Daemon)',
     ],
-    install_requires=[],  # removed for better compat
     scripts=['bin/glance-api',
              'bin/glance-registry',
              'bin/glance-upload'])

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-09-27 22:43:04 +0000
+++ tests/__init__.py	2011-01-27 20:06:13 +0000
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010-2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.

=== modified file 'tests/stubs.py'
--- tests/stubs.py	2011-01-26 16:51:08 +0000
+++ tests/stubs.py	2011-01-27 20:06:13 +0000
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -136,7 +136,6 @@
             def chunk_it():
                 for i in xrange(0, len(cls.DATA), cls.CHUNK_SIZE):
                     yield cls.DATA[i:i + cls.CHUNK_SIZE]
-
             return chunk_it()
 
     fake_swift_backend = FakeS3Backend()
@@ -202,8 +201,7 @@
         DATA = \
             {'files': [
               {'location': 'file:///chunk0', 'size': 12345},
-              {'location': 'file:///chunk1', 'size': 1235}
-            ]}
+              {'location': 'file:///chunk1', 'size': 1235}]}
 
         @classmethod
         def lookup(cls, _parsed_uri):

=== modified file 'tests/unit/__init__.py'
--- tests/unit/__init__.py	2010-09-27 22:43:04 +0000
+++ tests/unit/__init__.py	2011-01-27 20:06:13 +0000
@@ -0,0 +1,16 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010-2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.

=== modified file 'tests/unit/test_api.py'
--- tests/unit/test_api.py	2011-01-11 17:04:14 +0000
+++ tests/unit/test_api.py	2011-01-27 20:06:13 +0000
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -88,8 +88,8 @@
                    'name': 'fake image #2',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'active'
-                  }
+                   'status': 'active'}
+
         req = webob.Request.blank('/images/detail')
         res = req.get_response(rserver.API())
         res_dict = json.loads(res.body)
@@ -105,8 +105,7 @@
         """Tests that the /images POST registry API creates the image"""
         fixture = {'name': 'fake public image',
                    'is_public': True,
-                   'type': 'kernel'
-                  }
+                   'type': 'kernel'}
 
         req = webob.Request.blank('/images')
 
@@ -134,8 +133,7 @@
                    'name': 'fake public image',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'bad status'
-                  }
+                   'status': 'bad status'}
 
         req = webob.Request.blank('/images')
 
@@ -151,8 +149,7 @@
     def test_update_image(self):
         """Tests that the /images PUT registry API updates the image"""
         fixture = {'name': 'fake public image #2',
-                   'type': 'ramdisk'
-                  }
+                   'type': 'ramdisk'}
 
         req = webob.Request.blank('/images/2')
 
@@ -175,8 +172,7 @@
                    'name': 'fake public image',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'bad status'
-                  }
+                   'status': 'bad status'}
 
         req = webob.Request.blank('/images/3')
 

=== modified file 'tests/unit/test_clients.py'
--- tests/unit/test_clients.py	2011-01-26 16:51:08 +0000
+++ tests/unit/test_clients.py	2011-01-27 20:06:13 +0000
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -161,15 +161,13 @@
                    'type': 'kernel',
                    'size': 19,
                    'location': "file:///tmp/glance-tests/2",
-                   'properties': {'distro': 'Ubuntu 10.04 LTS'}
-                  }
+                   'properties': {'distro': 'Ubuntu 10.04 LTS'}}
         expected = {'name': 'fake public image',
                     'is_public': True,
                     'type': 'kernel',
                     'size': 19,
                     'location': "file:///tmp/glance-tests/2",
-                    'properties': {'distro': 'Ubuntu 10.04 LTS'}
-                  }
+                    'properties': {'distro': 'Ubuntu 10.04 LTS'}}
 
         new_image = self.client.add_image(fixture)
 
@@ -216,8 +214,7 @@
     def test_update_image(self):
         """Tests that the /images PUT registry API updates the image"""
         fixture = {'name': 'fake public image #2',
-                   'type': 'ramdisk'
-                  }
+                   'type': 'ramdisk'}
 
         self.assertTrue(self.client.update_image(2, fixture))
 
@@ -233,7 +230,7 @@
                    'name': 'fake public image',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'bad status'
+                   'status': 'bad status',
                   }
 
         self.assertRaises(exception.NotFound,
@@ -386,9 +383,8 @@
         """Tests client returns image as queued"""
         fixture = {'name': 'fake public image',
                    'is_public': True,
-                   'type': 'kernel'
+                   'type': 'kernel',
                   }
-
         image_meta = self.client.add_image(fixture)
         self.assertEquals('queued', image_meta['status'])
         self.assertEquals(0, image_meta['size'])
@@ -401,7 +397,6 @@
                    'size': 19,
                    'location': "file:///tmp/glance-tests/2",
                   }
-
         new_image = self.client.add_image(fixture)
         new_image_id = new_image['id']
 
@@ -425,16 +420,15 @@
                    'type': 'kernel',
                    'size': 19,
                    'location': "file:///tmp/glance-tests/2",
-                   'properties': {'distro': 'Ubuntu 10.04 LTS'}
+                   'properties': {'distro': 'Ubuntu 10.04 LTS'},
                   }
         expected = {'name': 'fake public image',
                     'is_public': True,
                     'type': 'kernel',
                     'size': 19,
                     'location': "file:///tmp/glance-tests/2",
-                    'properties': {'distro': 'Ubuntu 10.04 LTS'}
+                    'properties': {'distro': 'Ubuntu 10.04 LTS'},
                   }
-
         new_image = self.client.add_image(fixture)
         new_image_id = new_image['id']
 
@@ -485,7 +479,7 @@
                    'is_public': True,
                    'type': 'kernel',
                    'size': 19,
-                   'properties': {'distro': 'Ubuntu 10.04 LTS'}
+                   'properties': {'distro': 'Ubuntu 10.04 LTS'},
                   }
 
         image_data_fixture = r"chunk00000remainder"
@@ -510,7 +504,7 @@
                    'is_public': True,
                    'type': 'kernel',
                    'size': 19,
-                   'properties': {'distro': 'Ubuntu 10.04 LTS'}
+                   'properties': {'distro': 'Ubuntu 10.04 LTS'},
                   }
 
         image_data_fixture = r"chunk00000remainder"
@@ -546,7 +540,7 @@
         fixture = {'name': 'fake public image',
                    'is_public': True,
                    'type': 'kernel',
-                   'properties': {'distro': 'Ubuntu 10.04 LTS'}
+                   'properties': {'distro': 'Ubuntu 10.04 LTS'},
                   }
 
         image_data_fixture = r"chunk00000remainder"
@@ -574,7 +568,7 @@
                    'type': 'kernel',
                    'size': 19,
                    'store': 'bad',
-                   'properties': {'distro': 'Ubuntu 10.04 LTS'}
+                   'properties': {'distro': 'Ubuntu 10.04 LTS'},
                   }
 
         image_data_fixture = r"chunk00000remainder"
@@ -587,7 +581,7 @@
     def test_update_image(self):
         """Tests that the /images PUT registry API updates the image"""
         fixture = {'name': 'fake public image #2',
-                   'type': 'ramdisk'
+                   'type': 'ramdisk',
                   }
 
         self.assertTrue(self.client.update_image(2, fixture))
@@ -604,7 +598,7 @@
                    'name': 'fake public image',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'bad status'
+                   'status': 'bad status',
                   }
 
         self.assertRaises(exception.NotFound,

=== modified file 'tests/unit/test_registry_api.py'
--- tests/unit/test_registry_api.py	2011-01-11 17:04:14 +0000
+++ tests/unit/test_registry_api.py	2011-01-27 20:06:13 +0000
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -80,7 +80,7 @@
                    'name': 'fake image #2',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'active'
+                   'status': 'active',
                   }
         req = webob.Request.blank('/images/detail')
         res = req.get_response(server.API())
@@ -97,7 +97,7 @@
         """Tests that the /images POST registry API creates the image"""
         fixture = {'name': 'fake public image',
                    'is_public': True,
-                   'type': 'kernel'
+                   'type': 'kernel',
                   }
 
         req = webob.Request.blank('/images')
@@ -126,7 +126,7 @@
                    'name': 'fake public image',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'bad status'
+                   'status': 'bad status',
                   }
 
         req = webob.Request.blank('/images')
@@ -143,7 +143,7 @@
     def test_update_image(self):
         """Tests that the /images PUT registry API updates the image"""
         fixture = {'name': 'fake public image #2',
-                   'type': 'ramdisk'
+                   'type': 'ramdisk',
                   }
 
         req = webob.Request.blank('/images/2')
@@ -167,7 +167,7 @@
                    'name': 'fake public image',
                    'is_public': True,
                    'type': 'kernel',
-                   'status': 'bad status'
+                   'status': 'bad status',
                   }
 
         req = webob.Request.blank('/images/3')

=== modified file 'tests/unit/test_stores.py'
--- tests/unit/test_stores.py	2011-01-26 16:51:08 +0000
+++ tests/unit/test_stores.py	2011-01-27 20:06:13 +0000
@@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010-2011 OpenStack, LLC
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -107,7 +107,6 @@
 
 
 class TestSwiftBackend(TestBackend):
-
     def setUp(self):
         super(TestSwiftBackend, self).setUp()
         stubs.stub_out_swift_backend(self.stubs)

=== modified file 'tools/install_venv.py'
--- tools/install_venv.py	2011-01-20 19:48:11 +0000
+++ tools/install_venv.py	2011-01-27 20:06:13 +0000
@@ -4,7 +4,7 @@
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
 #
-# Copyright 2010 OpenStack, LLC
+# Copyright 2010 OpenStack LLC.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
@@ -33,7 +33,7 @@
 
 
 def die(message, *args):
-    print >>sys.stderr, message % args
+    print >> sys.stderr, message % args
     sys.exit(1)