Date: Sun, 7 Apr 2019 19:09:10 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498308 - in head/textproc/scancode-toolkit: . files Message-ID: <201904071909.x37J9Apl018069@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Sun Apr 7 19:09:10 2019 New Revision: 498308 URL: https://svnweb.freebsd.org/changeset/ports/498308 Log: textproc/scancode-toolkit: Update to 3.0.2 * Update the patch for "setup.py" to relax the version ranges * Update the paths for the plugin "extractcode-libarchive" in the do-{build,install} targets * Remove the patch for "extractcode_libarchive2.py" that is no longer required Changelog (since 2.9.7 / summary): API changes: * Streamline Package models. In particular the way checksums are managed has changed * In Package models, rename normalized_license to license_expression and add license detection on the declared_license to populate the license_expression Improvements for license / package detections: * Add new and improved licenses and license detection rules * Improve package summaries. Add new plugin to improve package classification Command line: * Always delete temporary files when no longer needed. * Add a new --keep-temp-files option to keep temp files which is false by default. Internals: * Improve reusing resource.VirtualCode * Place all third-party packages under thirdparty and update ABOUT files Outputs: * The html-app output is marked as DEPRECATED. Use the AboutCode manager app instead * Ensure HTML outputs can deal with non-ASCII file paths without crashsing * JSON outputs now use a "headers" attributes for top-level scan headers * SPDX output is now possible even without "--info" SHA1 checksums. This creates a partially valid document * LicenseRef for non-SPDX ScanCode licenses are named as "LicenseRef-scancode-<scancode key>" * license_expression are correctly included in the CSV output * Do not crash with multiple outputs * Ensure CSV output include packages https://github.com/nexB/scancode-toolkit/blob/v3.0.2/CHANGELOG.rst Approved by: mentors (implicit) Deleted: head/textproc/scancode-toolkit/files/patch-src_extractcode_libarchive2.py Modified: head/textproc/scancode-toolkit/Makefile head/textproc/scancode-toolkit/distinfo head/textproc/scancode-toolkit/files/patch-setup.py Modified: head/textproc/scancode-toolkit/Makefile ============================================================================== --- head/textproc/scancode-toolkit/Makefile Sun Apr 7 18:55:13 2019 (r498307) +++ head/textproc/scancode-toolkit/Makefile Sun Apr 7 19:09:10 2019 (r498308) @@ -2,8 +2,7 @@ PORTNAME= scancode-toolkit DISTVERSIONPREFIX= v -DISTVERSION= 2.9.7 -PORTREVISION= 1 +DISTVERSION= 3.0.2 CATEGORIES= textproc python MAINTAINER= kai@FreeBSD.org @@ -27,7 +26,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>=3.2:textproc ${PYTHON_PKGNAMEPREFIX}boolean.py>=3.5:devel/py-boolean.py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}license-expression>=0.99:textproc/py-license-expression@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyahocorasick>=1.1:textproc/py-pyahocorasick@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}saneyaml>=0:devel/py-saneyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=4.0.0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0.0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ @@ -40,8 +40,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>=3.2:textproc ${PYTHON_PKGNAMEPREFIX}pefile>=2018.8.8:devel/py-pefile@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymaven-patch>=0.2.4:devel/py-pymaven-patch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}packageurl-python>=0.5.0:textproc/py-packageurl-python@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packageurl-python>=0.7.0:textproc/py-packageurl-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.11.0:devel/py-xmltodict@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}javaproperties>=0.5:devel/py-javaproperties@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click6>=6.0.0:devel/py-click6@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>=0.4.0:devel/py-pluggy@${PY_FLAVOR} \ @@ -101,7 +102,7 @@ do-build: # Build the port and the plugin packages @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) @(cd ${BUILD_WRKSRC}/plugins/extractcode-7z-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) - @(cd ${BUILD_WRKSRC}/plugins/extractcode-libarchive-manylinux1_i686; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) + @(cd ${BUILD_WRKSRC}/plugins/extractcode-libarchive-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) @(cd ${BUILD_WRKSRC}/plugins/typecode-libmagic-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) do-install: @@ -111,7 +112,7 @@ do-install: @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.scancode (cd ${INSTALL_WRKSRC}/plugins/extractcode-7z-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.extractcode-7z - (cd ${INSTALL_WRKSRC}/plugins/extractcode-libarchive-manylinux1_i686; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) + (cd ${INSTALL_WRKSRC}/plugins/extractcode-libarchive-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.extractcode-libarchive (cd ${INSTALL_WRKSRC}/plugins/typecode-libmagic-manylinux1_x86_64; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) @${MV} ${_PYTHONPKGLIST} ${_PYTHONPKGLIST}.typecode-libmagic Modified: head/textproc/scancode-toolkit/distinfo ============================================================================== --- head/textproc/scancode-toolkit/distinfo Sun Apr 7 18:55:13 2019 (r498307) +++ head/textproc/scancode-toolkit/distinfo Sun Apr 7 19:09:10 2019 (r498308) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540635003 -SHA256 (nexB-scancode-toolkit-v2.9.7_GH0.tar.gz) = 717249edb32ffc65668f21c9b7630932e7d5fad713954c53892afaa8bc1e935d -SIZE (nexB-scancode-toolkit-v2.9.7_GH0.tar.gz) = 173522172 +TIMESTAMP = 1550756233 +SHA256 (nexB-scancode-toolkit-v3.0.2_GH0.tar.gz) = 2c11bc028e0ad47d9e72d70f5985a58a3c8b02c81805f6518fb4249818ed6648 +SIZE (nexB-scancode-toolkit-v3.0.2_GH0.tar.gz) = 137311091 Modified: head/textproc/scancode-toolkit/files/patch-setup.py ============================================================================== --- head/textproc/scancode-toolkit/files/patch-setup.py Sun Apr 7 18:55:13 2019 (r498307) +++ head/textproc/scancode-toolkit/files/patch-setup.py Sun Apr 7 19:09:10 2019 (r498308) @@ -1,4 +1,4 @@ ---- setup.py.orig 2018-10-26 01:55:40 UTC +--- setup.py.orig 2019-02-15 14:34:52 UTC +++ setup.py @@ -125,9 +125,7 @@ setup( # cluecode @@ -23,9 +23,9 @@ - 'future == 0.16.0', + 'future >= 0.16.0', 'text-unidecode >= 1.0, < 2.0', - - # licensedcode -@@ -165,8 +161,7 @@ setup( + # required by saneyaml + 'PyYAML >= 3.11, <=3.13', +@@ -167,8 +163,7 @@ setup( 'binaryornot >= 0.4.0', 'chardet >= 3.0.0, <4.0.0', # note that we use a short version range because we use a simpler lexer list @@ -35,7 +35,7 @@ # packagedcode 'pefile >= 2018.8.8', -@@ -180,7 +175,6 @@ setup( +@@ -183,7 +178,6 @@ setup( 'colorama >= 0.3.9', 'pluggy >= 0.4.0, < 1.0', 'attrs >=17.4, < 19.0',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904071909.x37J9Apl018069>