Merge pull request #515 from SpiNNakerManchester/fix_jenkins

Changes that hopefully fix Jenkins run
SpiNNakerManchester · Dec 7, 2020 · 28ad1c1 · 28ad1c1
2 parents dce0954 + 9489fe6
commit 28ad1c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -43,9 +43,8 @@ pipeline {
             steps {
                 // remove all directories left if Jenkins ended badly
                 sh 'git clone https://github.com/SpiNNakerManchester/SupportScripts.git support'
-                sh 'pip3 install --upgrade "setuptools < 50.0.0" wheel'
+                sh 'pip3 install --upgrade setuptools wheel'
                 sh 'pip install --user --upgrade pip'
-                sh 'pip install --user --only-binary=numpy,scipy,matplotlib numpy scipy matplotlib'
                 // SpiNNakerManchester internal dependencies; development mode
                 sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/SpiNNUtils.git'
                 sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/SpiNNMachine.git'

diff --git a/Jenkinsfile.cron b/Jenkinsfile.cron
@@ -45,9 +45,8 @@ pipeline {
                 sh 'echo "Branch is $TRAVIS_BRANCH"'
                 // remove all directories left if Jenkins ended badly
                 sh 'git clone https://github.com/SpiNNakerManchester/SupportScripts.git support'
-                sh 'pip3 install --upgrade "setuptools < 50.0.0" wheel'
+                sh 'pip3 install --upgrade setuptools wheel'
                 sh 'pip install --user --upgrade pip'
-                sh 'pip install --user --only-binary=numpy,scipy,matplotlib numpy scipy matplotlib'
                 // SpiNNakerManchester internal dependencies; development mode
                 sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/SpiNNUtils.git'
                 sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/SpiNNMachine.git'