Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ from ``4.0.0`` to ``4.1.0``. The changes in Output Data Structure are:
directories. This is returned optionally with the ``--info`` plugin.

- A new resource level attribute ``is_community`` is added, which is
True from commonly used files used for community/project maintainence.
True from commonly used files used for community/project maintenance.
This is returned optionally with the ``--classify`` plugin.

These are the details for the most important changes introduced::
Expand Down Expand Up @@ -340,7 +340,7 @@ v32.2.1 - 2024-07-02
- Add support for poetry packages, with poetry specific pyproject.toml
support, poetry.lock and package assembly support. Also add support
for parsing and storing resolved packages and dependency relationships
required to statically resolve poetry dependecy graphs.
required to statically resolve poetry dependency graphs.
See https://github.com/nexB/scancode-toolkit/issues/2109

- Add support for pyproject.toml files in python projects.
Expand Down Expand Up @@ -827,7 +827,7 @@ License detection:
in all levels i.e. from codebase, package and resource level license detections and
resource level license clues, irrespective of this CLI option being used, i.e. default
with ``--licenses``.
See `license updates documentation <https://scancode-toolkit.readthedocs.io/en/latest/reference/license-detection-reference.html#comparision-before-after-license-references>`_
See `license updates documentation <https://scancode-toolkit.readthedocs.io/en/latest/reference/license-detection-reference.html#comparison-before-after-license-references>`_

- We replaced the ``scancode --reindex-licenses`` command line option with a
new separate command named ``scancode-reindex-licenses``.
Expand Down Expand Up @@ -1278,7 +1278,7 @@ Changes:
- `has_license_text`
- `declared_copyrights`
- `conflicting_license_categories`
- `ambigious_compound_licensing`
- `ambiguous_compound_licensing`

- The fields of the summary plugin have been replaced with the following fields.
An overview of the new fields can be found in the "Summary Plugin Update"
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Build and tests status
======================

We run 30,000+ tests on each commit on multiple CIs to ensure a good platform
compabitility with multiple versions of Windows, Linux and macOS.
compatibility with multiple versions of Windows, Linux and macOS.

+------------+--------------+-------------------------+----------------------------+
| **Azure** | **RTD Build**| **GitHub actions Docs** | **GitHub actions Release** |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ report here). We are now just reporting a flat mapping here, and all the
rule details are also not present in the license match, and only available
as an optional reference.

See this before/after comparision to see how the license data in results has
See this before/after comparison to see how the license data in results has
evolved.

Before::
Expand Down Expand Up @@ -536,12 +536,12 @@ This is now default with the CLI option ``--license``, which references from
the match License-level Data and LicenseDB-level Data, and removes the actual data from
the matches, and adds them to two top-level lists.

Comparision: Before/After license references
Comparison: Before/After license references
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

To compare how the license output data changes between when license references are not collected
vs when they are collected (which is default from version 32.x), check out the before/after
comparision below.
comparison below.

Before::

Expand Down
4 changes: 2 additions & 2 deletions docs/source/getting-started/contribute/contributing-code.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ These are enabled by adding a ``--test-suite`` option to the pytest command.
detection)

In some cases we need to regenerate test data when expected behavious/result data
structures change, and we have an environement variable to regenerate test data.
structures change, and we have an environment variable to regenerate test data.
`SCANCODE_REGEN_TEST_FIXTURES` is present in `scancode_config` and this can be
set to regenerate test data for specific tests like this:

Expand All @@ -124,7 +124,7 @@ If test data is regenerated, it is important to review the diff for test files a
carefully go through all of it to make sure there are no unintended changes there,
and then commit all the regenerated test data.

To help debug in scancode, we use logging. There are different environement variables
To help debug in scancode, we use logging. There are different environment variables
you need to set to turn on logging. In packagedcode::

``SCANCODE_DEBUG_PACKAGE=yes pytest -vvs tests/packagedcode/ --lf``
Expand Down
2 changes: 1 addition & 1 deletion docs/source/reference/scancode-supported-packages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ parsers in scancode-toolkit during documentation builds.
- ``go_mod``
- Go
- https://go.dev/ref/mod
* - Go module cheksums file
* - Go module checksums file
- ``*/go.sum``
- ``golang``
- ``linux``, ``win``, ``mac``
Expand Down
2 changes: 1 addition & 1 deletion docs/source/rst-snippets/cli-post-scan-options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

--todo Identify license and package detections which needs
review as there are potential issues with the detections.
Lists all the unique ambigious detections with references
Lists all the unique ambiguous detections with references
to the file path and line numbers, detection details and
review comments to help explain the detection issue.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. note::

You can Output Scan Results in two different file formats simultaniously in one Scan. An
You can Output Scan Results in two different file formats simultaneously in one Scan. An
example - ``scancode -clpieu --json-pp output.json --html output.html samples``.

.. note::
Expand Down
2 changes: 1 addition & 1 deletion etc/scripts/gen_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
Utilities to manage requirements files.
NOTE: this should use ONLY the standard library and not import anything else
because this is used for boostrapping with no requirements installed.
because this is used for bootstrapping with no requirements installed.
"""


Expand Down
2 changes: 1 addition & 1 deletion etc/scripts/gen_requirements_dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
Utilities to manage requirements files.
NOTE: this should use ONLY the standard library and not import anything else
because this is used for boostrapping with no requirements installed.
because this is used for bootstrapping with no requirements installed.
"""


