From: Oleg Broytman Date: Wed, 26 Apr 2017 20:52:12 +0000 (+0300) Subject: Install m_lib.defenc and m_lib from PyPI X-Git-Tag: 0.1.1~4 X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=7df67f6dc7c8dd000c09224bee9cf1955fcaa012;p=sqlconvert.git Install m_lib.defenc and m_lib from PyPI --- diff --git a/requirements.txt b/requirements.txt index 9b5161b..af29963 100644 --- 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 d84280f..708bf5e 100644 --- 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 a8b3134..031ea85 100755 --- 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 229abb7..216f890 100644 --- 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