Merge lp:~jelmer/bzr-builddeb/plugin-info into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

This branch adds some basic plugin information as suggested by plugin-api.txt. It also adds the "version_info" attribute to __init__.py, so "bzr plugins" will print the plugin version.

[James Westby (james-w)]

> This branch adds some basic plugin information as suggested by plugin-api.txt.
> It also adds the "version_info" attribute to __init__.py, so "bzr plugins"
> will print the plugin version.

This will make the plugin fail to import when packaged won't it?

I like the aim, but organising the information such that the setup.py
isn't required for the plugin to work would be a better solution
in my opinion.

Thanks,

James

review: Needs Information

=== modified file '__init__.py'
--- __init__.py	2009-07-15 17:06:04 +0000
+++ __init__.py	2009-07-17 18:15:54 +0000
@@ -29,6 +29,10 @@
 from bzrlib.commands import plugin_cmds
 from bzrlib.directory_service import directories
 
+from setup import (
+    bzr_plugin_version as version_info,
+    )
+
 commands = {
         "test_builddeb": [],
         "builddeb": ["bd"],

=== modified file 'setup.py'
--- setup.py	2009-03-05 16:22:04 +0000
+++ setup.py	2009-07-17 18:15:54 +0000
@@ -20,18 +20,36 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-from distutils.core import setup
-
-setup(name="bzr-builddeb",
-      version="2.1.1",
-      description="Build a .deb from a bzr branch",
-      author="James Westby",
-      author_email="[e-mail]",
-      license = "GNU GPL v2",
-      url="http://jameswestby.net/bzr/bzr-builddeb/",
-      packages=['bzrlib.plugins.builddeb',
-                'bzrlib.plugins.builddeb.tests',
-                'bzrlib.plugins.builddeb.tests.blackbox'],
-      package_dir={'bzrlib.plugins.builddeb': '.'},
-      scripts=['bzr-buildpackage'],
-      data_files=[('share/man/man1', ['bzr-buildpackage.1'])])
+bzr_plugin_name = 'builddeb'
+
+bzr_plugin_version = (2, 1, 1, 'dev', 0)
+
+bzr_commands = [
+    "test_builddeb",
+    "builddeb",
+    "merge_upstream",
+    "import_dsc",
+    "bd_do",
+    "mark_uploaded",
+    ]
+
+
+if __name__ == '__main__':
+
+    from distutils.core import setup
+
+    version_string = ".".join([str(v) for v in bzr_plugin_version[:3]])
+
+    setup(name="bzr-builddeb",
+          version=version_string,
+          description="Build a .deb from a bzr branch",
+          author="James Westby",
+          author_email="[e-mail]",
+          license = "GNU GPL v2",
+          url="http://jameswestby.net/bzr/bzr-builddeb/",
+          packages=['bzrlib.plugins.builddeb',
+                    'bzrlib.plugins.builddeb.tests',
+                    'bzrlib.plugins.builddeb.tests.blackbox'],
+          package_dir={'bzrlib.plugins.builddeb': '.'},
+          scripts=['bzr-buildpackage'],
+          data_files=[('share/man/man1', ['bzr-buildpackage.1'])])