From 75be7e9683121decf0c96f205ee561dd69d3240f Mon Sep 17 00:00:00 2001 From: Udo Spallek Date: Fri, 21 Sep 2018 10:56:53 +0200 Subject: [PATCH] Clean install requirements ipaddress and mock are part of stdlib in Python 3.4 at least. issue7709 review48611002 --- doc/topics/install.rst | 6 ++---- setup.py | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/topics/install.rst b/doc/topics/install.rst index ea9e73da08..98abe668fa 100644 --- a/doc/topics/install.rst +++ b/doc/topics/install.rst @@ -7,7 +7,7 @@ How to install Tryton Prerequisites ============= - * Python 2.7 or later (http://www.python.org/) + * Python 3.4 or later (http://www.python.org/) * Werkzeug (http://werkzeug.pocoo.org/) * wrapt (https://github.com/GrahamDumpleton/wrapt) * lxml 2.0 or later (http://lxml.de/) @@ -15,8 +15,7 @@ Prerequisites * Genshi (http://genshi.edgewall.org/) * python-dateutil (http://labix.org/python-dateutil) * polib (https://bitbucket.org/izi/polib/wiki/Home) - * python-sql 0.4 or later (http://code.google.com/p/python-sql/) - * ipaddress (https://github.com/phihag/ipaddress) + * python-sql 0.5 or later (http://code.google.com/p/python-sql/) * passlib (https://bitbucket.org/ecollins/passlib) * Optional: psycopg 2.5.0 or later (http://www.initd.org/) * Optional: psycopg2cffi 2.5.0 or later @@ -27,7 +26,6 @@ Prerequisites (http://github.com/miohtama/python-Levenshtein) * Optional: bcrypt (https://github.com/pyca/bcrypt) * Optional: html2text (https://pypi.python.org/pypi/html2text) - * Optional: mock (http://www.voidspace.org.uk/python/mock/) Install Tryton ============== diff --git a/setup.py b/setup.py index 7045dd32e6..2956f94753 100644 --- a/setup.py +++ b/setup.py @@ -109,7 +109,6 @@ setup(name=name, 'python-sql >= 0.5', 'werkzeug', 'wrapt', - 'ipaddress', 'passlib', ], extras_require={