Merge lp:~camptocamp/anybox.recipe.openerp/fix-addons-path-1189402 into lp:anybox.recipe.openerp

[Guewen Baconnier @ Camptocamp]

Use an OrderedDict to store the sources of the branches in order to keep the order defined in the buildout configuration file when the addons-path is generated.

Fix for lp:1189402

Use an OrderedDict so the insertion order of the keys is kept and the addons-path keep the order defined in the buildout configuration file.

It includes a drop-in recipe for the OrderedDict to keep compatibility with Python < 2.7
This is a copy of the recipe [0] proposed by the Python documentation [1].

[0] http://code.activestate.com/recipes/576693/
[1] http://docs.python.org/2/library/collections.html#collections.OrderedDict

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

Shouldn't we use ordereddict pip package as a python 2.6 dependency instead ?
It uses the same base code:
https://pypi.python.org/pypi/ordereddict

review: Needs Information

[lp:~camptocamp/anybox.recipe.openerp/fix-addons-path-1189402]

334. By Guewen Baconnier @ Camptocamp on 2013-06-10

Replaced the included OrderedDict by the python library ordereddict when python 2.6 is used

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Hello,
>
> Shouldn't we use ordereddict pip package as a python 2.6 dependency instead ?
> It uses the same base code:
> https://pypi.python.org/pypi/ordereddict

Changed. Thanks for the pointer.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM, thanks you

review: Approve (code review, no test)

[Georges Racinet (gracinet)]

Hi, thanks for the report and contribution !

that looks nice, and indeed I wasn't aware that this ordering could matter to some people.
I'll merge tomorrow or wednesday.

As a side note, this could be easily tested in tests/test_server.py.

We usually run the recipe tests with nose in a virtualenv, like this:
http://buildbot.anybox.fr/builders/anybox.recipe.openerp/builds/419/steps/nosetests/logs/stdio

In case you'd wonder about the context in which this example is run, check the previous steps stdio output. They can be reached from here:
http://buildbot.anybox.fr/builders/anybox.recipe.openerp/builds/419

[Georges Racinet (gracinet)]

Wrote the new test myself: http://bazaar.launchpad.net/~anybox/anybox.recipe.openerp/trunk/revision/333/anybox/recipe/openerp/tests/test_server.py

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Thanks for the test and the merge!
Next time I will think about the test

=== modified file 'anybox/recipe/openerp/base.py'
--- anybox/recipe/openerp/base.py	2013-05-20 19:16:53 +0000
+++ anybox/recipe/openerp/base.py	2013-06-10 11:51:33 +0000
@@ -11,6 +11,10 @@
 import shutil
 import ConfigParser
 import distutils.core
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict  # Python < 2.7
 from zc.buildout.easy_install import MissingDistribution
 from zc.buildout import UserError
 import zc.recipe.egg
@@ -132,7 +136,7 @@
                 logger.info('Created %s/ directory' % basename(d))
                 os.mkdir(d)
 
-        self.sources = {}
+        self.sources = OrderedDict()
         self.parse_addons(options)
         self.parse_version()
         self.parse_revisions(options)

=== modified file 'setup.py'
--- setup.py	2013-06-07 00:12:47 +0000
+++ setup.py	2013-06-10 11:51:33 +0000
@@ -11,6 +11,9 @@
 
 requires = ['setuptools', 'zc.recipe.egg', 'zc.buildout']
 
+if sys.version_info < (2, 7):
+    requires.append('ordereddict')
+
 setup(
     name="anybox.recipe.openerp",
     version=version,