Use m_lib.defenc instead of m_lib; install it from PyPI

diff --git a/ANNOUNCE b/ANNOUNCE
index 260756107f6f2c56eea57061ab859f82e9f0f43c..d38f05156a0909b1487de8866f4b95477c154e0e 100644 (file)
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -59,7 +59,7 @@ WHERE TO GET
     git clone http://git.phdru.name/mimedecode.git
     git clone  git://git.phdru.name/mimedecode.git
 
-   Requires: Python 2.2.2+, m_lib 2.0+.
+   Requires: Python 2.6+, m_lib 3.1+, m_lib.defenc 1.0+.
 
    Recommends: configured mailcap database.
 

diff --git a/ChangeLog b/ChangeLog
index acf383753e84b7def32d69b5015836e60058e744..e241dd099ea223835ed80d7ddec1dc3bfe340815 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Version 2.7.0 (2015-??-??)
 
+   Use m_lib.defenc instead of m_lib; install it from PyPI.
+
    Make options --save-headers|body|message to work with multipart subparts.
 
 Version 2.6.0 (2014-06-08)

diff --git a/requirements.txt b/requirements.txt
index b6601812837f40a2544be58158252f4b0d028151..f2c299875a21763f87b9753e243cca6f315e4661 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,3 @@
---trusted-host phdru.name
---find-links=http://phdru.name/Software/Python/
 --install-option=-O2
 
-m_lib>=2.0; python_version >= '2.6' and python_version < '3.0'
-m_lib>=3.0.1; python_version >= '3.4'
+m_lib.defenc>=1.0

diff --git a/requirements_dev.txt b/requirements_dev.txt
new file mode 100644 (file)
index 0000000..c0ccf74
--- /dev/null
+++ b/requirements_dev.txt
@@ -0,0 +1,3 @@
+-r requirements.txt
+
+m_lib>=3.1

diff --git a/setup.cfg b/setup.cfg
index 56a356622e99927ddcde13c83e3923576698e1a4..d4199d8208f2334f05e693d24743930abe92cf58 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [easy_install]
-find_links = http://phdru.name/Software/Python/
 optimize = 2
 
 [egg_info]

diff --git a/setup.py b/setup.py
index c2b3db9a13d9a9ef6f0b121feda9ce4986ebbbbb..72b770a0f24392f520930ea1d82005f04ede98db 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,8 @@ except ImportError:
 
 kw = {}
 if is_setuptools:
-    kw['install_requires'] = ['m_lib>=2.0']
+    kw['install_requires'] = ['m_lib.defenc>=1.0']
+    kw['tests_require'] = ['m_lib>=3.1']
 
 from mimedecode_version import __version__, __copyright__, __license__