Skip to content

Commit b91b94b

Browse files
committed
[none] Fix dep version issues running setup.sh
This commit should make creating a vagrant VM from scratch work again.
1 parent 62850ac commit b91b94b

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,4 @@ tldextract==1.7.5
6767
tox==2.3.1
6868
nylas==1.2.3
6969
cffi>=1.6
70+
pyasn1==0.2.3

setup.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,14 @@ if ! ${prod}; then
176176
fi
177177

178178
color '35;1' 'Ensuring setuptools and pip versions...'
179+
# Need up-to-date pyparsing or upgrading pip will break pip
180+
# https://github.com/pypa/packaging/issues/94
181+
pip install 'pyparsing==2.2.0'
179182
# If python-setuptools is actually the old 'distribute' fork of setuptools,
180183
# then the first 'pip install setuptools' will be a no-op.
181-
pip install 'pip==8.1.2' 'setuptools>=5.3'
184+
pip install 'pip==9.0.1' 'setuptools==34.3.1'
182185
hash pip # /usr/bin/pip might now be /usr/local/bin/pip
183-
pip install 'pip==8.1.2' 'setuptools>=5.3'
186+
pip install 'pip==9.0.1' 'setuptools==34.3.1'
184187

185188
# Doing pip upgrade setuptools leaves behind this problematic symlink
186189
rm -rf /usr/lib/python2.7/dist-packages/setuptools.egg-info

0 commit comments

Comments
 (0)