Skip to content

Commit 5ab33c6

Browse files
committed
[FIX] odoo-shippable: Fix pypa/setuptools#942
Avoid the following traceback: ```bash Generated script '/home/user/plone/zinstance/bin/buildout'. Traceback (most recent call last): File "bin/buildout", line 13, in <module> import zc.buildout.buildout File "/home/user/.buildout/eggs/zc.buildout-2.5.3-py2.7.egg/zc/buildout/buildout.py", line 18, in <module> import zc.buildout.easy_install File "/home/user/.buildout/eggs/zc.buildout-2.5.3-py2.7.egg/zc/buildout/easy_install.py", line 26, in <module> import pkg_resources File "/home/user/.buildout/eggs/setuptools-34.0.1-py2.7.egg/pkg_resources/__init__.py", line 72, in <module> import packaging.requirements File "/home/user/.buildout/eggs/packaging-16.8-py2.7.egg/packaging/requirements.py", line 59, in <module> MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker") TypeError: __call__() takes exactly 2 arguments (1 given) ```
1 parent 31aaafd commit 5ab33c6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

odoo80/scripts/build-image.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ PIP_DEPENDS_EXTRA="pyyaml \
7575
hg+https://bitbucket.org/birkenfeld/sphinx-contrib@default#egg=sphinxcontrib-youtube&subdirectory=youtube \
7676
git+https://github.com/vauxoo/pylint-odoo@master#egg=pylint-odoo \
7777
git+https://github.com/vauxoo/panama-dv@master#egg=ruc \
78-
requirements-parser==0.1.0"
78+
requirements-parser==0.1.0 \
79+
setuptools==33.1.1"
7980

8081
PIP_DPKG_BUILD_DEPENDS=""
8182

0 commit comments

Comments
 (0)