Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Commit faaa0ec

Browse files
authored
[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 813f60c commit faaa0ec

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

odoo-shippable/scripts/build-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ DPKG_DEPENDS="postgresql-9.3 postgresql-contrib-9.3 postgresql-9.5 postgresql-co
4949
python3-pip software-properties-common Xvfb libmagickwand-dev"
5050
PIP_OPTS="--upgrade \
5151
--no-cache-dir"
52-
PIP_DEPENDS_EXTRA="line-profiler watchdog isort coveralls diff-highlight pg-activity virtualenv"
52+
PIP_DEPENDS_EXTRA="line-profiler watchdog isort coveralls diff-highlight pg-activity virtualenv setuptools==33.1.1"
5353
PIP_DPKG_BUILD_DEPENDS=""
5454
NPM_OPTS="-g"
5555
NPM_DEPENDS="localtunnel fs-extra eslint"

0 commit comments

Comments
 (0)