diff --git a/__init__.py b/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/jenkins.sh b/jenkins.sh index 1bce7766..4ad1c800 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -1,28 +1,31 @@ #!/bin/bash -if [ -n "${VAR:-x}" ]; then - WORKSPACE=. +#setup virtualenvironment +export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python2.7 +if [ ! -d $HOME/.venvs ]; then + mkdir $HOME/.venvs fi +export WORKON_HOME=$HOME/.venvs +source /usr/local/bin/virtualenvwrapper.sh -echo $WORKSPACE -PYENV_HOME=$WORKSPACE/.pyenv/ +#create the scientific python virtualenv and copy to provide qexec base +mkvirtualenv --no-site-packages scientific_base +workon scientific_base +./ordered_pip.sh requirements_sci.txt +deactivate +#re-base qexec +#rmvirtualenv qexec +cpvirtualenv scientific_base qexec -#leaving the old build in place because it takes >20 minutes to compile everything - -# Delete previously built virtualenv -#if [ -d $PYENV_HOME ]; then -# rm -rf $PYENV_HOME -#fi - -# Create virtualenv and install necessary packages -virtualenv --no-site-packages $PYENV_HOME -. $PYENV_HOME/bin/activate -./ordered_pip.sh $WORKSPACE/requirements.txt -./ordered_pip.sh $WORKSPACE/requirements_dev.txt -cp /mnt/jenkins/host_settings.py ./ +workon qexec +./ordered_pip.sh requirements.txt +./ordered_pip.sh requirements_dev.txt #setup the local mongodb python dev_setup.py #run all the tests in test -nosetests +nosetests --with-xcoverage --with-xunit --cover-package=myapp --cover-erase +pylint -f parseable . | tee pylint.out + +deactivate diff --git a/requirements_dev.txt b/requirements_dev.txt index e353705a..a22d34ae 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -9,4 +9,6 @@ ipython==0.12 # For unit tests nose==1.1.2 unittest2==0.5.1 -requests==0.10.1 \ No newline at end of file +requests==0.10.1 +nosexcover +pylint diff --git a/requirements_sci.txt b/requirements_sci.txt index f69f77c4..4ed7d007 100644 --- a/requirements_sci.txt +++ b/requirements_sci.txt @@ -5,7 +5,8 @@ python-dateutil==1.5 #core scientific python numpy==1.6.1 scipy==0.10.0 -http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-1.1.0/matplotlib-1.1.0.tar.gz +matplotlib==1.1.0 +#http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-1.1.0/matplotlib-1.1.0.tar.gz numexpr==2.0.1 Cython==0.15.1 tables==2.3.1