diff --git a/devel/py-python-gitlab/Makefile b/devel/py-python-gitlab/Makefile index bc0e5be6b1dd..63d4a740a548 100644 --- a/devel/py-python-gitlab/Makefile +++ b/devel/py-python-gitlab/Makefile @@ -1,69 +1,70 @@ PORTNAME= python-gitlab -DISTVERSION= 5.0.0 +DISTVERSION= 5.1.0 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME?= ${PORTNAME:S/-/_/}-${DISTVERSIONFULL} +DISTNAME= ${PORTNAME:S/-/_/}-${DISTVERSIONFULL} MAINTAINER= dereks@lifeofadishwasher.com COMMENT= Interact with GitLab API WWW= https://github.com/python-gitlab/python-gitlab LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61.0.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=1.0.0:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.32.0:www/py-requests@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-console-scripts>0:devel/py-pytest-console-scripts@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${PY_FLAVOR} USES= python:3.9+ USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes SUB_FILES= pkg-message OPTIONS_DEFINE= AUTOCOMPLETE DOCS GRAPHQL YAML -OPTIONS_DEFAULT= AUTOCOMPLETE YAML +OPTIONS_DEFAULT= AUTOCOMPLETE GRAPHQL YAML AUTOCOMPLETE_DESC= Autocompletion via argcomplete GRAPHQL_DESC= GraphQL support YAML_DESC= YAML output AUTOCOMPLETE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.10.0<4:devel/py-argcomplete@${PY_FLAVOR} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.10.1:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.25.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=4.3.1,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-autoprogram>0:textproc/py-sphinxcontrib-autoprogram@${PY_FLAVOR} DOCS_PORTDOCS= * -GRAPHQL_BROKEN= GRAPHQL GRAPHQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gql>=3.5<4:devel/py-gql@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httpx>0:www/py-httpx@${PY_FLAVOR} +GRAPHQL_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}respx>0:www/py-respx@${PY_FLAVOR} + YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.2:devel/py-pyyaml@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}/etc|g' ${WRKSRC}/gitlab/config.py do-build-DOCS-on:: (cd ${WRKSRC} && sphinx-build -j auto -n -W --keep-going -b html docs build/sphinx/html) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && \ ${RM} -r .doctrees && \ ${RM} .buildinfo objects.inv && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests/unit .include diff --git a/devel/py-python-gitlab/distinfo b/devel/py-python-gitlab/distinfo index 0230ee5d1016..a42fc7e341c0 100644 --- a/devel/py-python-gitlab/distinfo +++ b/devel/py-python-gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1730466683 -SHA256 (python_gitlab-5.0.0.tar.gz) = d156b9810d2a5c2916226cecf354956286a9e8133ee707d6584e40f126329956 -SIZE (python_gitlab-5.0.0.tar.gz) = 486119 +TIMESTAMP = 1732841331 +SHA256 (python_gitlab-5.1.0.tar.gz) = d5a10dae8328f32fb9214bd3f9dc199b4930cd496f81c9be42a0f8ff338aeb35 +SIZE (python_gitlab-5.1.0.tar.gz) = 384162 diff --git a/devel/py-python-gitlab/files/patch-CHANGELOG.md b/devel/py-python-gitlab/files/patch-CHANGELOG.md new file mode 100644 index 000000000000..cf22efe932bf --- /dev/null +++ b/devel/py-python-gitlab/files/patch-CHANGELOG.md @@ -0,0 +1,32 @@ +--- CHANGELOG.md.orig 2024-11-29 01:52:15 UTC ++++ CHANGELOG.md +@@ -7596,7 +7596,12 @@ - **readme**: Fix Docker image reference + - **readme**: Fix Docker image reference + ([`b9a40d8`](https://github.com/python-gitlab/python-gitlab/commit/b9a40d822bcff630a4c92c395c134f8c002ed1cb)) + +-v1.8.0 is not available. ``` Unable to find image ++ v1.8.0 is not available. ++ ``` ++ Unable to find image 'registry.gitlab.com/python-gitlab/python-gitlab:v1.8.0' locally ++ docker: Error response from daemon: manifest for registry.gitlab.com/python-gitlab/python-gitlab:v1.8.0 not found: manifest unknown: manifest unknown. ++ ``` ++ + 'registry.gitlab.com/python-gitlab/python-gitlab:v1.8.0' locally docker: Error response from + daemon: manifest for registry.gitlab.com/python-gitlab/python-gitlab:v1.8.0 not found: manifest + unknown: manifest unknown. ``` +@@ -7928,9 +7933,12 @@ The integration tests failed because a test called 'de + GitLabException class handles byte-to-string conversion already in its __init__. This commit + removes the call to 'decode()' in the test. + +-``` Traceback (most recent call last): File "./tools/python_test_v4.py", line 801, in +- assert 'Retry later' in error_message.decode() AttributeError: 'str' object has no attribute +- 'decode' ``` ++ ``` ++ Traceback (most recent call last): ++ File "./tools/python_test_v4.py", line 801, in ++ assert 'Retry later' in error_message.decode() ++ AttributeError: 'str' object has no attribute 'decode' ++ ``` + + - Handle empty 'Retry-After' header from GitLab + ([`7a3724f`](https://github.com/python-gitlab/python-gitlab/commit/7a3724f3fca93b4f55aed5132cf46d3718c4f594)) diff --git a/devel/py-python-gitlab/files/patch-tests_unit_test__graphql.py b/devel/py-python-gitlab/files/patch-tests_unit_test__graphql.py deleted file mode 100644 index 8a945f152b50..000000000000 --- a/devel/py-python-gitlab/files/patch-tests_unit_test__graphql.py +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/unit/test_graphql.py.orig 2024-09-15 19:09:56 UTC -+++ tests/unit/test_graphql.py -@@ -1,5 +1,7 @@ --import httpx - import pytest -+ -+pytest.skip(reason="gql is missing from ports", allow_module_level=True) -+import httpx - import respx - - import gitlab