1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

devel/py-path.py: update to 11.5.2

- Connect tests to the framework
- Define LICENSE_FILE as MIT has many styles
- Skip later versions due to lack of Python 2 support
- Take maintainership

Changes:	https://github.com/jaraco/path.py/compare/8.1.2...11.5.2
PR:		241112
Approved by:	wg (maintainer)
MFH:		2019Q4 (www/py-flexget stability fix)
This commit is contained in:
Jan Beich 2019-10-07 13:14:52 +00:00
parent ae16cb6f1b
commit 240e158566
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=513945
4 changed files with 20 additions and 78 deletions

View File

@ -1,24 +1,33 @@
# $FreeBSD$
PORTNAME= path.py
PORTVERSION= 8.1.2
PORTVERSION= 11.5.2
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wg@FreeBSD.org
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}
NO_ARCH= yes
USES= python
USE_PYTHON= autoplist distutils
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}/${PYSETUP}
-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>

View File

@ -1,2 +1,3 @@
SHA256 (jaraco-path.py-8.1.2_GH0.tar.gz) = 23fbc7f2a25e5696af5afccd851a931f9fca82d7dd123953cec9d369951b4c79
SIZE (jaraco-path.py-8.1.2_GH0.tar.gz) = 32400
TIMESTAMP = 1554787860
SHA256 (jaraco-path.py-11.5.2_GH0.tar.gz) = 0e7af2bd797a35ca402d8652bac853576070ad542b2969fcc97fa7d3f3f7ff41
SIZE (jaraco-path.py-11.5.2_GH0.tar.gz) = 40303

View File

@ -3,6 +3,7 @@
PORTNAME= flexget
PORTVERSION= 2.21.22
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -21,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>0:databases/py-sqlalchemy12@${P
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}path.py<10.6:devel/py-path.py@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}path.py>=10.6:devel/py-path.py@${PY_FLAVOR} \
${PY_PATHLIB} \
${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}yaml>=4.2:devel/py-yaml@${PY_FLAVOR} \

View File

@ -1,69 +0,0 @@
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