From: Oleg Broytman <phd@phdru.name>
Date: Wed, 26 Apr 2017 17:55:12 +0000 (+0300)
Subject: Use m_lib.defenc instead of m_lib; install it from PyPI
X-Git-Tag: 0.0.15~6
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=27e67b25ddd894ac7d6c6ef8d507e2d72d1a7004;p=m_librarian.git

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 213183f..bfdf742 100644
--- 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 e51b2ab..1dcd27d 100644
--- 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 b33eab2..bd5c09b 100644
--- 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 2ef01d9..259c929 100755
--- 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 eda9427..cd0f99b 100644
--- 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 =