Merge pull request #384 from grischa/byebye-buildout

Publication form and byebye buildout
mytardis · Feb 9, 2015 · b42592d · b42592d
2 parents 4ca7a02 + 1c30578
commit b42592d
Show file tree

Hide file tree

Showing 89 changed files with 4,335 additions and 1,003 deletions.
diff --git a/.foreman b/.foreman
diff --git a/.gitignore b/.gitignore
@@ -1,28 +1,29 @@
+*.calltree
 *.conf
-*.wsgi
-tardis/settings.py
-*.pyc
+*.egg-info/
 *.log
-*.sqlite
 *.prof
-*.calltree
-eggs/
-parts/
+*.pyc
+*.sqlite
+*.wsgi
+.idea/
 .installed.cfg
+.noseids
+.project
+.pydevproject
+.settings/
+/static/
 bin/
 celerybeat-schedule
-*.egg-info/
 develop-eggs/
+docs/Makefile
 docs/doctrees/
 docs/html/
 docs/make.bat
-docs/Makefile
-.noseids
-.project
-.settings/
-.pydevproject
-/static/
-var/
-versions.cfg
 docs/pydoc
+eggs/
+parts/
+tardis/settings.py
 tardis/tardis_portal/tests/rifcs/MyTARDIS-1.xml
+var/
+versions.cfg
diff --git a/.pylintrc b/.pylintrc
@@ -0,0 +1 @@
+.pylintrc.travis
diff --git a/.pylintrc.travis b/.pylintrc.travis
@@ -126,6 +126,7 @@ disable=C0103,
     W0703,
     W1001,
     W1201,
+    W1202,
     W1401
 
 [REPORTS]

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 python:
-  - "2.6"
+  - "2.7"
 # command to install dependencies
 install:
  - curl -s "http://git.fedorahosted.org/cgit/mailcap.git/plain/mime.types" > mime.types
@@ -14,4 +14,6 @@ script: "bin/django test && bin/pylint --rcfile=.pylintrc.travis tardis"
 after_failure: "cat tardis-test.log"
 branches:
   except:
+    - develop
+    - byebye-buildout
     - doc-cleanup
diff --git a/Procfile b/Procfile
diff --git a/README.rst b/README.rst
@@ -61,5 +61,6 @@ New contributors are welcome, however all developers should review the
 Code Health Status
 ------------------
 
-.. image:: https://travis-ci.org/mytardis/mytardis.png?branch=master
-   :target: https://travis-ci.org/mytardis/mytardis
+.. image:: https://semaphoreapp.com/api/v1/projects/5d21cc89-645b-4793-bd78-cf525a0dcce2/345561/shields_badge.svg
+   :target: https://semaphoreapp.com/mytardis/mytardis
+   :alt: Semaphore build status
diff --git a/apache/apache_django_wsgi.conf_changeme b/apache/apache_django_wsgi.conf_changeme
diff --git a/apache/django.wsgi_changeme b/apache/django.wsgi_changeme