diff --git a/Jenkinsfile b/Jenkinsfile index 9296d53..2b0060a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,11 +69,11 @@ pipeline { sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/IntroLab.git' sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/PyNN8Examples.git' sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/sPyNNaker8NewModelTemplate.git' - sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/microcircuit_model.git' - sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/SpiNNGym.git' - sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/MarkovChainMonteCarlo.git' - sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/TestBase.git' - sh 'support/gitclone.sh git@github.com:SpiNNakerManchester/SpiNNaker_PDP2.git' + sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/microcircuit_model.git' + sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/SpiNNGym.git' + sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/MarkovChainMonteCarlo.git' + sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/TestBase.git' + sh 'support/gitclone.sh https://github.com/SpiNNakerManchester/SpiNNaker_PDP2.git' } } stage('Install') { @@ -88,7 +88,7 @@ pipeline { run_in_pyenv('pip install --upgrade pip') // Install SpiNNUtils first as needed for C build - run_in_pyenv('cd SpiNNUtils && python setup.py develop') + run_in_pyenv('cd SpiNNUtils && pip install -e .[test]') // C Build next as builds files to be installed in Python run_in_pyenv('make -C $SPINN_DIRS') run_in_pyenv('make -C spinn_common install') @@ -103,33 +103,23 @@ pipeline { run_in_pyenv('make -C SpiNNaker_PDP2/c_code') run_in_pyenv('make -C Visualiser') // Python install - run_in_pyenv('cd SpiNNMachine && python setup.py develop') - run_in_pyenv('cd SpiNNMan && python setup.py develop') - run_in_pyenv('cd PACMAN && python setup.py develop') - run_in_pyenv('cd DataSpecification && python setup.py develop') + run_in_pyenv('cd SpiNNMachine && pip install -e .[test]') + run_in_pyenv('cd SpiNNMan && pip install -e .[test]') + run_in_pyenv('cd PACMAN && pip install -e .[test]') + run_in_pyenv('cd DataSpecification && pip install -e .[test]') run_in_pyenv('cd spalloc && python setup.py develop') - run_in_pyenv('cd SpiNNFrontEndCommon && python setup.py develop') - run_in_pyenv('cd sPyNNaker && python setup.py develop') - run_in_pyenv('cd sPyNNaker8NewModelTemplate && python ./setup.py develop') - run_in_pyenv('cd SpiNNakerGraphFrontEnd && python ./setup.py develop') - run_in_pyenv('cd SpiNNGym && python ./setup.py develop') - run_in_pyenv('cd MarkovChainMonteCarlo && python ./setup.py develop') - run_in_pyenv('cd TestBase && python ./setup.py develop') - run_in_pyenv('cd SpiNNaker_PDP2 && python ./setup.py develop') - run_in_pyenv('cd Visualiser && python ./setup.py develop') + run_in_pyenv('cd SpiNNFrontEndCommon && pip install -e .[test]') + run_in_pyenv('cd TestBase && pip install -e .[test]') + run_in_pyenv('cd sPyNNaker && pip install -e .[test]') + run_in_pyenv('cd sPyNNaker8NewModelTemplate && pip install -e .[test]') + run_in_pyenv('cd SpiNNakerGraphFrontEnd && pip install -e .[test]') + run_in_pyenv('cd SpiNNGym && pip install -e .[test]') + run_in_pyenv('cd MarkovChainMonteCarlo && pip install -e .[test]') + run_in_pyenv('cd SpiNNaker_PDP2 && pip install -e .[test]') + run_in_pyenv('cd Visualiser && pip install -e .[test]') run_in_pyenv('python -m spynnaker.pyNN.setup_pynn') - // Test requirements - run_in_pyenv('pip install -r SpiNNMachine/requirements-test.txt') - run_in_pyenv('pip install -r SpiNNMan/requirements-test.txt') - run_in_pyenv('pip install -r PACMAN/requirements-test.txt') - run_in_pyenv('pip install -r DataSpecification/requirements-test.txt') + // Test requirements where not yet installed run_in_pyenv('pip install -r spalloc/requirements-test.txt') - run_in_pyenv('pip install -r SpiNNFrontEndCommon/requirements-test.txt') - run_in_pyenv('pip install -r sPyNNaker/requirements-test.txt') - run_in_pyenv('pip install -r SpiNNakerGraphFrontEnd/requirements-test.txt') - run_in_pyenv('pip install -r SpiNNGym/requirements-test.txt') - run_in_pyenv('pip install -r MarkovChainMonteCarlo/requirements-test.txt') - run_in_pyenv('pip install -r SpiNNaker_PDP2/requirements-test.txt') // Additional requirements for testing here // coverage version capped due to https://github.com/nedbat/coveragepy/issues/883 run_in_pyenv('pip install python-coveralls "coverage>=5.0.0"')