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

Commit

Permalink
[FIX] odoo-shippable: Fix pypa/setuptools#942
Browse files Browse the repository at this point in the history
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)
```
  • Loading branch information
moylop260 authored Feb 9, 2017
1 parent 813f60c commit faaa0ec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion odoo-shippable/scripts/build-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ DPKG_DEPENDS="postgresql-9.3 postgresql-contrib-9.3 postgresql-9.5 postgresql-co
python3-pip software-properties-common Xvfb libmagickwand-dev"
PIP_OPTS="--upgrade \
--no-cache-dir"
PIP_DEPENDS_EXTRA="line-profiler watchdog isort coveralls diff-highlight pg-activity virtualenv"
PIP_DEPENDS_EXTRA="line-profiler watchdog isort coveralls diff-highlight pg-activity virtualenv setuptools==33.1.1"
PIP_DPKG_BUILD_DEPENDS=""
NPM_OPTS="-g"
NPM_DEPENDS="localtunnel fs-extra eslint"
Expand Down

0 comments on commit faaa0ec

Please sign in to comment.