diff --git a/docs/source/reference/available_package_parsers.rst b/docs/source/reference/available_package_parsers.rst index d97f897020..ca35c9c2ac 100644 --- a/docs/source/reference/available_package_parsers.rst +++ b/docs/source/reference/available_package_parsers.rst @@ -14,7 +14,7 @@ parsers in scancode-toolkit during documentation builds. .. list-table:: Supported Package Parsers - :widths: 10 10 20 10 10 2 + :widths: 10 10 20 10 10 10 2 :header-rows: 1 * - Description @@ -140,6 +140,13 @@ parsers in scancode-toolkit during documentation builds. - ``cargo_toml`` - Rust - https://doc.rust-lang.org/cargo/reference/manifest.html + * - Rust binary + - None + - ``cargo`` + - ``linux``, ``win``, ``mac`` + - ``rust_binary`` + - Rust + - https://github.com/rust-secure-code/cargo-auditable/blob/master/PARSING.md * - Chef cookbook metadata.json - ``*/metadata.json`` - ``chef`` @@ -1008,4 +1015,3 @@ parsers in scancode-toolkit during documentation builds. - ``windows_executable`` - None - https://en.wikipedia.org/wiki/Portable_Executable - \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 19d24c27d1..797f40bc4f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -67,7 +67,7 @@ install_requires = Beautifulsoup4 >= 4.0.0 boolean.py >= 4.0 chardet >= 3.0.0 - click >= 6.7, !=7.0 + click >= 6.7, !=7.0, !=8.1.8 colorama >= 0.3.9 commoncode >= 32.0.0 container-inspector >= 31.0.0 diff --git a/src/packagedcode/models.py b/src/packagedcode/models.py index 64553bdbe3..40fa8bb3e9 100644 --- a/src/packagedcode/models.py +++ b/src/packagedcode/models.py @@ -1045,7 +1045,7 @@ class DatafileHandler: # tuple of operating systems where getting package data using this DatafileHandler is supported. # If None or empty, all platforms are supported, possible values are win, mac, linux, freebsd - supported_oses = ('linux', 'win', 'mac') + supported_oses = None # Sequence of known fnmatch-style case-insensitive glob patterns (e.g., Unix # shell style patterns) that apply on the whole POSIX path for package diff --git a/src/packagedcode/templates/available_package_parsers.rst b/src/packagedcode/templates/available_package_parsers.rst index bb1c399913..b5a3a3e1a5 100644 --- a/src/packagedcode/templates/available_package_parsers.rst +++ b/src/packagedcode/templates/available_package_parsers.rst @@ -14,7 +14,7 @@ parsers in scancode-toolkit during documentation builds. .. list-table:: Supported Package Parsers - :widths: 10 10 20 10 10 2 + :widths: 10 10 20 10 10 10 2 :header-rows: 1 * - Description diff --git a/tests/scancode/data/help/help_linux.txt b/tests/scancode/data/help/help_linux.txt index 1295e3c474..a6527a51f3 100644 --- a/tests/scancode/data/help/help_linux.txt +++ b/tests/scancode/data/help/help_linux.txt @@ -16,6 +16,7 @@ Options: license/copyright detection and top-level package creation. -c, --copyright Scan for copyrights. --go-symbol Collect Go symbols. + --rust-symbol Collect Rust symbols from rust binaries. other scans: -i, --info Scan for file information (size, checksums, etc). diff --git a/tests/scancode/test_cli.py b/tests/scancode/test_cli.py index e537002af6..c1edea6604 100644 --- a/tests/scancode/test_cli.py +++ b/tests/scancode/test_cli.py @@ -128,7 +128,7 @@ def test_no_version_check_run_is_successful(): def test_usage_and_help_return_a_correct_script_name_on_all_platforms(): - result = run_scan_click(['--help']) + result = run_scan_click(options=['--help'], test_mode=False, retry=False) assert 'Usage: scancode [OPTIONS]' in result.output # this was showing up on Windows assert 'scancode-script.py' not in result.output