From 22faf86089c804c16aa3b435dfd8cd795514fea9 Mon Sep 17 00:00:00 2001 From: Nils Hamerlinck 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#76571 X-original-commit: 153ecbba47079982a2ec399f33bb246ba95550ba Signed-off-by: Christophe Monniez (moc) --- .../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 9f580af436d..f8c37d118a1 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 @@ -51,7 +51,6 @@ PKGS_TO_INSTALL=" python3-decorator \ python3-dev \ python3-docutils \ - python3-feedparser \ python3-html2text \ python3-jinja2 \ python3-ldap \ diff --git a/debian/control b/debian/control index b62f8f2495c..0e1177d906f 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,6 @@ Depends: python3-dateutil, python3-decorator, python3-docutils, - python3-feedparser, python3-freezegun, python3-html2text, python3-pil, diff --git a/requirements.txt b/requirements.txt index fd89cf57ca9..3dffd1b9971 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,6 @@ chardet==3.0.4 decorator==4.3.0 docutils==0.14 ebaysdk==2.1.5 -feedparser==5.2.1 freezegun==0.3.11; python_version < '3.8' freezegun==0.3.15; python_version >= '3.8' gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7' diff --git a/setup.cfg b/setup.cfg index 329d0ce18c9..f09984b2ddf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,7 +12,6 @@ requires = python3-babel python3-decorator python3-docutils - python3-feedparser python3-freezegun python3-gevent python3-greenlet diff --git a/setup.py b/setup.py index 4a451c261f7..b3d042d3689 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ setup( 'babel >= 1.0', 'decorator', 'docutils', - 'feedparser', 'gevent', 'html2text', 'idna', diff --git a/setup/package.dfdebian b/setup/package.dfdebian index 15879054610..d0a8c2e4981 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 36289a0fd7c..bdff7286988 100644 --- a/setup/package.dffedora +++ b/setup/package.dffedora @@ -18,7 +18,6 @@ RUN dnf update -d 0 -e 0 -y && \ python3-dateutil \ python3-decorator \ python3-docutils \ - python3-feedparser \ python3-freezegun \ python3-gevent \ python3-greenlet \