Merge a692d7e into 048c931

libindic · Jun 1, 2014 · 12a3f55 · 12a3f55
2 parents 048c931 + a692d7e
commit 12a3f55
Show file tree

Hide file tree

Showing 192 changed files with 850 additions and 401 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,11 @@
+[run]
+omit =
+    */python?.?/*
+    */lib-python/?.?/*.py
+    */lib_pypy/_*.py
+    */site-packages/nose/*
+    */pypy/*
+
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,5 @@ venv
 *.swp
 .\#*
 \#*\#
+*.webassets-cache/
+*silpa.min.*
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,21 @@
+language: python
+python:
+  - "2.7"
+  # - "3.3"
+install:
+  - pip install -r requirements.txt
+  - pip install -r requirements-modules.txt
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then pip install -r requirements-py2.txt; fi
+  - pip install coveralls
+  - pip install flake8
+script: make travis
+after_success: coveralls
+notifications:
+  email:
+    - silpa-discuss@nongnu.org
+  irc:
+    channels:
+      - "irc.freenode.net#silpa"
+    on_success: change
+    on_failure: change
+    use_notice: true
diff --git a/Makefile b/Makefile
@@ -0,0 +1,13 @@
+travis:
+	nosetests -s --with-coverage --cover-package=silpa
+	flake8 silpa tests
+
+clean:
+	find . -name "*.pyc" -exec rm -vf {} \;
+	find -name __pycache__ -delete
+
+tox:
+	tox
+
+flake:
+	flake8 silpa tests
diff --git a/README b/README
@@ -1,5 +1,9 @@
 SILPA
 ==========
+
+[![Build Status](https://travis-ci.org/Project-SILPA/Silpa-Flask.svg?branch=development)](https://travis-ci.org/Project-SILPA/Silpa-Flask)
+[![Coverage Status](https://coveralls.io/repos/Project-SILPA/Silpa-Flask/badge.png?branch=development)](https://coveralls.io/r/Project-SILPA/Silpa-Flask?branch=development)
+
 SILPA - Indian Language computing platform which provides a web interface
 for different Indian language computing python modules. This is hosted at
 

diff --git a/core/__init__.py b/core/__init__.py
diff --git a/core/jsonrpchandler.py b/core/jsonrpchandler.py
diff --git a/core/modulehelper.py b/core/modulehelper.py
diff --git a/silpa.conf → etc/silpa.conf b/silpa.conf → etc/silpa.conf
@@ -37,7 +37,7 @@ shingling = yes
 textsimilarity = yes
 indicstemmer = yes
 katapayadi = yes
-scriptrender = yes
+#scriptrender = yes
 
 [module_display]
 # Section gives names to be displayed on HTML and

diff --git a/loadconfig.py b/loadconfig.py
diff --git a/requirements-modules.txt b/requirements-modules.txt
@@ -5,7 +5,7 @@
 -e git+https://github.com/Project-SILPA/Soundex.git#egg=soundex
 -e git+https://github.com/Project-SILPA/silpa-common.git#egg=silpa_common
 -e git+https://github.com/Project-SILPA/shingling.git#egg=shingling
--e git+https://github.com/Project-SILPA/scriptrender.git#egg=scriptrender
+#-e git+https://github.com/Project-SILPA/scriptrender.git#egg=scriptrender
 -e git+https://github.com/Project-SILPA/payyans.git#egg=payyans
 -e git+https://github.com/Project-SILPA/normalizer.git#egg=normalizer
 -e git+https://github.com/Project-SILPA/inexactsearch.git#egg=inexactsearch

diff --git a/requirements-py2.txt b/requirements-py2.txt
@@ -0,0 +1 @@
+configparser
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,4 @@
 Flask
+Flask-Assets
+cssmin
+jsmin>=2.0.6