diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-10-03 02:18:13 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-10-03 02:22:56 +0000 |
| commit | 4c3ba3f3a06df5c2c85eaa826bc04c0c25670156 (patch) | |
| tree | e093e589bfbd35ddc3384936fb3cd42fb69da064 | |
| parent | 163bbc1f3fd8ab6e77c8ed27746dc3277f0f7f04 (diff) | |
| download | ports-4c3ba3f3a06df5c2c85eaa826bc04c0c25670156.tar.gz ports-4c3ba3f3a06df5c2c85eaa826bc04c0c25670156.zip | |
sysutils/conan: Allow build with py-yaml 6.0
- While I'm here, remove superfluous , in *_DEPENDS
from conans/requirements.txt:
PyYAML>=3.11, <=6.0
Approved by: portmgr (blanket)
With hat: python
| -rw-r--r-- | sysutils/conan/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile index 03ba6759b992..88a299aaf382 100644 --- a/sysutils/conan/Makefile +++ b/sysutils/conan/Makefile @@ -12,24 +12,24 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md PY_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}bottle>=0.12.8:www/py-bottle@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3,<0.5.0:devel/py-colorama@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.0,<3:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3<0.5.0:devel/py-colorama@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.0<3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}deprecation>=2.0:devel/py-deprecation@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distro>=1.0.2:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fasteners>=0.14.1:devel/py-fasteners@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0,<0.19.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0<0.19.0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}node-semver>=0.6.1:devel/py-node-semver@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4,<1.18:devel/py-patch-ng@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4<1.18:devel/py-patch-ng@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluginbase>=0.5:devel/py-pluginbase@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.0,<3.0:textproc/py-pygments@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.4.0,<3.0.0:www/py-pyjwt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.25,<3.0.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0,<=1.16.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.0<3.0:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.4.0<3.0.0:www/py-pyjwt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.25<3.0.0:www/py-requests@${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.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} + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1<5:misc/py-tqdm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11<6.0_99:devel/py-yaml@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} |