Expand Down
2 changes: 1 addition & 1 deletion etc/scripts/utils_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"""
Utilities to manage requirements files and call pip.
NOTE: this should use ONLY the standard library and not import anything else
because this is used for boostrapping with no requirements installed.
because this is used for bootstrapping with no requirements installed.
"""


Expand Down
4 changes: 2 additions & 2 deletions src/cluecode/copyrights.py
Original file line number Diff line number Diff line change
Expand Up @@ -2047,9 +2047,9 @@ def build_detection_from_node(
(r'^\(?[Rr]ecoded$', 'AUTH2'),
(r'^\(?[Mm]odified$', 'AUTH2'),
(r'^\(?[Cc]reated$', 'AUTH2'),
# written is often mispelled
# written is often misspelled
(r'^\(?[Ww]ritt?e[dn]$', 'AUTH2'),
# rewritten is often mispelled
# rewritten is often misspelled
(r'^\(?[Rr]ewritt?e[dn]$', 'AUTH2'),
(r'^\(?[Mm]aintained$', 'AUTH2'),
(r'^\(?[Dd]eveloped$', 'AUTH2'),
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/additional_license_location_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class AdditionalLicenseLocationProviderPlugin(object):
Base plugin class for plugins that provide path locations for one or more
keys such as the path location to a native binary executable or related
system files.
A plugin is configured as it own package with proper environemnt markers
A plugin is configured as it own package with proper environment markers
"""

# name string under which this plugin is registered.
Expand Down
2 changes: 1 addition & 1 deletion src/licensedcode/detection.py
Original file line number Diff line number Diff line change
Expand Up @@ -1696,7 +1696,7 @@ def get_license_keys_from_detections(license_detections, licensing=Licensing()):

def can_ignore_ambiguous_detection(license_detection):
"""
Return True if the license_detection is not an ambigious detection
Return True if the license_detection is not an ambiguous detection
which needs to be reviewed. A few cases are:
1. All the locations of the license detection are community files
"""
Expand Down
2 changes: 1 addition & 1 deletion src/packagedcode/golang.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class GoSumHandler(BaseGoModuleHandler):
path_patterns = ('*/go.sum',)
default_package_type = 'golang'
default_primary_language = 'Go'
description = 'Go module cheksums file'
description = 'Go module checksums file'
documentation_url = 'https://go.dev/ref/mod#go-sum-files'

@classmethod
Expand Down
2 changes: 1 addition & 1 deletion src/summarycode/todo.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def dict_fields(attr, value):

class PackageDetectionCategory(Enum):
"""
These are the primary types of Detections which a ambigously detected
These are the primary types of Detections which a ambiguously detected
package data is classified into.

These are logged in PackageDetection.detection_log for verbosity.
Expand Down
2 changes: 1 addition & 1 deletion tests/cluecode/data/finder/url/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ type VerifyOptions struct {
// irrespective of this value. This matches the Windows CryptoAPI behavior,
// but not the spec.
KeyUsages []ExtKeyUsage
// MaxConstraintComparisions is the maximum number of comparisons to
// MaxConstraintComparisions is the maximum number of comparisions to
// perform when checking a given certificate's name constraints. If
// zero, a sensible default is used. This limit prevents pathological
// certificates from consuming excessive amounts of CPU time when
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)

/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
(like 1 on Unix, 2 on Windows)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5749,7 +5749,7 @@ namespace cimg_library {
return 0;
}

//! Print informations about %CImg environement variables.
//! Print informations about %CImg environment variables.
/**
Printing is done on the standard error output.
**/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ u_char challenge[AUTHKEYLEN]; /* random challenge */

/*
* Don't change the order of this. Ordering the phases this way allows
* for a comparision of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
* for a comparision of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
* know whether LCP is up.
*/
enum ppp_phase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)

/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
(like 1 on Unix, 2 on Windows)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,8 @@ local int strcmpcasenosensitive_internal (const char* fileName1, const char* fil

/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
(like 1 on Unix, 2 on Windows)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ var number = bar / 2/e
The above example is also correctly identified as division, because `e` is not a
valid regex flag. I initially wanted to future-proof by allowing `[a-zA-Z]*`
(any letter) as flags, but it is not worth it since it increases the amount of
ambigous cases. So only the standard `g`, `m`, `i`, `y` and `u` flags are
ambiguous cases. So only the standard `g`, `m`, `i`, `y` and `u` flags are
allowed. This means that the above example will be identified as division as
long as you don’t rename the `e` variable to some permutation of `gmiyu` 1 to 5
characters long.
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/plugin/help.txt
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ Package type: golang
datasource_id: go_sum
documentation URL: https://go.dev/ref/mod#go-sum-files
primary language: Go
description: Go module cheksums file
description: Go module checksums file
path_patterns: '*/go.sum'
--------------------------------------------
Package type: golang
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/plugin/plugins_list_linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ Package type: golang
datasource_id: go_sum
documentation URL: https://go.dev/ref/mod#go-sum-files
primary language: Go
description: Go module cheksums file
description: Go module checksums file
path_patterns: '*/go.sum'
--------------------------------------------
Package type: golang
Expand Down
2 changes: 1 addition & 1 deletion tests/packagedcode/data/pypi/solo-metadata/PKG-INFO
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ for upcoming features.
Build and tests status
======================

We run tests on multiple CIs to ensure a good platform compabitility and on
We run tests on multiple CIs to ensure a good platform compatibility and on
multiple version of Windows, Linux and macOS.

+--------------+--------------+--------------+
Expand Down
Loading