Attachment #208149 for bug #241112




# $FreeBSD$

PORTNAME=	path.py
PORTVERSION=	11.5.2
CATEGORIES=	devel python
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	jbeich@FreeBSD.org
COMMENT=	Module wrapper for os.path

LICENSE=	MIT
LICENSE_FILE=	${WRKSRC}/LICENSE

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.5:devel/py-importlib-metadata@${PY_FLAVOR}
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytest-flake8>0:devel/py-pytest-flake8@${PY_FLAVOR}

USES=		python
USE_GITHUB=	yes
USE_PYTHON=	autoplist distutils
GH_ACCOUNT=	jaraco

PORTSCOUT=	limit:^11\. # ignore py3-only for now

post-patch:
	@${REINPLACE_CMD} -e '/setuptools_scm/d' \
		-e 's/use_scm_version=True/version="${PORTVERSION}"/' \
		${WRKSRC}/setup.*

do-test:
	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/devel/py-path.py/distinfo (-2 / +3 lines)
1	SHA256 (jaraco-path.py-8.1.2_GH0.tar.gz) = 23fbc7f2a25e5696af5afccd851a931f9fca82d7dd123953cec9d369951b4c79	1	TIMESTAMP = 1554787860
2	SIZE (jaraco-path.py-8.1.2_GH0.tar.gz) = 32400	2	SHA256 (jaraco-path.py-11.5.2_GH0.tar.gz) = 0e7af2bd797a35ca402d8652bac853576070ad542b2969fcc97fa7d3f3f7ff41
		3	SIZE (jaraco-path.py-11.5.2_GH0.tar.gz) = 40303

Lines 3-8 Link Here

(-)b/www/py-flexget/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= flexget	4	PORTNAME= flexget
5	PORTVERSION= 2.21.22	5	PORTVERSION= 2.21.22
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= www python	8	CATEGORIES= www python
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 21-27 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${P Link Here
21	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema@${PY_FLAVOR} \	24	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}path.py<10.6:devel/py-path.py@${PY_FLAVOR} \	25	${PYTHON_PKGNAMEPREFIX}path.py>=10.6:devel/py-path.py@${PY_FLAVOR} \
25	${PY_PATHLIB} \	26	${PY_PATHLIB} \
26	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR} \	27	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}yaml>=4.2:devel/py-yaml@${PY_FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}yaml>=4.2:devel/py-yaml@${PY_FLAVOR} \




Revert https://github.com/Flexget/Flexget/commit/0a401204a107

--- flexget/api/core/server.py.orig	2019-05-25 02:03:39 UTC
+++ flexget/api/core/server.py
@@ -571,6 +571,6 @@ class ServerCrashLogAPI(APIResource):
         path = Path(self.manager.config_base)
         crashes = [
             {'name': file.name, 'content': file.open().readlines()}
-            for file in path.listdir(match='crash_report*.log')
+            for file in path.listdir(pattern='crash_report*.log')
         ]
         return jsonify(crashes)
--- flexget/plugin.py.orig	2019-05-25 02:03:39 UTC
+++ flexget/plugin.py
@@ -476,7 +476,7 @@ def _load_plugins_from_dirs(dirs):
                 _f for _f in plugin_path.relpath(plugins_dir).parent.splitall() if _f
             ]
             module_name = '.'.join(
-                [plugins_pkg.__name__] + plugin_subpackages + [plugin_path.stem]
+                [plugins_pkg.__name__] + plugin_subpackages + [plugin_path.namebase]
             )
             _import_plugin(module_name, plugin_path)
     _check_phase_queue()
@@ -498,7 +498,7 @@ def _load_components_from_dirs(dirs):
                 _f for _f in component_path.relpath(component_dir).parent.splitall() if _f
             ]
             package_name = '.'.join(
-                [components_pkg.__name__] + plugin_subpackages + [component_path.stem]
+                [components_pkg.__name__] + plugin_subpackages + [component_path.namebase]
             )
             _import_plugin(package_name, component_path)
     _check_phase_queue()
--- flexget/plugins/input/filesystem.py.orig	2019-05-25 02:03:39 UTC
+++ flexget/plugins/input/filesystem.py
@@ -129,7 +129,7 @@ class Filesystem(object):
             entry['url'] = pathlib.Path(filepath).absolute().as_uri()
         entry['filename'] = filepath.name
         if filepath.isfile():
-            entry['title'] = filepath.stem
+            entry['title'] = filepath.namebase
         else:
             entry['title'] = filepath.name
         try:
--- flexget/tests/test_filesystem.py.orig	2019-05-25 02:03:39 UTC
+++ flexget/tests/test_filesystem.py
@@ -137,10 +137,10 @@ class TestFilesystem(object):
                     task_name,
                     file,
                 )
-                assert task.find_entry(title=file.stem), assertion_error
+                assert task.find_entry(title=file.namebase), assertion_error
             else:
                 assertion_error = 'Failed %s %s test, found %s' % (test_type, task_name, file)
-                assert not task.find_entry(title=file.stem), assertion_error
+                assert not task.find_entry(title=file.namebase), assertion_error
 
     def test_string(self, execute_task):
         task_name = 'string'
--- requirements.txt.orig	2019-05-25 02:03:39 UTC
+++ requirements.txt
@@ -13,7 +13,7 @@ jinja2~=2.10
 requests>=2.20.0
 python-dateutil
 jsonschema>=2.0
