Merge pull request Meiqia#6 from Parsely/feature/python3

Add Python 3 support
boneyao · Jan 8, 2016 · 292f96b · 292f96b
2 parents 3074f13 + df458eb
commit 292f96b
Show file tree

Hide file tree

Showing 13 changed files with 4,334 additions and 4,395 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/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,4 @@
+v0.3.0, 2016-01-06 -- Added Python 3 support, updated to 2.14.3 Piwiki search engines
 v0.2.8, 2015-09-10 -- Updated to latest Piwik search engines, fixed a minor bug that resulted from pickle file update
 v0.2.7, 2014-12-16 -- Fixed bug that prevented classification of r.search.yahoo.com and updated search engines list
 v0.2.6, 2013-10-21 -- Fixed a bug in _get_lossy domain that prevented google.it from being picked up as a search engine

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.*
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.9'
+from __future__ import absolute_import
+
+from .serpextract import *
+
+__version__ = '0.3.0'