git: b40a06499a62 - main - www/flexget: unbreak after f7d506f87661
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Feb 2023 16:20:05 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b40a06499a626114ba9e2be4b48da45705ece0c2
commit b40a06499a626114ba9e2be4b48da45705ece0c2
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-02-25 16:14:29 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-02-25 16:19:51 +0000
www/flexget: unbreak after f7d506f87661
$ flexget
Traceback (most recent call last):
File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 581, in _build_master
ws.require(__requires__)
File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 909, in require
needed = self.resolve(parse_requirements(requirements))
File "/usr/local/lib/python3.9/site-packages/pkg_resources/__init__.py", line 800, in resolve
raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (packaging 23.0 (/usr/local/lib/python3.9/site-packages), Requirement.parse('packaging~=21.3'), {'FlexGet'})
---
www/flexget/Makefile | 1 +
www/flexget/files/patch-requirements.txt | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/www/flexget/Makefile b/www/flexget/Makefile
index f510987ed850..18ff8a632b50 100644
--- a/www/flexget/Makefile
+++ b/www/flexget/Makefile
@@ -1,6 +1,7 @@
PORTNAME= flexget
DISTVERSIONPREFIX= v
PORTVERSION= 3.4.2
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= jbeich@FreeBSD.org
diff --git a/www/flexget/files/patch-requirements.txt b/www/flexget/files/patch-requirements.txt
index a071e60b6e5e..cfcc20afa4f8 100644
--- a/www/flexget/files/patch-requirements.txt
+++ b/www/flexget/files/patch-requirements.txt
@@ -28,9 +28,10 @@
-flask-restx==0.5.1
+flask-restx>=0.5.1
flask>=0.7
- packaging~=21.3
+-packaging~=21.3
-pyparsing==2.4.7
-werkzeug<2.1.0 # Flask-login incompatibility https://github.com/maxcountryman/flask-login/issues/636
-zxcvbn-python
++packaging>=21.3
+pyparsing>=2.4.7
+zxcvbn