diff --git a/.install_neuron.sh b/.install_neuron.sh deleted file mode 100755 index c1756556..00000000 --- a/.install_neuron.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -set -e - -SRC_DIR=$1 -INSTALL_DIR=$2 -PYTHON_BIN=$3 - -if [ ! -e ${INSTALL_DIR}/.install_finished ] -then - echo 'Neuron was not fully installed in previous build, installing ...' - mkdir -p ${SRC_DIR} - cd ${SRC_DIR} - echo "Downloading NEURON ..." - rm -rf nrn - git clone --depth 1 https://github.com/neuronsimulator/nrn.git >download.log 2>&1 - cd nrn - echo "Preparing NEURON ..." - ./build.sh >prepare.log 2>&1 - echo "Configuring NEURON ..." - PYTHON_BLD=${PYTHON_BIN} ./configure --prefix=${INSTALL_DIR} --without-x --with-nrnpython=${PYTHON_BIN} --disable-rx3d >configure.log 2>&1 - echo "Building NEURON ..." - make -j4 >make.log 2>&1 - echo "Installing NEURON ..." - make -j4 install >install.log 2>&1 - - export PATH="${INSTALL_DIR}/x86_64/bin":${PATH} - export PYTHONPATH="${INSTALL_DIR}/lib/python":${PYTHONPATH} - - echo "Testing NEURON import ...." - ${PYTHON_BIN} -c 'import neuron' >testimport.log 2>&1 - - touch -f ${INSTALL_DIR}/.install_finished - echo "NEURON successfully installed" -else - echo 'Neuron was successfully installed in previous build, not rebuilding' -fi diff --git a/.jenkins.sh b/.jenkins.sh deleted file mode 100755 index 3cb8c4b0..00000000 --- a/.jenkins.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -set -e -set -x - -tox_args='--recreate -e py3-unit-functional-style' - -if [ "${os}" = "cscsviz" ] -then - . /opt/rh/python27/enable -elif [ "${os}" = "Ubuntu-18.04" ] -then - tox_args="${tox_args}" -fi - -which python -python --version - -cd $WORKSPACE - -######### -# Virtualenv -######### - -if [ ! -d "${WORKSPACE}/env" ]; then - virtualenv ${WORKSPACE}/env --no-site-packages -fi - -. ${WORKSPACE}/env/bin/activate -pip install pip --upgrade -pip install tox --upgrade - -##### -# Tests -##### - -cd ${WORKSPACE}/BluePyOpt - -tox ${tox_args} diff --git a/setup.py b/setup.py index 3348f967..ad957baf 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,7 @@ 'pickleshare>=0.7.3', 'Jinja2>=2.8', 'Pebble>=4.6.0', + 'NEURON>=7.8', ], extras_require={ 'all': EXTRA_SCOOP + EXTRA_NEUROML + EXTRA_LFP + EXTRA_ARBOR,