From nobody Tue Jan 11 18:55:24 2022 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 F355D195081E; Tue, 11 Jan 2022 18:55:35 +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 4JYKdc6B0qz4gXn; Tue, 11 Jan 2022 18:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 763411E99E; Tue, 11 Jan 2022 18:55:24 +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 20BItOSY064016; Tue, 11 Jan 2022 18:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BItOq3064015; Tue, 11 Jan 2022 18:55:24 GMT (envelope-from git) Date: Tue, 11 Jan 2022 18:55:24 GMT Message-Id: <202201111855.20BItOq3064015@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4c26a0aa0523 - main - multimedia/py-moviepy: Unmark DEPRECATED and remove EXPIRATION_DATE 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c26a0aa0523289504820af97f3055789e333490 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641927333; 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=u3wMxkSAzfbrEwXGeqWpNUiJHVgQhgGBjRuzhk4hD6s=; b=PcLU4MXiIMDo6vc1fFE4KRhP0MdON7I9UFNtmeiYl6aSwZ5x89aGr3YJdF/MGzKyJSDtgW gSaQDxTAy/Rf5V5fJPwTgHr0/hehmBFgmJ+A/C4GTgwz6mvy9NlRYIw6Gp44meKjTCJ58j nml/jt3N+hMw9mXxxwqZquSd6I+NmLtqKt0k8BauYLlv4hTrKkDEGqdQvvfu6XzkVwdpCv 736G10Mkp+RqobNyB8Od8PW9zulI+GjlyLvLOGq1BXTMQs24bLZHK7YxvryeTmRiWEMP/P 2hRlygav9IlfGl6kQEkSs3d+uW0hJULA8EJgvNt9djo91NgSznDxCDhSRPHxLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641927333; a=rsa-sha256; cv=none; b=luAAN1od9Wi5fYYLN/89QzP49hWrRNWsqH0qiqTbaN0LlgiWZK5HP683PWzjmbe9CfPYaW /d8VRmAur6UG2MtiXSF7tn2u1bjykChKAxr/berFVFd98i8AxquQA5Bme1rBkESkahPz3g XODJL94KIu1810u9oUIil3mfAdi13DjeVsAOfh/6/jSQMnQJFwCCDhl8SUrIY2Ae0Xh9ML CNDTG3hsn9ZL9tK6iHdd7+cPh/9QHvwVrxnGUsw8ain2yooAlIwFJSzjXbYLO9i+PlAJc9 toCPxlV5FUSy1/EZ/EnF3MC4Cy+LgFHjL6MRRQoWwgprszlWAD20WcTt3IgAtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c26a0aa0523289504820af97f3055789e333490 commit 4c26a0aa0523289504820af97f3055789e333490 Author: Po-Chuan Hsieh AuthorDate: 2022-01-11 17:16:01 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-11 18:44:37 +0000 multimedia/py-moviepy: Unmark DEPRECATED and remove EXPIRATION_DATE - Change RUN_DEPENDS from py-decorator4 to py-decorator - Remove numpy workaround - Bump PORTREVISION for dependency change Obtained from: https://github.com/Zulko/moviepy/commit/2947e4a036513a264de3fc5234160e71d1b06aed --- multimedia/py-moviepy/Makefile | 7 ++-- .../py-moviepy/files/patch-moviepy-decorators.py | 40 ++++++++++++++++++++++ multimedia/py-moviepy/files/patch-setup.py | 18 +++++----- multimedia/py-moviepy/pkg-descr | 1 - 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile index e215d82eef76..c98ded7fedc4 100644 --- a/multimedia/py-moviepy/Makefile +++ b/multimedia/py-moviepy/Makefile @@ -1,6 +1,6 @@ PORTNAME= moviepy PORTVERSION= 1.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,11 +11,8 @@ COMMENT= Video editing with Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt -DEPRECATED= Depends on expired devel/py-decorator4 -EXPIRATION_DATE=2022-03-31 - RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ - ${PYTHON_PKGNAMEPREFIX}decorator4>=4.0.2<5.0:devel/py-decorator4@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2<6.0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio>=2.5<3.0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0.2.0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ diff --git a/multimedia/py-moviepy/files/patch-moviepy-decorators.py b/multimedia/py-moviepy/files/patch-moviepy-decorators.py new file mode 100644 index 000000000000..704200024c63 --- /dev/null +++ b/multimedia/py-moviepy/files/patch-moviepy-decorators.py @@ -0,0 +1,40 @@ +Obtained from: https://github.com/Zulko/moviepy/commit/2947e4a036513a264de3fc5234160e71d1b06aed + +--- moviepy/decorators.py.orig 2020-05-07 15:34:11 UTC ++++ moviepy/decorators.py +@@ -3,6 +3,7 @@ all decorators used in moviepy go there + """ + + import decorator ++import inspect + + from moviepy.tools import cvsecs + +@@ -76,12 +77,7 @@ def preprocess_args(fun,varnames): + """ Applies fun to variables in varnames before launching the function """ + + def wrapper(f, *a, **kw): +- if hasattr(f, "func_code"): +- func_code = f.func_code # Python 2 +- else: +- func_code = f.__code__ # Python 3 +- +- names = func_code.co_varnames ++ names = inspect.getfullargspec(func).args + new_a = [fun(arg) if (name in varnames) else arg + for (arg, name) in zip(a, names)] + new_kw = {k: fun(v) if k in varnames else v +@@ -120,12 +116,7 @@ def use_clip_fps_by_default(f, clip, *a, **k): + " the clip's fps with `clip.fps=24`" % f.__name__) + + +- if hasattr(f, "func_code"): +- func_code = f.func_code # Python 2 +- else: +- func_code = f.__code__ # Python 3 +- +- names = func_code.co_varnames[1:] ++ names = inspect.getfullargspec(func).args[1:] + + new_a = [fun(arg) if (name=='fps') else arg + for (arg, name) in zip(a, names)] diff --git a/multimedia/py-moviepy/files/patch-setup.py b/multimedia/py-moviepy/files/patch-setup.py index 85bcb8dd7e61..93e255c52291 100644 --- a/multimedia/py-moviepy/files/patch-setup.py +++ b/multimedia/py-moviepy/files/patch-setup.py @@ -1,11 +1,13 @@ ---- setup.py.orig 2020-03-24 20:20:07 UTC +Obtained from: https://github.com/Zulko/moviepy/commit/2947e4a036513a264de3fc5234160e71d1b06aed + +--- setup.py.orig 2020-05-07 15:34:11 UTC +++ setup.py -@@ -67,7 +67,7 @@ requires = [ +@@ -62,7 +62,7 @@ exec(open('moviepy/version.py').read()) # loads __vers + + # Define the requirements for specific execution needs. + requires = [ +- 'decorator>=4.0.2,<5.0', ++ 'decorator>=4.0.2,<6.0', + "imageio>=2.5,<3.0; python_version>='3.4'", "imageio>=2.0,<2.5; python_version<'3.4'", "imageio_ffmpeg>=0.2.0; python_version>='3.4'", - 'tqdm>=4.11.2,<5.0', -- "numpy>=1.17.3; python_version!='2.7'", -+ "numpy>=0; python_version!='2.7'", - "numpy; python_version>='2.7'", - 'requests>=2.8.1,<3.0', - 'proglog<=1.0.0' diff --git a/multimedia/py-moviepy/pkg-descr b/multimedia/py-moviepy/pkg-descr index 774af60ffac8..58e05e66c7fa 100644 --- a/multimedia/py-moviepy/pkg-descr +++ b/multimedia/py-moviepy/pkg-descr @@ -5,5 +5,4 @@ creation of custom effects. MoviePy can read and write all the most common audio and video formats, including GIF. -WWW: https://pypi.org/project/moviepy/ WWW: https://github.com/Zulko/moviepy