Make serpextract play nice with Python 3 and update search engine list

boneyao · Jan 6, 2016 · f9bb255 · f9bb255
1 parent 606cabb
commit f9bb255
Show file tree

Hide file tree

Showing 12 changed files with 4,330 additions and 4,393 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ build
 dist
 serpextract.egg-info
 .DS_Store
-docs/_build
+docs/_build
+.cache
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: python
 python:
-    - "2.7"
+    - 2.7
+    - 3.3
+    - 3.4
 install:
     - pip install -r requirements.txt --use-mirrors
 script: nosetests
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
 recursive-exclude tests *
 include *.txt
 include *.rst
-include serpextract/search_engines.pickle
+include serpextract/search_engines.pickle*
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 iso3166>=0.4
-nose==1.3.0
-coverage==3.6
+nose>=1.3.0
+coverage>=3.6
 pylru>=1.0.3
-tldextract==1.2
+tldextract>=1.2
+six
diff --git a/serpextract/__init__.py b/serpextract/__init__.py
@@ -1,2 +1,5 @@
-from serpextract import *
-__version__ = '0.2.10'
+from __future__ import absolute_import
+
+from .serpextract import *
+
+__version__ = '0.2.11'