diff --git a/guesslanguage/core.py → libindic/guesslanguage/core.py b/guesslanguage/core.py → libindic/guesslanguage/core.py
@@ -1,34 +1,36 @@
-''' Guess the language of text.
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Guess the language of text.
+#
+# Based on guesslanguage.cpp by Jacob R Rideout for KDE
+# http://websvn.kde.org/branches/work/sonnet-refactoring/common/nlp/guesslanguage.cpp?view=markup
+# which itself is based on Language::Guess by Maciej Ceglowski
+# http://languid.cantbedone.org/
+#
+# Copyright (c) 2008, Kent S Johnson
+#
+# C++ version is Copyright (c) 2006 Jacob R Rideout <kde@jacobrideout.net>
+# Perl version is (c) 2004-6 Maciej Ceglowski
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+#
+# Note: Language::Guess is GPL-licensed. KDE developers received permission
+# from the author to distribute their port under LGPL:
+# http://lists.kde.org/?l=kde-sonnet&m=116910092228811&w=2
 
-    Based on guesslanguage.cpp by Jacob R Rideout for KDE
-    http://websvn.kde.org/branches/work/sonnet-refactoring/common/nlp/guesslanguage.cpp?view=markup
-    which itself is based on Language::Guess by Maciej Ceglowski
-    http://languid.cantbedone.org/
-
-    Copyright (c) 2008, Kent S Johnson
-
-    C++ version is Copyright (c) 2006 Jacob R Rideout <kde@jacobrideout.net>
-    Perl version is (c) 2004-6 Maciej Ceglowski
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Note: Language::Guess is GPL-licensed. KDE developers received permission
-    from the author to distribute their port under LGPL:
-    http://lists.kde.org/?l=kde-sonnet&m=116910092228811&w=2
-
-'''
 
 import codecs
 import os
@@ -40,7 +42,7 @@
 
 try:
     from collections import defaultdict
