From owner-dev-commits-ports-all@freebsd.org Sat Jul 24 20:33:10 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A162666710F; Sat, 24 Jul 2021 20:33:10 +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 4GXHv95ktJz3ml3; Sat, 24 Jul 2021 20:33:09 +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 64D0C17209; Sat, 24 Jul 2021 20:33:09 +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 16OKX9pl009060; Sat, 24 Jul 2021 20:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16OKX9be009059; Sat, 24 Jul 2021 20:33:09 GMT (envelope-from git) Date: Sat, 24 Jul 2021 20:33:09 GMT Message-Id: <202107242033.16OKX9be009059@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: 5ce23cd9176f - main - sysutils/conan: Fix build with py-urllib3 1.26.5 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: 5ce23cd9176fa1c5037b22db0f2d9e359568016a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2021 20:33:11 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ce23cd9176fa1c5037b22db0f2d9e359568016a commit 5ce23cd9176fa1c5037b22db0f2d9e359568016a Author: Po-Chuan Hsieh AuthorDate: 2021-07-24 20:24:12 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-07-24 20:24:12 +0000 sysutils/conan: Fix build with py-urllib3 1.26.5 - While I'm here, update version requirement of RUN_DEPENDS --- sysutils/conan/Makefile | 2 +- sysutils/conan/files/patch-conans_requirements.txt | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile index 43d3f7ed9ba7..077fcc435675 100644 --- a/sysutils/conan/Makefile +++ b/sysutils/conan/Makefile @@ -26,7 +26,7 @@ PY_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}requests>=2.8.1,<3.0.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.8:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.8,1<1.27,1:net/py-urllib3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} diff --git a/sysutils/conan/files/patch-conans_requirements.txt b/sysutils/conan/files/patch-conans_requirements.txt index 4e69a0aff7c7..6f66d84d9cfa 100644 --- a/sysutils/conan/files/patch-conans_requirements.txt +++ b/sysutils/conan/files/patch-conans_requirements.txt @@ -1,6 +1,12 @@ ---- conans/requirements.txt.orig 2020-09-02 09:40:01 UTC +--- conans/requirements.txt.orig 2021-06-30 14:03:08 UTC +++ conans/requirements.txt -@@ -6,11 +6,11 @@ PyYAML>=3.11, <6.0 +@@ -1,16 +1,16 @@ + PyJWT>=1.4.0, <2.0.0 + requests>=2.8.1, <3.0.0 +-urllib3>=1.25.8, <1.26 ++urllib3>=1.25.8, <1.27 + colorama>=0.3.3, <0.5.0 + PyYAML>=3.11, <6.0 patch-ng>=1.17.4, <1.18 fasteners>=0.14.1 six>=1.10.0,<=1.15.0 @@ -13,5 +19,5 @@ -deprecation>=2.0, <2.1 +deprecation>=2.0 tqdm>=4.28.1, <5 - Jinja2>=2.3, <3 + Jinja2>=2.9, <3 python-dateutil>=2.7.0, <3