From nobody Sat Feb 25 16:20:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PPBn13hSGz3tb05; Sat, 25 Feb 2023 16:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PPBn12yFpz3P5k; Sat, 25 Feb 2023 16:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677342005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26wwRxy3TKpT9zAjf/U17Thv8OGDtiDCZ44iBZexbAk=; b=etcS5y5pILsmCDatpON5FwyRchZiBZh/bl6w5oszwdXHDT4t6NAq2ivxpx6J+Pgot/KFXY ykOBpkHZYEZsKSq1lQoWgNiYxo7Q9gsanp9E0OsLZPcl1jS45705bosiQQfYCO7GxK4gWf Kbn2P+/5Wb+UkjQOEDQ5abPxIhuaml415Oo9/lEJc21TC4PTe4UGpmHo5UfTLt6ybNIgjZ ufGFtWdvYy6eTxqjlPC6yOGcqlu/p6IPfvItV2Yt7RZ9InHnzhBJSn8mI32JSOCU2S7VKA RRr5TMNbMXnNvhs3iayAllL8cNP6ptkOAp3BJan3i83YU+5o6ka28d4WPfJ4QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677342005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=26wwRxy3TKpT9zAjf/U17Thv8OGDtiDCZ44iBZexbAk=; b=MyaEM+He02dPvnxsrfSfyQlh0fTmZmxHuj0QX7ywKwgC2Q0E1ldBGFjwN8gtykOIHjRJd7 yuDkwBU2GyYY/m/Hn3a2TyY+zCLxY8hNX3TB11pPt9lNvl/lUj1pkoyzcqFVzQashO9msG 5vns2pKuI3n3yt3UTbd39xpwQTlFbaUojjqkb4k2C7KBhLFpo/bNYHThg4OOGAjB3iNaxc gSJHuoym+1ljpPlITYjPrKlu0ZD1GDX7cmyl1XE8mvzzydPP8y7yDZkSlG0Ezjr4elPGl1 nr29iCGQVDAcKhiH6Q3CqmK3tMbulSQWkD69LqFbTpnyXlcCP6JSpxpXZIjs8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677342005; a=rsa-sha256; cv=none; b=mtzE+Klgz2kOW0C2oLik6SxFSZ74hiUDG7dpliIVMw7qSQCfvnzDRNe3aoWVfB/aWrVszd 4+4EH+yGEJJ5WRUiWEJuXP8YOl2zTIwIEsWii2qGKOfJFdmwH0BCVyMGL0NhG3tBY26C+x nHaXXoiyLnHLLlel9q89q82OI1K9f8nlqsJ8mHxdjIAeeuUbFTIa5/uAnjjr9H6R9J1rqk Kqz4USqauW5QPriBRaUeJ6aGqdWo9O0F0hfXBI/O1o7rDbgUQfYDNgCykwxmr0zOoTH8Dy /aIXHl5nUaN2AAdtAaZjf608l1TvfIwg7Ou5VIdq37nGlnmJSRG8LHMSYsxhFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PPBn11rsCz1962; Sat, 25 Feb 2023 16:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31PGK5nm048135; Sat, 25 Feb 2023 16:20:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31PGK5sn048133; Sat, 25 Feb 2023 16:20:05 GMT (envelope-from git) Date: Sat, 25 Feb 2023 16:20:05 GMT Message-Id: <202302251620.31PGK5sn048133@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: b40a06499a62 - main - www/flexget: unbreak after f7d506f87661 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b40a06499a626114ba9e2be4b48da45705ece0c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b40a06499a626114ba9e2be4b48da45705ece0c2 commit b40a06499a626114ba9e2be4b48da45705ece0c2 Author: Jan Beich AuthorDate: 2023-02-25 16:14:29 +0000 Commit: Jan Beich 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