-except:
+except BaseException:
     class defaultdict(dict):
         def __init__(self, default_factory=None, *a, **kw):
             if (default_factory is not None and
@@ -85,8 +87,11 @@ def __repr__(self):
 
 MIN_LENGTH = 20
 
-BASIC_LATIN = "en_US ceb ha so tlh id haw la sw eu nr nso zu_ZA xh ss st tn ts".split()
-EXTENDED_LATIN = "cs af_ZA pl_PL hr_HR ro sk sl tr hu_HU az et sq ca es fr de nl it_IT da is nb sv fi lv pt ve lt tl cy".split()
+BASIC_LATIN = "en_US ceb ha so tlh id haw la sw eu nr ".split() + \
+              "nso zu_ZA xh ss st tn ts".split()
+EXTENDED_LATIN = "cs af_ZA pl_PL hr_HR ro sk sl tr hu_HU az et sq ".split() + \
+                 "ca es fr de nl it_IT da is nb sv fi lv pt ve lt ".split() + \
+                 "tl cy".split()
 ALL_LATIN = BASIC_LATIN + EXTENDED_LATIN
 CYRILLIC = "ru uk kk uz mn sr mk bg ky".split()
 ARABIC = "ar fa ps ur".split()
@@ -211,7 +216,6 @@ def __repr__(self):
     "ts": "Tsonga",
     "tw": "Twi",
     "uk": "Ukrainian",
-    "uk": "Ukranian",
     "ur": "Urdu",
     "uz": "Uzbek",
     "ve": "Venda",
@@ -306,7 +310,6 @@ def __repr__(self):
     "tr": 26500,
     "tw": 1499,
     "uk": 26510,
-    "uk": 26520,
     "ur": 26530,
     "uz": 26540,
     "vi": 26550,
@@ -339,7 +342,7 @@ def guessLanguage(text):
         return UNKNOWN
 
     if isinstance(text, str):
-        text = unicode(text, 'utf-8')
+        text = unicode(text, 'utf-8')  # noqa: F821
 
     text = normalize(text)
 
@@ -407,7 +410,7 @@ def find_runs(text):
     # and extended additional latin if over 10% (for Vietnamese)
     relevant_runs = []
     for key, value in run_types.items():
-        pct = (value*100) / totalCount
+        pct = (value * 100) / totalCount
         if pct >= 40:
             relevant_runs.append(key)
         elif key == "Basic Latin" and (pct >= 15):
@@ -429,21 +432,23 @@ def _identify(sample, scripts):
     if "Greek and Coptic" in scripts:
         return "el"
 
-    if "Katakana" in scripts or "Hiragana" in scripts or "Katakana Phonetic Extensions" in scripts:
+    if "Katakana" in scripts or "Hiragana" in scripts or \
+            "Katakana Phonetic Extensions" in scripts:
         return "ja"
 
     if "CJK Unified Ideographs" in scripts or "Bopomofo" in scripts \
             or "Bopomofo Extended" in scripts or "KangXi Radicals" in scripts:
 
-# This is in both Ceglowski and Rideout
-# I can't imagine why...
-#            or "Arabic Presentation Forms-A" in scripts
+        # This is in both Ceglowski and Rideout
+        # I can't imagine why...
+        #            or "Arabic Presentation Forms-A" in scripts
         return "zh"
 
     if "Cyrillic" in scripts:
         return check(sample, CYRILLIC)
 
-    if "Arabic" in scripts or "Arabic Presentation Forms-A" in scripts or "Arabic Presentation Forms-B" in scripts:
+    if "Arabic" in scripts or "Arabic Presentation Forms-A" in scripts or \
+            "Arabic Presentation Forms-B" in scripts:
         return check(sample, ARABIC)
 
     if "Devanagari" in scripts:
@@ -496,8 +501,12 @@ def createOrderedModel(content):
     trigrams = defaultdict(int)    # QHash<QString,int>
     content = content.lower()
 
-    for i in xrange(0, len(content)-2):
-        trigrams[content[i:i+3]] += 1
+    try:
+        ranges = xrange(0, len(content) - 2)  # noqa: F821
+    except:
+        ranges = range(0, len(content) - 2)
+    for i in ranges:
+        trigrams[content[i:i + 3]] += 1
 
     return sorted(trigrams.keys(), key=lambda k: (-trigrams[k], k))
 
@@ -522,8 +531,12 @@ def distance(model, knownModel):
 def _makeNonAlphaRe():
     nonAlpha = [u'[^']
     for i in range(sys.maxunicode):
-      c = unichr(i)
-      if c.isalpha(): nonAlpha.append(c)
+        try:
+            c = unichr(i)  # noqa: F821
+        except:
+            c = chr(i)
+        if c.isalpha():
+            nonAlpha.append(c)
     nonAlpha.append(u']')
     nonAlpha = u"".join(nonAlpha)
     return re.compile(nonAlpha)
@@ -563,13 +576,17 @@ def guessLanguageId(self, text):
         return lang
 
     def getScriptName(self, text):
-        return dumps(detect_lang(text))
+        return detect_lang(text)
 
     def get_module_name(self):
         return "Guess Language"
 
     def get_info(self):
-        return "Guess the language of given text. This module can detect more than 50 languages. Based on Language::Guess by Maciej Ceglowski(http://languid.cantbedone.org/)"
+        message = "Guess the language of given text. This module can " + \
+                  "detect more than 50 languages. Based on " + \
+                  "Language::Guess by Maciej Ceglowski" + \
+                  "(http://languid.cantbedone.org/)"
+        return message
 
 
 def getInstance():

diff --git a/guesslanguage/langdetect.py → libindic/guesslanguage/langdetect.py b/guesslanguage/langdetect.py → libindic/guesslanguage/langdetect.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
-#Language Detection based on unicode range
+# Language Detection based on unicode range
 # Copyright 2008 Santhosh Thottingal <santhosh.thottingal@gmail.com>
 # http://www.smc.org.in
 #
@@ -36,7 +36,7 @@ def _detect_lang(text):
         word = words[word_iter]
         if(word):
             orig_word = word
-            #remove the punctuations
+            # remove the punctuations
             for punct in string.punctuation:
                 word = word.replace(punct, " ")
             length = len(word)

diff --git a/guesslanguage/templates/guesslanguage.html → ...uesslanguage/templates/guesslanguage.html b/guesslanguage/templates/guesslanguage.html → ...uesslanguage/templates/guesslanguage.html
diff --git a/libindic/guesslanguage/tests/__init__.py b/libindic/guesslanguage/tests/__init__.py
diff --git a/guesslanguage/blocks_test.py → libindic/guesslanguage/tests/test_blocks.py b/guesslanguage/blocks_test.py → libindic/guesslanguage/tests/test_blocks.py
@@ -12,20 +12,38 @@
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA
 '''
 
-import unittest
+from testtools import TestCase
 
-from blocks import unicodeBlock
+from ..blocks import unicodeBlock
+from itertools import chain
+
+
+class BlocksTest(TestCase):
+
+    def setUp(self):
+        super(BlocksTest, self).setUp()
+
+    def assertBlock(self, name, c):
+        try:
+            c = unichr(c)  # noqa: F821
+        except:
+            c = chr(c)
+        block = unicodeBlock(c)
+        self.assertEquals(name, unicodeBlock(c),
+                          '%s != %s for %r' % (name, block, c))
 
-class blocks_test(unittest.TestCase):
     def test_unicodeBlock(self):
         for c in range(128):
             self.assertBlock('Basic Latin', c)
-
-        for c in range(0x80, 0x180) + range(0x250, 0x2B0):
-            self.assertBlock('Extended Latin', c)
+        try:
+            for c in range(0x80, 0x180) + range(0x250, 0x2B0):
+                self.assertBlock('Extended Latin', c)
+        except:
+            for c in chain(range(0x80, 0x180), range(0x250, 0x2B0)):
+                self.assertBlock('Extended Latin', c)
 
         self.assertBlock('Thai', 0xE00)
         self.assertBlock('Thai', 0xE7F)
@@ -34,16 +52,3 @@ def test_unicodeBlock(self):
         self.assertBlock('Tibetan', 0xF00)
         self.assertBlock('Tibetan', 0xFFF)
         self.assertBlock('Cyrillic', 0x421)
-
-    def assertBlock(self, name, c):
-        c = unichr(c)
-        block = unicodeBlock(c)
-        self.assertEquals(name, unicodeBlock(c), '%s != %s for %r' % (name, block, c))
-
-
-    def setUp(self):
-        pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/guesslanguage/trigrams/af_ZA → libindic/guesslanguage/trigrams/af_ZA b/guesslanguage/trigrams/af_ZA → libindic/guesslanguage/trigrams/af_ZA
diff --git a/guesslanguage/trigrams/ar → libindic/guesslanguage/trigrams/ar b/guesslanguage/trigrams/ar → libindic/guesslanguage/trigrams/ar
diff --git a/guesslanguage/trigrams/az → libindic/guesslanguage/trigrams/az b/guesslanguage/trigrams/az → libindic/guesslanguage/trigrams/az
diff --git a/guesslanguage/trigrams/bg → libindic/guesslanguage/trigrams/bg b/guesslanguage/trigrams/bg → libindic/guesslanguage/trigrams/bg
diff --git a/guesslanguage/trigrams/ca → libindic/guesslanguage/trigrams/ca b/guesslanguage/trigrams/ca → libindic/guesslanguage/trigrams/ca
diff --git a/guesslanguage/trigrams/ceb → libindic/guesslanguage/trigrams/ceb b/guesslanguage/trigrams/ceb → libindic/guesslanguage/trigrams/ceb
diff --git a/guesslanguage/trigrams/cs → libindic/guesslanguage/trigrams/cs b/guesslanguage/trigrams/cs → libindic/guesslanguage/trigrams/cs
diff --git a/guesslanguage/trigrams/cy → libindic/guesslanguage/trigrams/cy b/guesslanguage/trigrams/cy → libindic/guesslanguage/trigrams/cy
diff --git a/guesslanguage/trigrams/da → libindic/guesslanguage/trigrams/da b/guesslanguage/trigrams/da → libindic/guesslanguage/trigrams/da
diff --git a/guesslanguage/trigrams/de_DE → libindic/guesslanguage/trigrams/de_DE b/guesslanguage/trigrams/de_DE → libindic/guesslanguage/trigrams/de_DE
diff --git a/guesslanguage/trigrams/en_US → libindic/guesslanguage/trigrams/en_US b/guesslanguage/trigrams/en_US → libindic/guesslanguage/trigrams/en_US
diff --git a/guesslanguage/trigrams/es → libindic/guesslanguage/trigrams/es b/guesslanguage/trigrams/es → libindic/guesslanguage/trigrams/es
diff --git a/guesslanguage/trigrams/et → libindic/guesslanguage/trigrams/et b/guesslanguage/trigrams/et → libindic/guesslanguage/trigrams/et
diff --git a/guesslanguage/trigrams/eu → libindic/guesslanguage/trigrams/eu b/guesslanguage/trigrams/eu → libindic/guesslanguage/trigrams/eu
diff --git a/guesslanguage/trigrams/fa → libindic/guesslanguage/trigrams/fa b/guesslanguage/trigrams/fa → libindic/guesslanguage/trigrams/fa
diff --git a/guesslanguage/trigrams/fi → libindic/guesslanguage/trigrams/fi b/guesslanguage/trigrams/fi → libindic/guesslanguage/trigrams/fi
diff --git a/guesslanguage/trigrams/fr → libindic/guesslanguage/trigrams/fr b/guesslanguage/trigrams/fr → libindic/guesslanguage/trigrams/fr
diff --git a/guesslanguage/trigrams/ha → libindic/guesslanguage/trigrams/ha b/guesslanguage/trigrams/ha → libindic/guesslanguage/trigrams/ha
diff --git a/guesslanguage/trigrams/haw → libindic/guesslanguage/trigrams/haw b/guesslanguage/trigrams/haw → libindic/guesslanguage/trigrams/haw
diff --git a/guesslanguage/trigrams/hi_IN → libindic/guesslanguage/trigrams/hi_IN b/guesslanguage/trigrams/hi_IN → libindic/guesslanguage/trigrams/hi_IN
diff --git a/guesslanguage/trigrams/hr_HR → libindic/guesslanguage/trigrams/hr_HR b/guesslanguage/trigrams/hr_HR → libindic/guesslanguage/trigrams/hr_HR
diff --git a/guesslanguage/trigrams/hu_HU → libindic/guesslanguage/trigrams/hu_HU b/guesslanguage/trigrams/hu_HU → libindic/guesslanguage/trigrams/hu_HU
diff --git a/guesslanguage/trigrams/id → libindic/guesslanguage/trigrams/id b/guesslanguage/trigrams/id → libindic/guesslanguage/trigrams/id
diff --git a/guesslanguage/trigrams/is → libindic/guesslanguage/trigrams/is b/guesslanguage/trigrams/is → libindic/guesslanguage/trigrams/is
diff --git a/guesslanguage/trigrams/it_IT → libindic/guesslanguage/trigrams/it_IT b/guesslanguage/trigrams/it_IT → libindic/guesslanguage/trigrams/it_IT
diff --git a/guesslanguage/trigrams/kk → libindic/guesslanguage/trigrams/kk b/guesslanguage/trigrams/kk → libindic/guesslanguage/trigrams/kk
diff --git a/guesslanguage/trigrams/ky → libindic/guesslanguage/trigrams/ky b/guesslanguage/trigrams/ky → libindic/guesslanguage/trigrams/ky
diff --git a/guesslanguage/trigrams/la → libindic/guesslanguage/trigrams/la b/guesslanguage/trigrams/la → libindic/guesslanguage/trigrams/la
diff --git a/guesslanguage/trigrams/lt → libindic/guesslanguage/trigrams/lt b/guesslanguage/trigrams/lt → libindic/guesslanguage/trigrams/lt
diff --git a/guesslanguage/trigrams/lv → libindic/guesslanguage/trigrams/lv b/guesslanguage/trigrams/lv → libindic/guesslanguage/trigrams/lv
diff --git a/guesslanguage/trigrams/mk → libindic/guesslanguage/trigrams/mk b/guesslanguage/trigrams/mk → libindic/guesslanguage/trigrams/mk
diff --git a/guesslanguage/trigrams/mn → libindic/guesslanguage/trigrams/mn b/guesslanguage/trigrams/mn → libindic/guesslanguage/trigrams/mn
diff --git a/guesslanguage/trigrams/nb → libindic/guesslanguage/trigrams/nb b/guesslanguage/trigrams/nb → libindic/guesslanguage/trigrams/nb
diff --git a/guesslanguage/trigrams/ne → libindic/guesslanguage/trigrams/ne b/guesslanguage/trigrams/ne → libindic/guesslanguage/trigrams/ne
diff --git a/guesslanguage/trigrams/nl → libindic/guesslanguage/trigrams/nl b/guesslanguage/trigrams/nl → libindic/guesslanguage/trigrams/nl
diff --git a/guesslanguage/trigrams/nr → libindic/guesslanguage/trigrams/nr b/guesslanguage/trigrams/nr → libindic/guesslanguage/trigrams/nr
diff --git a/guesslanguage/trigrams/nso → libindic/guesslanguage/trigrams/nso b/guesslanguage/trigrams/nso → libindic/guesslanguage/trigrams/nso
diff --git a/guesslanguage/trigrams/pl → libindic/guesslanguage/trigrams/pl b/guesslanguage/trigrams/pl → libindic/guesslanguage/trigrams/pl
diff --git a/guesslanguage/trigrams/ps → libindic/guesslanguage/trigrams/ps b/guesslanguage/trigrams/ps → libindic/guesslanguage/trigrams/ps
diff --git a/guesslanguage/trigrams/pt → libindic/guesslanguage/trigrams/pt b/guesslanguage/trigrams/pt → libindic/guesslanguage/trigrams/pt
diff --git a/guesslanguage/trigrams/pt_BR → libindic/guesslanguage/trigrams/pt_BR b/guesslanguage/trigrams/pt_BR → libindic/guesslanguage/trigrams/pt_BR
diff --git a/guesslanguage/trigrams/pt_PT → libindic/guesslanguage/trigrams/pt_PT b/guesslanguage/trigrams/pt_PT → libindic/guesslanguage/trigrams/pt_PT
diff --git a/guesslanguage/trigrams/ro → libindic/guesslanguage/trigrams/ro b/guesslanguage/trigrams/ro → libindic/guesslanguage/trigrams/ro
diff --git a/guesslanguage/trigrams/ru → libindic/guesslanguage/trigrams/ru b/guesslanguage/trigrams/ru → libindic/guesslanguage/trigrams/ru
diff --git a/guesslanguage/trigrams/sk → libindic/guesslanguage/trigrams/sk b/guesslanguage/trigrams/sk → libindic/guesslanguage/trigrams/sk
diff --git a/guesslanguage/trigrams/sl → libindic/guesslanguage/trigrams/sl b/guesslanguage/trigrams/sl → libindic/guesslanguage/trigrams/sl
diff --git a/guesslanguage/trigrams/so → libindic/guesslanguage/trigrams/so b/guesslanguage/trigrams/so → libindic/guesslanguage/trigrams/so
diff --git a/guesslanguage/trigrams/sq → libindic/guesslanguage/trigrams/sq b/guesslanguage/trigrams/sq → libindic/guesslanguage/trigrams/sq
diff --git a/guesslanguage/trigrams/sr → libindic/guesslanguage/trigrams/sr b/guesslanguage/trigrams/sr → libindic/guesslanguage/trigrams/sr
diff --git a/guesslanguage/trigrams/ss → libindic/guesslanguage/trigrams/ss b/guesslanguage/trigrams/ss → libindic/guesslanguage/trigrams/ss
diff --git a/guesslanguage/trigrams/st → libindic/guesslanguage/trigrams/st b/guesslanguage/trigrams/st → libindic/guesslanguage/trigrams/st
diff --git a/guesslanguage/trigrams/sv → libindic/guesslanguage/trigrams/sv b/guesslanguage/trigrams/sv → libindic/guesslanguage/trigrams/sv
diff --git a/guesslanguage/trigrams/sw → libindic/guesslanguage/trigrams/sw b/guesslanguage/trigrams/sw → libindic/guesslanguage/trigrams/sw
diff --git a/guesslanguage/trigrams/tl → libindic/guesslanguage/trigrams/tl b/guesslanguage/trigrams/tl → libindic/guesslanguage/trigrams/tl
diff --git a/guesslanguage/trigrams/tlh → libindic/guesslanguage/trigrams/tlh b/guesslanguage/trigrams/tlh → libindic/guesslanguage/trigrams/tlh
diff --git a/guesslanguage/trigrams/tn → libindic/guesslanguage/trigrams/tn b/guesslanguage/trigrams/tn → libindic/guesslanguage/trigrams/tn
diff --git a/guesslanguage/trigrams/tr → libindic/guesslanguage/trigrams/tr b/guesslanguage/trigrams/tr → libindic/guesslanguage/trigrams/tr
diff --git a/guesslanguage/trigrams/ts → libindic/guesslanguage/trigrams/ts b/guesslanguage/trigrams/ts → libindic/guesslanguage/trigrams/ts
diff --git a/guesslanguage/trigrams/uk → libindic/guesslanguage/trigrams/uk b/guesslanguage/trigrams/uk → libindic/guesslanguage/trigrams/uk
diff --git a/guesslanguage/trigrams/ur → libindic/guesslanguage/trigrams/ur b/guesslanguage/trigrams/ur → libindic/guesslanguage/trigrams/ur
diff --git a/guesslanguage/trigrams/uz → libindic/guesslanguage/trigrams/uz b/guesslanguage/trigrams/uz → libindic/guesslanguage/trigrams/uz
diff --git a/guesslanguage/trigrams/ve → libindic/guesslanguage/trigrams/ve b/guesslanguage/trigrams/ve → libindic/guesslanguage/trigrams/ve
diff --git a/guesslanguage/trigrams/xh → libindic/guesslanguage/trigrams/xh b/guesslanguage/trigrams/xh → libindic/guesslanguage/trigrams/xh
diff --git a/guesslanguage/trigrams/zu_ZA → libindic/guesslanguage/trigrams/zu_ZA b/guesslanguage/trigrams/zu_ZA → libindic/guesslanguage/trigrams/zu_ZA
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+silpa_common
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,28 @@
+[metadata]
+name = libindic-guesslanguage
+summary = Detect primary language of text
+description-file =
+  README.md
+author = Santhosh Thottingal
+author-email = santhosh.thottingal@gmail.com
+home-page = http://silpa.org.in
+classifier =
+  #Environment :: Web Environment
+  #Framework :: Flask
+  Intended Audience :: Developers
+  Intended Audience :: Information Technology
+  License :: OSI Approved
+  License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+  Programming Language :: Python
+  Programming Language :: Python :: 3
+
+[files]
+namespace_packages = libindic
+packages = libindic
+
+[build-sphinx]
+all_files = 1
+source-dir = docs
+
+[wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -1,23 +1,8 @@
-
 #!/usr/bin/env python
 
-from setuptools import setup, find_packages
-
-name = "guesslanguage"
+from setuptools import setup
 
 setup(
-    name = name,
-    version = "0.2.1",
-    url = "http://silpa.org.in/Guess_Language",
-    license = "LGPL-3.0",
-    description = "Guess primary language of given text",
-    author = "Santhosh Thottingal",
-    author_email = "santhosh.thottingal@gmail.com",
-    long_description = """Guess the language of given text.Even
-    works for text containing multiple languages""",
-    packages = find_packages(),
-    include_package_data = True,
-    setup_requires = ['setuptools-git'],
-    install_requires = ['setuptools','silpa_common'],
-    zip_safe = False,
-    )
+    setup_requires=['pbr'],
+    pbr=True,
+)
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -0,0 +1,6 @@
+testrepository
+python-subunit
+flake8
+mccabe
+coverage
+coveralls
diff --git a/tests/blocks_test.py b/tests/blocks_test.py
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,20 @@
+# Tox (http://tox.testrun.org/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py35, py27, pep8
+
+[testenv]
+commands = {envpython} setup.py test
+deps =
+    -rrequirements.txt
+    -rtest-requirements.txt
+
+[testenv:pep8]
+deps=
+  -rrequirements.txt
+  -rtest-requirements.txt
+commands=
+  flake8 --ignore F401 libindic