View | Details | Raw Unified | Return to bug 258595 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/py-watchdog/Makefile (-9 / +8 lines)
Lines 1-5 Link Here
1
PORTNAME=	watchdog
1
PORTNAME=	watchdog
2
PORTVERSION=	0.10.6
2
PORTVERSION=	2.1.5
3
CATEGORIES=	devel python
3
CATEGORIES=	devel python
4
MASTER_SITES=	CHEESESHOP
4
MASTER_SITES=	CHEESESHOP
5
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
5
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 9-20 COMMENT= Python API library to monitor file system events Link Here
9
9
10
LICENSE=	APACHE20
10
LICENSE=	APACHE20
11
11
12
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${PY_FLAVOR} \
12
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}argh>=0.24.1:devel/py-argh@${PY_FLAVOR} \
13
		${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \
13
		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
14
		${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
16
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
14
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR}
15
		${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR}
18
16
19
USES=		python:3.6+
17
USES=		python:3.6+
20
USE_PYTHON=	autoplist concurrent distutils
18
USE_PYTHON=	autoplist concurrent distutils
Lines 25-34 NO_ARCH= yes Link Here
25
23
26
PORTDOCS=	*
24
PORTDOCS=	*
27
25
26
TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
27
28
OPTIONS_DEFINE=	DOCS
28
OPTIONS_DEFINE=	DOCS
29
29
30
DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${PY_FLAVOR} \
30
DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
31
		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
32
31
33
post-build-DOCS-on:
32
post-build-DOCS-on:
34
	(cd ${WRKSRC}/docs ; ${MAKE_CMD} SPHINXBUILD=sphinx-build-${PYTHON_VER} html)
33
	(cd ${WRKSRC}/docs ; ${MAKE_CMD} SPHINXBUILD=sphinx-build-${PYTHON_VER} html)
Lines 39-44 post-install-DOCS-on: Link Here
39
	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo")
38
	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -name .buildinfo")
40
39
41
do-test:
40
do-test:
42
	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests
41
	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts= tests
43
42
44
.include <bsd.port.mk>
43
.include <bsd.port.mk>
(-)b/devel/py-watchdog/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1612010670
1
TIMESTAMP = 1631895216
2
SHA256 (watchdog-0.10.6.tar.gz) = 1e1ea6d3d74feca5c62393525107aa45c5d4cd15199e2a5f62b1a6ca83679131
2
SHA256 (watchdog-2.1.5.tar.gz) = 5563b005907613430ef3d4aaac9c78600dd5704e84764cb6deda4b3d72807f09
3
SIZE (watchdog-0.10.6.tar.gz) = 99949
3
SIZE (watchdog-2.1.5.tar.gz) = 114220
(-)b/devel/py-watchdog/files/patch-src_watchdog_observers_kqueue.py (+25 lines)
Added Link Here
1
Restore original return value of "absolute_path" as is was done by "pathtools".
2
3
Obtained from:
4
https://github.com/gorakhargosh/watchdog/commit/b9774e9e6e8dcbb7d2e0786eb13ab30848ed1514
5
6
--- src/watchdog/observers/kqueue.py.orig	2021-09-18 09:02:58 UTC
7
+++ src/watchdog/observers/kqueue.py
8
@@ -76,8 +76,6 @@ import os
9
 import os.path
10
 import select
11
 
12
-from pathlib import Path
13
-
14
 from watchdog.observers.api import (
15
     BaseObserver,
16
     EventEmitter,
17
@@ -127,7 +125,7 @@ WATCHDOG_KQ_FFLAGS = (
18
 
19
 
20
 def absolute_path(path):
21
-    return Path(path).resolve()
22
+    return os.path.abspath(os.path.normpath(path))
23
 
24
 # Flag tests.
25
 
(-)b/devel/py-watchdog/files/patch-tests_test__emitter.py (+26 lines)
Added Link Here
1
Skip some checks for BSD
2
3
* Test "test_delete_self()" was tested only on Darwin platforms in 0.10.6
4
* Test "file_lifecyle" was introduced in 2.0.0
5
6
Obtained from:
7
https://github.com/gorakhargosh/watchdog/commit/b9774e9e6e8dcbb7d2e0786eb13ab30848ed1514
8
9
--- tests/test_emitter.py.orig	2021-09-18 09:50:34 UTC
10
+++ tests/test_emitter.py
11
@@ -355,6 +355,7 @@ def test_separate_consecutive_moves():
12
 
13
 
14
 @pytest.mark.flaky(max_runs=5, min_passes=1, rerun_filter=rerun_filter)
15
+@pytest.mark.skipif(platform.is_bsd(), reason="BSD create another set of events for this test")
16
 def test_delete_self():
17
     mkdir(p('dir1'))
18
     start_watching(p('dir1'))
19
@@ -642,6 +643,7 @@ def test_move_nested_subdirectories_on_windows():
20
 
21
 
22
 @pytest.mark.flaky(max_runs=5, min_passes=1, rerun_filter=rerun_filter)
23
+@pytest.mark.skipif(platform.is_bsd(), reason="BSD create another set of events for this test")
24
 def test_file_lifecyle():
25
     start_watching()
26
 

Return to bug 258595