oerppy-hackers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 46
committer: duncan@xxxxxxxxxx
branch nick: trunk
timestamp: Thu 2011-06-09 14:16:40 -0600
message:
  * Added setup.py and meta.py files.
  * Added a -V option to scripts (for version). 
added:
  oerppy/meta.py
  setup.py
modified:
  Makefile
  TODO
  oerppy/query.py
  oerppy/scripting/base.py
  oerppy/util.py


--
lp:oerppy
https://code.launchpad.net/~oerppy-hackers/oerppy/trunk

Your team oerppy Hackers is subscribed to branch lp:oerppy.
To unsubscribe from this branch go to https://code.launchpad.net/~oerppy-hackers/oerppy/trunk/+edit-subscription

=== modified file 'Makefile'
--- Makefile	2011-06-02 22:46:11 +0000
+++ Makefile	2011-06-09 20:16:40 +0000
@@ -3,7 +3,7 @@
 	find ./ -name "*.pyc" -exec rm {} \;
 	find ./ -name "*.pyo" -exec rm {} \;
 	find . -name "*.sw[op]" -exec rm {} \;
-	rm -rf MSG.backup _trial_temp/
+	rm -rf MSG.backup _trial_temp/ build/
 
 check:
 	trial oerppy

=== modified file 'TODO'
--- TODO	2011-06-09 17:19:39 +0000
+++ TODO	2011-06-09 20:16:40 +0000
@@ -0,0 +1,2 @@
+* Add support for exporting directly to Google
+  - this will require additional configuration for google account data

=== added file 'oerppy/meta.py'
--- oerppy/meta.py	1970-01-01 00:00:00 +0000
+++ oerppy/meta.py	2011-06-09 20:16:40 +0000
@@ -0,0 +1,10 @@
+display_name = "oerppy"
+library_name = "oerppy"
+version = "0.1"
+author = "Duncan McGreggor, James Jesudason"
+author_email = "duncan@xxxxxxxxxx, james.jesudason@xxxxxxxxxxxxx"
+license = "LGPLv3"
+url = "http://launchpad.net/oerppy";
+short_desc = "OpenERP XML-RPC client library"
+description = " A Python XML-RPC client wrapper for the OpenERP Web Service, providing a clean object-oriented interface for querying OpenERP instances and accessing the resultant data."
+

=== modified file 'oerppy/query.py'
--- oerppy/query.py	2011-06-06 18:29:31 +0000
+++ oerppy/query.py	2011-06-09 20:16:40 +0000
@@ -1,4 +1,4 @@
-from oerppy import model
+from oerppy import meta, model
 
 
 class Query(object):
@@ -16,6 +16,9 @@
         """
         self.client = client
 
+    def get_client_version(self):
+        return meta.version
+
     def query(self, report, domains=None):
         """
         A dispatch method that each subclass needs to implement.

=== modified file 'oerppy/scripting/base.py'
--- oerppy/scripting/base.py	2011-06-09 15:25:17 +0000
+++ oerppy/scripting/base.py	2011-06-09 20:16:40 +0000
@@ -1,7 +1,7 @@
 from optparse import OptionParser
 import sys
 
-from oerppy import config, const, export, service
+from oerppy import config, const, export, meta, service
 
 
 class Script(object):
@@ -31,6 +31,9 @@
         """
         parser = OptionParser(usage=self.get_usage())
         parser.add_option(
+            "-V", "--version", dest="version_check", action="store_true",
+            help="get the current version of the oerppy client library")
+        parser.add_option(
             "-H", "--host", dest="host", action="store",
             help="the host to perform the config lookup for")
         parser.add_option(
@@ -43,11 +46,21 @@
         description = self.__doc__
         return "%s\n%s" % (usage, description)
 
+    def get_short_version(self):
+        return meta.version
+
+    def get_long_version(self):
+        return "%s (%s) version: %s" % (
+            meta.display_name, meta.short_desc, self.get_short_version())
+
     def get_options(self, purge=False):
         if self.options and purge == False:
             return self.options
         parser = self.get_option_parser()
         (options, args) = parser.parse_args()
+        if options.version_check:
+            print self.get_long_version()
+            sys.exit(0)
         if None in [options.host, options.dbname]:
             parser.error("Options -H and -D are both required. "
                          "For more information, use --help.")

=== modified file 'oerppy/util.py'
--- oerppy/util.py	2011-06-09 03:06:38 +0000
+++ oerppy/util.py	2011-06-09 20:16:40 +0000
@@ -161,3 +161,32 @@
             monday = monday.isoformat()
         mondays.append(monday)
     return mondays
+
+
+def dist_setup(*args, **kwds):
+    """
+    Compatibility wrapper.
+    """
+    try:
+        from setuptools import setup
+    except ImportError:
+        from distutils.core import setup
+    return setup(*args, **kwds)
+
+
+def dist_find_packages(library_name):
+    """
+    Compatibility wrapper.
+
+    Taken from storm setup.py.
+    """
+    try:
+        from setuptools import find_packages
+        return find_packages()
+    except ImportError:
+        pass
+    packages = []
+    for directory, subdirectories, files in os.walk(library_name):
+        if "__init__.py" in files:
+            packages.append(directory.replace(os.sep, "."))
+    return packages

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2011-06-09 20:16:40 +0000
@@ -0,0 +1,13 @@
+from oerppy import meta, util
+
+
+util.dist_setup(
+    name=meta.display_name,
+    version=meta.version,
+    description=meta.description,
+    author=meta.author,
+    author_email=meta.author_email,
+    url=meta.url,
+    license=meta.license,
+    packages=util.dist_find_packages(meta.library_name),
+    )