diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile index ac1b62bdd4b5..bb46c9099088 100644 --- a/sysutils/conan/Makefile +++ b/sysutils/conan/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= conan -DISTVERSION= 1.28.1 +DISTVERSION= 1.29.0 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP diff --git a/sysutils/conan/distinfo b/sysutils/conan/distinfo index 7d579a18d07f..87adda61af84 100644 --- a/sysutils/conan/distinfo +++ b/sysutils/conan/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597104049 -SHA256 (conan-io-conan-1.28.1_GH0.tar.gz) = 628258083cb46ad01b9807c72cc26fc75b18610fd41d2d8ce25b77ece2b4fe93 -SIZE (conan-io-conan-1.28.1_GH0.tar.gz) = 1138639 +TIMESTAMP = 1599151193 +SHA256 (conan-io-conan-1.29.0_GH0.tar.gz) = 431a6fe7362754a2ace41568bdcf326a858ac09fc9bef4c3e3d3abeaf3719b05 +SIZE (conan-io-conan-1.29.0_GH0.tar.gz) = 1149962 diff --git a/sysutils/conan/files/patch-conans_requirements.txt b/sysutils/conan/files/patch-conans_requirements.txt index 7e1035bc160b..4e69a0aff7c7 100644 --- a/sysutils/conan/files/patch-conans_requirements.txt +++ b/sysutils/conan/files/patch-conans_requirements.txt @@ -1,11 +1,11 @@ ---- conans/requirements.txt.orig 2020-06-10 07:13:38 UTC +--- conans/requirements.txt.orig 2020-09-02 09:40:01 UTC +++ conans/requirements.txt @@ -6,11 +6,11 @@ PyYAML>=3.11, <6.0 patch-ng>=1.17.4, <1.18 fasteners>=0.14.1 - six>=1.10.0,<=1.14.0 + six>=1.10.0,<=1.15.0 -node-semver==0.6.1 --distro>=1.0.2, <1.2.0 +-distro>=1.0.2, <=1.5.0 +node-semver>=0.6.1 +distro>=1.0.2 future>=0.16.0, <0.19.0