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

diff --git a/docs-ru/before_begin.rst b/docs-ru/before_begin.rst
index 213183fe8d522228f71521954e0c78bd8723a5ec..bfdf742a8f4edd502fe9633854c57766e6d63778 100644 (file)
--- a/docs-ru/before_begin.rst
+++ b/docs-ru/before_begin.rst
@@ -14,7 +14,7 @@
 -----------------------
 
 m_Librarian написан на языке Python, так что вам нужно скачать и
-установить Python 2.7. Нужны также библиотеки SQLObject и m_lib.
+установить Python 2.7. Нужны также библиотеки SQLObject и m_lib.defenc.
 
 
 Архивы библиотек

diff --git a/docs/before_begin.rst b/docs/before_begin.rst
index e51b2ab23b1969f6680e0284649ad8dc82f0e7d3..1dcd27db77c5f0c0f467c230ec1d62b827bd0cfa 100644 (file)
--- a/docs/before_begin.rst
+++ b/docs/before_begin.rst
@@ -14,8 +14,8 @@ Software
 --------
 
 m_Librarian is written in Python and requires Python 2.7. So install
-Python 2.7 first. Install required modules: SQLObject and m_lib. pip
-`installs <install.html>`_ required modules automatically.
+Python 2.7 first. Install required modules: SQLObject and m_lib.defenc.
+pip `installs <install.html>`_ required modules automatically.
 
 
 Library archives

diff --git a/requirements.txt b/requirements.txt
index b33eab20578ab6a28c7a4d59854073d22e30bb9c..bd5c09b9e953e4b04f1f8838cc6cd32b076a003b 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,6 @@
---trusted-host phdru.name
---find-links=http://phdru.name/Software/Python/
 --install-option=-O2
 
 argparse; python_version == '2.6'
 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

diff --git a/setup.py b/setup.py
index 2ef01d9d85772c93eba5d1e6c12b420037801ba0..259c9298a0f75686083c6a8304c4c2b79b688b6d 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ except ImportError:
 
 kw = {}
 if is_setuptools:
-    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib>=2.0']
+    kw['install_requires'] = ['SQLObject>=2.2.1', 'm_lib.defenc>=1.0']
 
 versionpath = join(abspath(dirname(__file__)), 'm_librarian', '__version__.py')
 load_source('m_librarian_version', versionpath)

diff --git a/tox.ini b/tox.ini
index eda942704659654fd8ee590762fa8433ecf30f34..cd0f99bc38b124cd240fa59237c36cbf5fdf35f1 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,7 @@ 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.defenc>=1.0
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =