From owner-dev-commits-ports-all@freebsd.org Mon Sep 13 22:30:16 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 5D0236AA8E3; Mon, 13 Sep 2021 22:30:16 +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 4H7h4l5pMwz4YYS; Mon, 13 Sep 2021 22:30:15 +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 68060762A; Mon, 13 Sep 2021 22:30:15 +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 18DMUFYc064209; Mon, 13 Sep 2021 22:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18DMUF9K064202; Mon, 13 Sep 2021 22:30:15 GMT (envelope-from git) Date: Mon, 13 Sep 2021 22:30:15 GMT Message-Id: <202109132230.18DMUF9K064202@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 506f1d5ee7cb - main - sysutils/conan: Update 1.39.0 -> 1.40.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 506f1d5ee7cbee990050093dd175890bac2a9dd8 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: Mon, 13 Sep 2021 22:30:16 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=506f1d5ee7cbee990050093dd175890bac2a9dd8 commit 506f1d5ee7cbee990050093dd175890bac2a9dd8 Author: Yuri Victorovich AuthorDate: 2021-09-13 22:28:33 +0000 Commit: Yuri Victorovich CommitDate: 2021-09-13 22:29:00 +0000 sysutils/conan: Update 1.39.0 -> 1.40.0 --- sysutils/conan/Makefile | 10 +++++----- sysutils/conan/distinfo | 6 +++--- sysutils/conan/files/patch-conans_requirements.txt | 23 ---------------------- 3 files changed, 8 insertions(+), 31 deletions(-) diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile index 121b88c68000..217a8cb1e881 100644 --- a/sysutils/conan/Makefile +++ b/sysutils/conan/Makefile @@ -1,5 +1,5 @@ PORTNAME= conan -DISTVERSION= 1.39.0 +DISTVERSION= 1.40.0 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP @@ -24,11 +24,11 @@ PY_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.0,<3.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0,<2.0.0:www/py-pyjwt@${PY_FLAVOR} \ ${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}six>=1.10.0,<=1.16.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${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} + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.6,1<1.27,1:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1,<5:misc/py-tqdm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11,<6.0:devel/py-yaml@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} diff --git a/sysutils/conan/distinfo b/sysutils/conan/distinfo index caf90c376a8f..fbc7f989a28f 100644 --- a/sysutils/conan/distinfo +++ b/sysutils/conan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628045351 -SHA256 (conan-1.39.0.tar.gz) = 7f1fa90578f84d5801e53cce6aa7c98ed97a99fb2b38b3f12a5d9784722340e0 -SIZE (conan-1.39.0.tar.gz) = 690131 +TIMESTAMP = 1631571737 +SHA256 (conan-1.40.0.tar.gz) = 73528ed6517635c37b61876b13e63eefbbb3d634421f4821e080f5ab39467ccb +SIZE (conan-1.40.0.tar.gz) = 694881 diff --git a/sysutils/conan/files/patch-conans_requirements.txt b/sysutils/conan/files/patch-conans_requirements.txt deleted file mode 100644 index 6f66d84d9cfa..000000000000 --- a/sysutils/conan/files/patch-conans_requirements.txt +++ /dev/null @@ -1,23 +0,0 @@ ---- conans/requirements.txt.orig 2021-06-30 14:03:08 UTC -+++ conans/requirements.txt -@@ -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 --node-semver==0.6.1 --distro>=1.0.2, <=1.5.0 -+node-semver>=0.6.1 -+distro>=1.0.2 - future>=0.16.0, <0.19.0 - pygments>=2.0, <3.0 --deprecation>=2.0, <2.1 -+deprecation>=2.0 - tqdm>=4.28.1, <5 - Jinja2>=2.9, <3 - python-dateutil>=2.7.0, <3