Install m_lib.defenc and m_lib from PyPI

diff --git a/requirements.txt b/requirements.txt
index 9b5161bc72ede36c9e3e1dd16f0af4e370232020..af29963fc26f1a8beed8cb1ff81f1fe0a14857e1 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,8 @@
---trusted-host phdru.name
---find-links=http://phdru.name/Software/Python/
 --install-option=-O2
 
 argparse; python_version == '2.6'
 sqlparse
 SQLObject>=2.2.1; python_version >= '2.6' and python_version < '3.0'
 SQLObject>=3.0.0; python_version >= '3.4'
-m_lib>=2.0; python_version >= '2.6' and python_version < '3.0'
-m_lib>=3.0; python_version >= '3.4'
+m_lib.defenc>=1.0
+m_lib>=3.1

diff --git a/setup.cfg b/setup.cfg
index d84280f9298ae87ecddb7fe37b49c9b0b8629fdb..708bf5e4044d63124ea3ffd0297e65eab9cab314 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,6 @@
 universal = 1
 
 [easy_install]
-find_links = http://phdru.name/Software/Python/
 optimize = 2
 
 [egg_info]

diff --git a/setup.py b/setup.py
index a8b31342805fc392bf8d424185175a074789a1c7..031ea85db9ecdedbf5fc76a33180c524fe555a81 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -40,5 +40,5 @@ setup(name='sqlconvert',
       packages=['sqlconvert'],
       package_data={},
       scripts=['scripts/mysql2sql'],
-      requires=['sqlparse', 'SQLObject', 'm_lib'],
+      requires=['sqlparse', 'SQLObject', 'm_lib.defenc', 'm_lib'],
       )

diff --git a/tox.ini b/tox.ini
index 229abb742cedf5ebbcbbbee593473f032cd4f797..216f8901d5cd86257d62ed19fe43a21b10711d10 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -12,8 +12,8 @@ deps =
     py26: argparse
     py26,py27: SQLObject>=2.2.1
     py34: SQLObject>=3.0.0
-    py26,py27: m_lib>=2.0
-    py34: m_lib>=3.0
+    m_lib>=3.1
+    m_lib.defenc>=1.0
     postgres: psycopg2
 sitepackages = True
 # Don't fail or warn on uninstalled commands