From nobody Tue Nov 30 17:43:20 2021 X-Original-To: dev-commits-ports-main@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 E61B518B9EFE; Tue, 30 Nov 2021 17:43:20 +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 4J3V1h4jrKz4vgb; Tue, 30 Nov 2021 17:43:20 +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 81C431A8AE; Tue, 30 Nov 2021 17:43:20 +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 1AUHhKtq048000; Tue, 30 Nov 2021 17:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUHhKKv047999; Tue, 30 Nov 2021 17:43:20 GMT (envelope-from git) Date: Tue, 30 Nov 2021 17:43:20 GMT Message-Id: <202111301743.1AUHhKKv047999@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Juraj Lutter Subject: git: 83f7b1f4d96c - main - textproc/py-elasticsearch-curator: Unbreak the build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83f7b1f4d96cd96c0aadf750baf9c827197ab74b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638294200; 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=UGcrXbtJBArhIV5uAt8/XMsvKXY9oovr5+ESIX8GDKg=; b=LRTP5ahtohDInb9Wmi8O3+1ejwCAXqnFqn0em+ezc+otVBbRZjFJC29AQU7F8OxMTdo3+b +1g77JaRw+czhqmMQUyYoZqmQh47c3Se4O0ZGy83FSDs9Ah3OOpu7qMEvjYmsn0V2ZkmHl uWfDWQxsMJC73zYenCvMttjza+FMhd0MHyUlAvyNQDWwu9YiClPp6Kcq1eKWjIipPT0L/S yfcimDFqV1hKOX7Y51s2y63fMHuI9YlsPu9gLOEwCeEgguHNpvEVpJgL6LCOWbyIEOhDb+ O3I7stSznto7D+PngG4P2OTInSFvI6OoqATSqSMRQO8OlN7BNNEAWTvI6htI8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638294200; a=rsa-sha256; cv=none; b=KxAFeHzdwX9OrNh8JIx14B9me3g+KyOZ5QpkpYph6Z5oUfGaVKYYflFJ6f7+YkkMK/6+YD J3d7Yr0H5Ld6wiZgmO1EG5+cLGzsoqiFCHK/wcVYs4oFCoBSJEsKI3qlpB4NVqkHuQ4Pzy sVClVlg+leEd826XZOMum0ySivc7kmtLdh2EAtWlT0qSkyxXP8b5C8FraSl2HmCqIyyepq vf/82Y7kiL/V9ptN75Vd2xPZSoEH1ro0Nw8zCZmc0aZFO8F1zlQ37uCarfIP7e3FX5MTVJ S9PPz+Cn+CwzHL4oj1Jzb1GzIBNM+LNb9KGMwTvtfMIS5nThjS+ppVALS0LsmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=83f7b1f4d96cd96c0aadf750baf9c827197ab74b commit 83f7b1f4d96cd96c0aadf750baf9c827197ab74b Author: Juraj Lutter AuthorDate: 2021-11-30 15:04:00 +0000 Commit: Juraj Lutter CommitDate: 2021-11-30 17:42:32 +0000 textproc/py-elasticsearch-curator: Unbreak the build Unbreak the build after upgrade to 5.8.4: - Switch to GitHub download - Adjust dependencies Reported by: pkg-fallout --- textproc/py-elasticsearch-curator/Makefile | 11 ++++--- textproc/py-elasticsearch-curator/distinfo | 6 ++-- .../py-elasticsearch-curator/files/patch-setup.cfg | 36 +++++++++++----------- .../py-elasticsearch-curator/files/patch-setup.py | 17 ++++++++++ 4 files changed, 45 insertions(+), 25 deletions(-) diff --git a/textproc/py-elasticsearch-curator/Makefile b/textproc/py-elasticsearch-curator/Makefile index 31bf181ca700..ae608d0cc025 100644 --- a/textproc/py-elasticsearch-curator/Makefile +++ b/textproc/py-elasticsearch-curator/Makefile @@ -1,9 +1,9 @@ # Created by: Dan Langille PORTNAME= elasticsearch-curator -PORTVERSION= 5.8.4 +DISTVERSIONPREFIX= v +DISTVERSION= 5.8.4 CATEGORIES= textproc python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= elastic@FreeBSD.org @@ -14,7 +14,7 @@ LICENSE= APACHE20 BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>=1.7.24:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>=2018.10.15:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}click>=7.1.2:devel/py-click@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click7>=7.1.2:devel/py-click7@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}elasticsearch>=7.15.1:textproc/py-elasticsearch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-aws4auth>=0.9:www/py-requests-aws4auth@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ @@ -23,7 +23,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>=1.7.24:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} USES= python:3.7+ -USE_PYTHON= distutils autoplist +USE_GITHUB= yes +GH_ACCOUNT= elastic +GH_PROJECT= curator +USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/textproc/py-elasticsearch-curator/distinfo b/textproc/py-elasticsearch-curator/distinfo index cabaf74381b4..1762c2dd4df3 100644 --- a/textproc/py-elasticsearch-curator/distinfo +++ b/textproc/py-elasticsearch-curator/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1636232966 -SHA256 (elasticsearch-curator-5.8.4.tar.gz) = 806232378d5ef91733b889595fb9d88d923e906cf8d8e8801a4e556c7ed3d32a -SIZE (elasticsearch-curator-5.8.4.tar.gz) = 235817 +TIMESTAMP = 1638286828 +SHA256 (elastic-curator-v5.8.4_GH0.tar.gz) = 20f785033e020b6563f201ed8635cef6239c99903520e023f7f6a9d4222f92d5 +SIZE (elastic-curator-v5.8.4_GH0.tar.gz) = 240852 diff --git a/textproc/py-elasticsearch-curator/files/patch-setup.cfg b/textproc/py-elasticsearch-curator/files/patch-setup.cfg index 987f40f4b73f..402909f79f3a 100644 --- a/textproc/py-elasticsearch-curator/files/patch-setup.cfg +++ b/textproc/py-elasticsearch-curator/files/patch-setup.cfg @@ -1,20 +1,20 @@ ---- setup.cfg.orig 2021-11-07 12:31:29 UTC +--- setup.cfg.orig 2021-11-30 15:42:26 UTC +++ setup.cfg -@@ -23,7 +23,7 @@ classifiers = +@@ -23,7 +23,7 @@ classifiers = install_requires = - voluptuous>=0.12.1 - elasticsearch>=7.12.0,<8.0.0 -- urllib3==1.26.4 -+ urllib3>=1.26.4 - requests>=2.25.1 - boto3>=boto3-1.17.57 - requests_aws4auth>=1.0.1 -@@ -34,7 +34,7 @@ install_requires = - setup_requires = - voluptuous>=0.12.1 - elasticsearch>=7.12.0,<8.0.0 -- urllib3==1.26.4 -+ urllib3>=1.26.4 - requests>=2.25.1 - boto3>=boto3-1.17.57 - requests_aws4auth>=1.0.1 + voluptuous>=0.12.1 + elasticsearch>=7.12.0,<8.0.0 +- urllib3==1.26.4 ++ urllib3>=1.26.4 + requests>=2.25.1 + boto3>=boto3-1.17.57 + requests_aws4auth>=1.0.1 +@@ -35,7 +35,7 @@ install_requires = + setup_requires = + voluptuous>=0.12.1 + elasticsearch>=7.12.0,<8.0.0 +- urllib3==1.26.4 ++ urllib3>=1.26.4 + requests>=2.25.1 + boto3>=boto3-1.17.57 + requests_aws4auth>=1.0.1 diff --git a/textproc/py-elasticsearch-curator/files/patch-setup.py b/textproc/py-elasticsearch-curator/files/patch-setup.py new file mode 100644 index 000000000000..ca3612a98c60 --- /dev/null +++ b/textproc/py-elasticsearch-curator/files/patch-setup.py @@ -0,0 +1,17 @@ +--- setup.py.orig 2021-11-30 13:38:11 UTC ++++ setup.py +@@ -23,12 +23,12 @@ def get_version(): + + def get_install_requires(): + res = ['elasticsearch>=7.12.0,<8.0.0' ] +- res.append('urllib3==1.26.4') ++ res.append('urllib3>=1.26.4') + res.append('requests>=2.25.1') + res.append('boto3>=1.17.57') + res.append('requests_aws4auth>=1.0.1') + res.append('click>=7.0,<8.0') +- res.append('pyyaml==5.4.1') ++ res.append('pyyaml>=5.4.1') + res.append('voluptuous>=0.12.1') + res.append('certifi>=2020.12.5') + res.append('six>=1.15.0')