Merge pull request #758 from zeehio/master

Upgrade to django-1.4

.coveragerc

@@ -0,0 +1,6 @@
+[run]
+source = metashare
+
+[report]
+omit = metashare/repository/seltests/*,metashare/repository/tests/*,metashare/repository/test_fixtures/*
+

.gitignore

@@ -24,3 +24,4 @@ lighttpd.pid
 lighttpd/
 opt/
 ._*
+venv

.travis.yml

@@ -0,0 +1,92 @@
+# This file is used by travis-ci.org to test META-SHARE
+# env section
+# ============
+# This section sets environment variables. There are two kinds of environment
+# variables in travis: "global" and "matrix".
+# 
+# matrix variables
+# -----------------
+# matrix variables can be used to tell travis we want different jobs to run
+# for instance to split the testsuite in two subgroups.
+# Here TEST_SUITE takes two different values, so in one case the selenium
+# tests run, and in the other case the rest of the tests run.
+#
+# global variables
+# -----------------
+# Common environment variables for all the jobs that will run.
+#
+# In order to securely use external services (such as coveralls or sauce labs) 
+# with travis and github some secrets have to be shared. Travis provides
+# an option to encrypt environment variables in a way that only travis can
+# decrypt them and use them with the external services. By doing that, we can
+# safely store encrypted keys in this file and let travis decrypt and use them.
+#
+language: python
+env:
+  global:
+    ######## SAUCE LABS #############
+    # SAUCE_USERNAME and SAUCE_ACCESS_KEY
+    # https://docs.saucelabs.com/ci-integrations/travis-ci/
+    # You will need to create a saucelabs account, free for Free Software projects.
+    # ### keys for zeehio/META-SHARE:
+    - secure: IEtbjPMMqI9qiL9JzCoqkN4t700OOG6lM83a0M9PgIpuFviC7cmUv984Vpk55yuvnIvFp5N+BzIWFbw4frxV8Al+usVZs/WHdvwMKZfoolKY4uQAeibnQzivh5DJqRjz3A8nplH953SBosseVqXW6xQBKmexNdUmA7Iz6Tjag0A=
+    - secure: gi7/2rLtpYgaj4tld5eB1dL9jrRXfGAxeOVtBMAura+qKKknNE0iY0lJc6OSwY7imTRQUyg2A4xWFD0lSEw6ZQ2JpZzbCFXYXD5wsm5PPNw5lCWSUKLd1E4in9wmmQ6/tjlqH7J3DWD16Pb2AyE9RVN2jWMGUif73qygSneDudU=
+    #
+    # ### keys for metashare/META-SHARE:
+    # - secure: key_not_yet_created
+    # - secure: key_not_yet_created
+    #
+    ########### GIVE TRAVIS PUSH ACCESS ##########
+    # So we can push the generated gh-pages
+    # Generate your auth token here:
+    # https://github.com/settings/applications#personal-access-tokens
+    # Encrypt your token:
+    # $ gem install travis;
+    # $ travis login
+    # $ travis encrypt -r zeehio/META-SHARE "GH_AUTH='my_secret_token'"
+    # $ travis encrypt -r zeehio/META-SHARE "GH_REF=github.com/zeehio/META-SHARE.git"
+    # The repository GH_REF is not secret, but if we encrypt it we can keep 
+    # the zeehio/META-SHARE and the metashare/META-SHARE and travis will choose the
+    # right one on each case.
+    #
+    # ### keys for zeehio/META-SHARE:
+    # GH_AUTH:
+    - secure: "DmTgKEmMQatjTflWlDpX0PXJf/Gh8kiBqv09AkgjdO+5imCLJ0QcQbusZ2VeJPXVyvPQ/rywSCW1KJQrcZz/nJEX1kClWsV4z157oQAAroIsaAlHi77pPEQGg6EU6CXNHJp1U2v+sgeMx73KjYgHgVXPtOB7LqF6V0CWeQER+UA="
+    # GH_REF:
+    - secure: "k3+QkIQtF5chdMOBVWbuhVIVJ6KMWQ2FgyekBSbknAz7y8CmxtTuFw4Wgitja/3ESgbdsRY9z7/vMtMaxk5aNJWq8lZodMzhil0f0k+cKKbl+vMViBAomXKcCCCMpUACBObhJXuK5T4f0LhbqYdmXtOF5cubn5gDr33MV5Dk0+Q="
+    # ### keys for metashare/META-SHARE:
+    #- secure: "not generated"
+    # GH_REF:
+    #- secure: "not generated"
+  matrix:
+    # basic runs the metashare testsuite without selenium tests, followed
+    # by the multitest that checks node syncing.
+    # selenium runs the selenium tests only
+    # docs builds the documentation and pushes it to gh-pages
+    - TEST_SUITE="basic"
+    - TEST_SUITE="selenium"
+    - TEST_SUITE="docs"
+python:
+  - "2.7"
+# commands to install dependencies
+install:
+  - "pip install coveralls"
+  - "./install-dependencies.sh"
+# command to run tests
+script:
+  - "if [ \"x$TEST_SUITE\" = \"xbasic\" ]; then ./misc/test-ci/run-testsuite.sh; fi"
+  - "if [ \"x$TEST_SUITE\" = \"xselenium\" ]; then ./misc/test-ci/run-testsuite.sh --selenium-only; fi"
+  - "if [ \"x$TEST_SUITE\" = \"xdocs\" ] ; then ./misc/test-ci/autoupdate-docs.sh; fi"
+  - "if [ \"x$TEST_SUITE\" = \"xbasic\" ] ; then ./misc/test-ci/multitest.sh; fi"
+after_success:
+  - "if [ \"x$TEST_SUITE\" != \"xdocs\" ]; then coveralls; fi"
+
+addons:
+  sauce_connect: true
+  apt:
+    packages:
+    - libpq-dev
+    - python-sphinx
+
+sudo: false
+

README.md

@@ -1,6 +1,9 @@
 META-SHARE SOFTWARE
 ===================
 
+[![Build Status](https://travis-ci.org/zeehio/META-SHARE.svg?branch=master)](https://travis-ci.org/zeehio/META-SHARE)
+[![Coverage Status](https://coveralls.io/repos/zeehio/META-SHARE/badge.svg?branch=master)](https://coveralls.io/r/zeehio/META-SHARE?branch=master)
+
 META-SHARE Software is the software powering META-SHARE.
 
 META-SHARE is a sustainable network of repositories of language data, tools and

install-dependencies.sh

@@ -9,8 +9,8 @@ echo "Checking python version..."
 EXPECTED_PYTHON_VERSION="Python 2.7"
 
 # Check which python version to use
-if [ -e $BASEDIR/opt/bin/python ] ; then
-  PYTHON=$BASEDIR/opt/bin/python
+if [ -e "$BASEDIR/opt/bin/python" ] ; then
+  PYTHON="$BASEDIR/opt/bin/python"
   echo "Using locally installed python version $PYTHON"
 else
   PYTHON=python
@@ -25,23 +25,47 @@ else
   if [ "$PYTHON" == "python" ] ; then
     echo "expected $EXPECTED_PYTHON_VERSION, but found $PYTHON_VERSION"
     echo "trying to install a local version in $BASEDIR/opt"
-
-    cd $BASEDIR/installable-packages
-    tar xjf Python-2.7.2.tar.bz2
-    cd Python-2.7.2
-    ./configure --prefix=$BASEDIR/opt
-    make
-    make install
+    wget "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz" || exit 1
+    echo "Verifying python"
+    echo "5eebcaa0030dc4061156d3429657fb83  Python-2.7.9.tgz" | md5sum -c - || exit 1
+    tar xzf "Python-2.7.9.tgz" || exit 1
+    cd "Python-2.7.9" || exit 1
+    ./configure --prefix="$BASEDIR/opt" || exit 1
+    make || exit 1
+    make install || exit 1
+    cd ".."
+    rm -rf "Python-2.7.9"
+    PYTHON="$BASEDIR/opt/bin/python"
   else
     echo "expected $EXPECTED_PYTHON_VERSION, but found $PYTHON_VERSION in local install"
     echo "something is messed up, aborting."
     exit 1
   fi  
 fi
 
+echo "Create the virtual environment for package installation:"
+# Select current version of virtualenv:
+VENV_DIR="${BASEDIR}/venv"
+VENV_VERSION="12.0.7"
+URL_BASE="http://pypi.python.org/packages/source/v/virtualenv"
+
+echo "Download virtualenv..."
+wget "$URL_BASE/virtualenv-${VENV_VERSION}.tar.gz" || exit 1
+echo "Verify virtualenv..."
+echo "e08796f79d112f3bfa6653cc10840114  virtualenv-12.0.7.tar.gz" | md5sum -c - || exit 1
+echo "Extracting virtualenv"
+tar xzf "virtualenv-${VENV_VERSION}.tar.gz" || exit 1
+echo "Create the virtual environment:"
+"$PYTHON" "virtualenv-${VENV_VERSION}/virtualenv.py" "${VENV_DIR}"
+# Don't need this anymore.
+rm -rf "virtualenv-${VENV_VERSION}" "virtualenv-${VENV_VERSION}.tar.gz"
+
+echo "Python virtual environment created"
+
+echo "Install metashare python dependencies"
+"${VENV_DIR}/bin/pip" install -r "${BASEDIR}/requirements.txt" || exit 1
+
 echo
 echo
 echo "Installation of META-SHARE dependencies complete."
-if [ "$PYTHON" != "python" ] ; then
-  echo "Python was installed locally -- make sure to include $BASEDIR/opt/bin at the beginning of your PATH!"
-fi
+