-path.py>=10.6
+path.py>=8.1.1,<10.6
 pathlib>=1.0; python_version<'3.4'
 guessit==3.0.3
 rebulk>=0.9.0

Return to bug 241112

Lines 1-24 Link Here

(-)b/devel/py-path.py/Makefile (-6 / +15 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= path.py	3	PORTNAME= path.py
4	PORTVERSION= 8.1.2	4	PORTVERSION= 11.5.2
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		7
8	MAINTAINER= wg@FreeBSD.org	8	MAINTAINER= jbeich@FreeBSD.org
9	COMMENT= Module wrapper for os.path	9	COMMENT= Module wrapper for os.path
10		10
11	LICENSE= MIT	11	LICENSE= MIT
		12	LICENSE_FILE= ${WRKSRC}/LICENSE
12		13
13	USES= python	14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0.5:devel/py-importlib-metadata@${PY_FLAVOR}
14	USE_PYTHON= autoplist distutils	15	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
		16	${PYTHON_PKGNAMEPREFIX}pytest-flake8>0:devel/py-pytest-flake8@${PY_FLAVOR}
15		17
		18	USES= python
16	USE_GITHUB= yes	19	USE_GITHUB= yes
		20	USE_PYTHON= autoplist distutils
17	GH_ACCOUNT= jaraco	21	GH_ACCOUNT= jaraco
18		22
		23	PORTSCOUT= limit:^11\. # ignore py3-only for now
		24
19	post-patch:	25	post-patch:
20	@${REINPLACE_CMD} -e '/setuptools_scm/d' \	26	@${REINPLACE_CMD} -e '/setuptools_scm/d' \
21	-e 's/use_scm_version=True,/version="${PORTVERSION}",/' \	27	-e 's/use_scm_version=True/version="${PORTVERSION}"/' \
22	${WRKSRC}/${PYSETUP}	28	${WRKSRC}/setup.*
		29
		30	do-test:
		31	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
23		32
24	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Removed Link Here

(-)a/www/py-flexget/files/patch-02-path.py-8.1 (-69 lines)
1	Revert https://github.com/Flexget/Flexget/commit/0a401204a107
2
3	--- flexget/api/core/server.py.orig 2019-05-25 02:03:39 UTC
4	+++ flexget/api/core/server.py
5	@@ -571,6 +571,6 @@ class ServerCrashLogAPI(APIResource):
6	path = Path(self.manager.config_base)
7	crashes = [
8	{'name': file.name, 'content': file.open().readlines()}
9	- for file in path.listdir(match='crash_report*.log')
10	+ for file in path.listdir(pattern='crash_report*.log')
11	]
12	return jsonify(crashes)
13	--- flexget/plugin.py.orig 2019-05-25 02:03:39 UTC
14	+++ flexget/plugin.py
15	@@ -476,7 +476,7 @@ def _load_plugins_from_dirs(dirs):
16	_f for _f in plugin_path.relpath(plugins_dir).parent.splitall() if _f
17	]
18	module_name = '.'.join(
19	- [plugins_pkg.__name__] + plugin_subpackages + [plugin_path.stem]
20	+ [plugins_pkg.__name__] + plugin_subpackages + [plugin_path.namebase]
21	)
22	_import_plugin(module_name, plugin_path)
23	_check_phase_queue()
24	@@ -498,7 +498,7 @@ def _load_components_from_dirs(dirs):
25	_f for _f in component_path.relpath(component_dir).parent.splitall() if _f
26	]
27	package_name = '.'.join(
28	- [components_pkg.__name__] + plugin_subpackages + [component_path.stem]
29	+ [components_pkg.__name__] + plugin_subpackages + [component_path.namebase]
30	)
31	_import_plugin(package_name, component_path)
32	_check_phase_queue()
33	--- flexget/plugins/input/filesystem.py.orig 2019-05-25 02:03:39 UTC
34	+++ flexget/plugins/input/filesystem.py
35	@@ -129,7 +129,7 @@ class Filesystem(object):
36	entry['url'] = pathlib.Path(filepath).absolute().as_uri()
37	entry['filename'] = filepath.name
38	if filepath.isfile():
39	- entry['title'] = filepath.stem
40	+ entry['title'] = filepath.namebase
41	else:
42	entry['title'] = filepath.name
43	try:
44	--- flexget/tests/test_filesystem.py.orig 2019-05-25 02:03:39 UTC
45	+++ flexget/tests/test_filesystem.py
46	@@ -137,10 +137,10 @@ class TestFilesystem(object):
47	task_name,
48	file,
49	)
50	- assert task.find_entry(title=file.stem), assertion_error
51	+ assert task.find_entry(title=file.namebase), assertion_error
52	else:
53	assertion_error = 'Failed %s %s test, found %s' % (test_type, task_name, file)
54	- assert not task.find_entry(title=file.stem), assertion_error
55	+ assert not task.find_entry(title=file.namebase), assertion_error
56
57	def test_string(self, execute_task):
58	task_name = 'string'
59	--- requirements.txt.orig 2019-05-25 02:03:39 UTC
60	+++ requirements.txt
61	@@ -13,7 +13,7 @@ jinja2~=2.10
62	requests>=2.20.0
63	python-dateutil
64	jsonschema>=2.0
65	-path.py>=10.6
66	+path.py>=8.1.1,<10.6
67	pathlib>=1.0; python_version<'3.4'
68	guessit==3.0.3
69	rebulk>=0.9.0