diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile index 8c3ee567fcc7..2245425fba5b 100644 --- a/graphics/py-cairocffi/Makefile +++ b/graphics/py-cairocffi/Makefile @@ -1,39 +1,38 @@ PORTNAME= cairocffi -PORTVERSION= 1.2.0 +PORTVERSION= 1.4.0 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= dch@FreeBSD.org COMMENT= CFFI-based Cairo bindings for Python -WWW= https://github.com/SimonSapin/cairocffi +WWW= https://github.com/kozea/cairocffi LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xcffib>=0.3.2:x11/py-xcffib@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYNUMPY} \ +TEST_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ gdk-pixbuf2>0:graphics/gdk-pixbuf2 USES= gnome python:3.5+ USE_GNOME= cairo -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils NO_ARCH= yes # --record output is not complete so supplement autoplist w/ a plist for now # https://github.com/Kozea/cairocffi/issues/108 # _generated files only exist after install not build # so copy them to the src directory so we can run tests against WRKSRC # # -v = verbose, -rs print skip reasons, -o override tox.ini/pytest.ini args do-test: ${CP} -Rp ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/_generated ${WRKSRC}/${PORTNAME} ${TOUCH} ${WRKSRC}/${PORTNAME}/_generated/__init__.py @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= .include diff --git a/graphics/py-cairocffi/distinfo b/graphics/py-cairocffi/distinfo index eeadf3be4433..3958028587d6 100644 --- a/graphics/py-cairocffi/distinfo +++ b/graphics/py-cairocffi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1605812745 -SHA256 (cairocffi-1.2.0.tar.gz) = 9a979b500c64c8179fec286f337e8fe644eca2f2cd05860ce0b62d25f22ea140 -SIZE (cairocffi-1.2.0.tar.gz) = 70393 +TIMESTAMP = 1668630352 +SHA256 (cairocffi-1.4.0.tar.gz) = 509339b32ccd8d7b00c2204c32736cde78db53a32e6a162d312478d25626cd9a +SIZE (cairocffi-1.4.0.tar.gz) = 69851 diff --git a/graphics/py-cairocffi/files/patch-cairocffi_test__pixbuf.py b/graphics/py-cairocffi/files/patch-cairocffi_test__pixbuf.py deleted file mode 100644 index 31d163fcbcbb..000000000000 --- a/graphics/py-cairocffi/files/patch-cairocffi_test__pixbuf.py +++ /dev/null @@ -1,19 +0,0 @@ -# Skip the test (module) if gdk_pixbuf can't be loaded -# TODO: Report/resolve/PR upstream - ---- cairocffi/test_pixbuf.py.orig 2019-02-06 21:50:58 UTC -+++ cairocffi/test_pixbuf.py -@@ -15,7 +15,12 @@ import zlib - - import pytest - --from . import constants, pixbuf -+from . import constants -+ -+try: -+ from . import pixbuf -+except OSError: -+ pytestmark = pytest.mark.skip('Could not find/load gdk_pixbuf-2.0') - - PNG_BYTES = base64.b64decode( - b'iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAE0lEQV' diff --git a/graphics/py-cairocffi/files/patch-setup.cfg b/graphics/py-cairocffi/files/patch-setup.cfg index a44e23cc6ced..d9a0b2b0a797 100644 --- a/graphics/py-cairocffi/files/patch-setup.cfg +++ b/graphics/py-cairocffi/files/patch-setup.cfg @@ -1,14 +1,14 @@ # pytest-runner should be conditional on test arg provided to setup.py # it is only needed for tests, but we run pytest directly (for now) # TODO: Report/resolve upstream ---- setup.cfg.orig 2019-05-21 10:20:51 UTC +--- setup.cfg.orig 2022-11-16 20:31:48 UTC +++ setup.cfg -@@ -36,7 +36,6 @@ project_urls = - packages = find: - setup_requires = - cffi >= 1.1.0 -- pytest-runner - setuptools - install_requires = - cffi >= 1.1.0 +@@ -52,7 +52,6 @@ test = + sphinx + sphinx_rtd_theme + test = +- pytest + flake8 + isort + numpy