summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control4
-rw-r--r--debian/py3dist-overrides3
-rw-r--r--setup.py2
3 files changed, 3 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index 7600e8bf580..2cba3381590 100644
--- a/debian/control
+++ b/debian/control
@@ -35,11 +35,13 @@ Depends:
python3-pydot,
python3-pyparsing,
python3-pypdf2,
+ python3-qrcode,
python3-reportlab,
python3-requests,
python3-suds,
python3-tz,
python3-vatnumber,
+ python3-vobject,
python3-werkzeug,
python3-xlsxwriter,
Conflicts: tinyerp-server, openerp-server, openerp-web, openerp
@@ -48,8 +50,6 @@ Recommends:
${python3:Recommends},
postgresql,
python3-pyldap,
- python3-qrcode,
- python3-vobject,
Description: Open Source Apps To Grow Your Business
Odoo, formerly known as OpenERP, is a suite of open-source business apps
written in Python and released under the LGPLv3 license. This suite of
diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides
deleted file mode 100644
index 3264059ab84..00000000000
--- a/debian/py3dist-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-pyldap
-vobject
-qrcode \ No newline at end of file
diff --git a/setup.py b/setup.py
index eba927b573b..379c94e31e7 100644
--- a/setup.py
+++ b/setup.py
@@ -151,7 +151,6 @@ setup(
'psutil', # windows binary code.google.com/p/psutil/downloads/list
'psycopg2 >= 2.2',
'pydot',
- 'pyldap', # optional
'pyparsing',
'pypdf2',
'pyserial',
@@ -170,6 +169,7 @@ setup(
],
python_requires='>=3.5',
extras_require={
+ 'ldap': ['pyldap'],
'SSL': ['pyopenssl'],
},
tests_require=[