From 271b9468c999454527f106b4db177665afeef8ca Mon Sep 17 00:00:00 2001 From: Nils Hamerlinck <nils@hamerlinck.fr> Date: Wed, 8 Sep 2021 05:04:46 +0000 Subject: [PATCH] [REM] packaging: remove obsolete dependency feedparser - Up to odoo 10.0, feedparser dependency was optionally used in the cli of vendored html2text.py (see https://github.com/odoo/odoo/blob/10.0/addons/mail/models/html2text.py#L437) - Since 11.0 (67c17cb3), vendored html2text.py has been removed in favor of maintained package - Turns out the feedparser part in html2text was dead code for a long time anyway (see https://github.com/Alir3z4/html2text/issues/220) - So we can safely drop this dependency closes odoo/odoo#76135 Signed-off-by: Christophe Monniez (moc) <moc@odoo.com> --- .../tools/posbox/overwrite_before_init/etc/init_posbox_image.sh | 1 - debian/control | 1 - requirements.txt | 1 - setup.cfg | 1 - setup.py | 1 - setup/package.dfdebian | 1 - setup/package.dffedora | 1 - 7 files changed, 7 deletions(-) diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh index ba4902d7f1c3..38ff3ba929cb 100755 --- a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh +++ b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh @@ -68,7 +68,6 @@ PKGS_TO_INSTALL=" python3-dateutil \ python3-decorator \ python3-docutils \ - python3-feedparser \ python3-pil \ python3-jinja2 \ python3-ldap \ diff --git a/debian/control b/debian/control index 02e46fc2cdce..117dbf9a7336 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,6 @@ Depends: python3-dateutil, python3-decorator, python3-docutils, - python3-feedparser, python3-html2text, python3-pil, python3-jinja2, diff --git a/requirements.txt b/requirements.txt index 3a34ce419219..7ef6e2ec23aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ chardet==3.0.4 decorator==4.0.10 docutils==0.12 ebaysdk==2.1.5 -feedparser==5.2.1 gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7' gevent==1.5.0 ; python_version >= '3.7' greenlet==0.4.10 ; python_version < '3.7' diff --git a/setup.cfg b/setup.cfg index 8c0c934fbad1..ad10e96d7aab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,6 @@ requires = python3-babel python3-decorator python3-docutils - python3-feedparser python3-gevent python3-greenlet python3-html2text diff --git a/setup.py b/setup.py index ab2b730b50e0..1ded66a7e7cb 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ setup( 'babel >= 1.0', 'decorator', 'docutils', - 'feedparser', 'gevent', 'html2text', 'Jinja2', diff --git a/setup/package.dfdebian b/setup/package.dfdebian index f1d99ade5286..5b70540fcffd 100644 --- a/setup/package.dfdebian +++ b/setup/package.dfdebian @@ -27,7 +27,6 @@ RUN apt-get update -qq && \ python3-dateutil \ python3-decorator \ python3-docutils \ - python3-feedparser \ python3-gevent \ python3-html2text \ python3-pil \ diff --git a/setup/package.dffedora b/setup/package.dffedora index bf45d68c6128..cb131198deb9 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -13,7 +13,6 @@ RUN dnf update -d 0 -e 0 -y && \ python3-babel \ python3-decorator \ python3-docutils \ - python3-feedparser \ python3-gevent \ python3-greenlet \ python3-html2text \ -- GitLab