Skip to content

Commit

Permalink
Attempted fix for SourceDistribution error
Browse files Browse the repository at this point in the history
```
ImportError: cannot import name 'SourceDistribution'

```

see:
 - pypa/pip#7217
 - https://latest-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/208/console
  • Loading branch information
joshmoore committed Jan 21, 2020
1 parent 2a18c96 commit f86ad3e
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions vars/recursiveMerge.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,15 @@ def call(Map pipelineParams) {
sh "mkdir -p build"
}

sh "cd build && curl -sfL ${buildInfraUrl} | tar -zxf -"
sh "virtualenv build/venv && build/venv/bin/pip install ${sccPackage}"
sh """
pushd build
curl -sfL ${buildInfraUrl} | tar -zxf -
popd
virtualenv build/venv
. build/venv/bin/activate
pip install -U pip setuptools
pip install ${sccPackage}
"""

sh """
export BASE_REPO=${baseRepo}
Expand Down

0 comments on commit f86ad3e

Please sign in to comment.