add text-unidecode option as extra

5 files changed, 12 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2eed12..f4f37a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0
+  - Upgrade Unidecode
+  - Allow install of text-unidecode as extra. "pip install python-slugify[text-unidecode]"
+
 ## 2.0.1
   - Add replacements option e.g. [['|', 'or'], ['%', 'percent'], ['-', '_']] (@andriyor)
 
diff --git a/README.md b/README.md
index bc4d9e8..8d0ce73 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,8 @@ Overview
 Notice
 ====================
 
-By default, this modules installs and uses [Unidecode](https://github.com/avian2/unidecode) *(GPL)* for its decoding needs.  However if you wish to use [text-unidecode](https://github.com/kmike/text-unidecode) *(GPL & Perl Artistic)* instead, please ensure it is installed prior to `python-slugify` installation.
-
-In cases where both `Unidecode` and `text-unidecode` are installed, `Unidecode` is used as the default decoding module.
+By default, this modules installs and uses [Unidecode](https://github.com/avian2/unidecode) *(GPL)* for its decoding needs.  However if you wish to use [text-unidecode](https://github.com/kmike/text-unidecode) *(GPL & Perl Artistic)* instead, you must
+install it as `python-slugify[text-unidecode]`.
 
 
 How to install
diff --git a/setup.py b/setup.py
index ab59194..5a8a5ce 100755
--- a/setup.py
+++ b/setup.py
@@ -7,12 +7,6 @@ import os
 import sys
 import codecs
 
-install_requires = []
-try:
-    import text_unidecode
-except ImportError:
-    install_requires.append('Unidecode>=0.04.16')
-
 name = 'python-slugify'
 package = 'slugify'
 description = 'A Python Slugify application that handles Unicode'
@@ -20,6 +14,8 @@ url = 'https://github.com/un33k/python-slugify'
 author = 'Val Neekman'
 author_email = 'info@neekware.com'
 license = 'MIT'
+install_requires = ['Unidecode==1.0.23']
+extras_require = {'text-unidecode': ['text-unidecode==1.2']}
 
 classifiers = [
     'Development Status :: 5 - Production/Stable',
@@ -70,6 +66,7 @@ setup(
     author_email=author_email,
     packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
     install_requires=install_requires,
+    extras_require=extras_require,
     classifiers=classifiers,
     entry_points={'console_scripts': ['slugify=slugify.slugify:main']},
 )
diff --git a/slugify/__init__.py b/slugify/__init__.py
index 7358b99..c2e205b 100644
--- a/slugify/__init__.py
+++ b/slugify/__init__.py
@@ -3,4 +3,4 @@ from .slugify import *
 
 __author__ = 'Val Neekman @ Neekware Inc. [@vneekman]'
 __description__ = 'A Python slugify application that also handles Unicode'
-__version__ = '2.0.1'
+__version__ = '3.0.0'
diff --git a/slugify/slugify.py b/slugify/slugify.py
index 59e9672..fcd1d22 100644
--- a/slugify/slugify.py
+++ b/slugify/slugify.py
@@ -14,9 +14,9 @@ except ImportError:
     unichr = chr
 
 try:
-    import unidecode
-except ImportError:
     import text_unidecode as unidecode
+except ImportError:
+    import unidecode
 
 __all__ = ['slugify', 'smart_truncate']