From 2acdf70283a871f73bfb5f215226110ac4cd56ed Mon Sep 17 00:00:00 2001 From: Nicola Vitale Date: Thu, 5 Jan 2023 15:53:16 +0100 Subject: finance/fava: Remove strict requirement on www/py-cheroot < 9 Fava requires cheroot>=8,<9, but the www/py-cheroot is now at the 9 version. The program fails with the error: Traceback (most recent call last): File "/usr/local/bin/fava", line 33, in sys.exit(load_entry_point('fava==1.23.1', 'console_scripts', 'fava')()) File "/usr/local/bin/fava", line 25, in importlib_load_entry_point return next(matches).load() File "/usr/local/lib/python3.9/importlib/metadata.py", line 86, in load module = import_module(match.group('module')) File "/usr/local/lib/python3.9/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 972, in _find_and_load_unlocked File "", line 228, in _call_with_frames_removed File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 986, in _find_and_load_unlocked File "", line 680, in _load_unlocked File "", line 850, in exec_module File "", line 228, in _call_with_frames_removed File "/usr/local/lib/python3.9/site-packages/fava/__init__.py", line 4, in from pkg_resources import DistributionNotFound File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3260, in def _initialize_master_working_set(): File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3234, in _call_aside f(*args, **kwargs) File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3272, in _initialize_master_working_set working_set = WorkingSet._build_master() File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 583, in _build_master return cls._build_from_requirements(__requires__) File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 596, in _build_from_requirements dists = ws.resolve(reqs, Environment()) File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 795, in resolve raise DistributionNotFound(req, requirers) pkg_resources.DistributionNotFound: The 'cheroot<9,>=8' distribution was not found and is required by fava However the program apparently works fine with that version too, so remove the requirement <9. Bump PORTREVISION. --- finance/fava/Makefile | 1 + finance/fava/files/patch-setup.cfg | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 finance/fava/files/patch-setup.cfg diff --git a/finance/fava/Makefile b/finance/fava/Makefile index 009bdc9824d4..60a2f590d24a 100644 --- a/finance/fava/Makefile +++ b/finance/fava/Makefile @@ -1,5 +1,6 @@ PORTNAME= fava PORTVERSION= 1.23.1 +PORTREVISION= 1 CATEGORIES= finance MASTER_SITES= CHEESESHOP diff --git a/finance/fava/files/patch-setup.cfg b/finance/fava/files/patch-setup.cfg new file mode 100644 index 000000000000..850153994c89 --- /dev/null +++ b/finance/fava/files/patch-setup.cfg @@ -0,0 +1,11 @@ +--- setup.cfg.orig 2022-10-30 08:13:29 UTC ++++ setup.cfg +@@ -53,7 +53,7 @@ install_requires = + Jinja2>=3,<4 + Werkzeug>=2,<3 + beancount>=2.3.5,<3 +- cheroot>=8,<9 ++ cheroot>=8 + click>=7,<9 + markdown2>=2.3.0,<3 + ply -- cgit v1.2.3