Merge branch 'master' into 'pkg-as-setuptools-plugins'

.gitignore

@@ -3,4 +3,16 @@
 .project
 .pydevproject
 *.pyo
-.DS_Store
+.DS_Store
+
+# vim
+*.swp
+
+# install
+build/
+dist/
+vistrails.egg-info/
+vistrails/build/
+
+# pycharm
+.idea/

.travis.yml

@@ -0,0 +1,12 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq python-matplotlib python-mysqldb python-numpy python-qt4 python-qt4-gl python-qt4-sql python-scipy python-vtk python-xlrd python-xlwt zip unzip xvfb
+  - virtualenv --system-site-packages venv && source venv/bin/activate
+  - pip install -r requirements.txt
+  - python setup.py install
+script:
+  - cd /tmp && xvfb-run --server-args="-screen 0 1024x768x16" python -m vistrails.tests -V 1

LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2014, New York University
+Copyright (C) 2011-2014, NYU-Poly.
+Copyright (C) 2006-2011, University of Utah.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -4,7 +4,6 @@ VisTrails is an open-source data analysis and visualization tool. It provides a
 
 For more information, take a look at the [documentation](http://www.vistrails.org/index.php/Documentation), the [users guide](http://www.vistrails.org/usersguide/v2.1/html/), or our [publications](http://www.vistrails.org/index.php/Publications,_Tutorials_and_Presentations).
 
-Binary releases are available on our [download](http://www.vistrails.org/index.php/Downloads) page. To report bugs, please use the github [issue](https://github.com/VisTrails/VisTrails/issues) tracker, after checking our [FAQ](http://www.vistrails.org/index.php/FAQ)
- for known issues.
+Binary releases are available on our [download](http://www.vistrails.org/index.php/Downloads) page. To report bugs, please use the github [issue](https://github.com/VisTrails/VisTrails/issues) tracker, after checking our [FAQ](http://www.vistrails.org/index.php/FAQ) for known issues.
 
 Who we are: <http://www.vistrails.org/index.php/People>

Vagrantfile

@@ -0,0 +1,26 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "hashicorp/precise32"
+
+  config.vm.provision "shell",
+    inline: <<SCRIPT
+sudo aptitude update -y
+sudo aptitude install -y python python-dateutil python-dev python-docutils \
+    python-mako python-matplotlib python-mysqldb python-numpy python-paramiko \
+    python-pip python-qt4 python-qt4-gl python-qt4-sql python-scipy \
+    python-setuptools python-sphinx python-sqlalchemy python-suds python-tz \
+    python-unittest2 python-virtualenv python-vtk python-xlrd python-xlwt \
+    zip unzip xvfb
+cd /home/vagrant
+virtualenv --system-site-packages venv
+source venv/bin/activate
+cd /vagrant
+pip install -r requirements.txt
+python setup.py develop
+sudo chown -R vagrant:vagrant /home/vagrant/venv
+SCRIPT
+end