Skip to content

Commit 7cfd3b5

Browse files
committed
Fixed #586 - Fixed CI Documentation check
Signed-off-by: Chin Yeung Li <tli@nexb.com>
1 parent c7b9485 commit 7cfd3b5

File tree

13 files changed

+236
-215
lines changed

13 files changed

+236
-215
lines changed

CHANGELOG.rst

Lines changed: 62 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
==============================
22
Changelog
3+
==============================
34

45
2025-03-31
56
Release 11.1.1
@@ -14,7 +15,8 @@ Changelog
1415

1516
* Drop support for python version earlier than 3.9
1617
* Add ability to "exclude" path in the check and inventory #583
17-
* Add support for the special '-' FILE to print to on screen/to stdout in inventory #584
18+
* Add support for the special '-' FILE to print to on screen/to stdout
19+
in inventory #584
1820

1921

2022
2024-09-16
@@ -40,7 +42,8 @@ Changelog
4042
* Update the specification to 3.3.2
4143
* Support "declared_license_expression" and "other_license_expression"
4244
* Updated "about_resource" to be an optional field
43-
* Updated spec to v4.0.0 as moving `about_resource` from mandatory to optional
45+
* Updated spec to v4.0.0 as moving `about_resource` from mandatory to
46+
optional
4447

4548

4649
2023-09-25
@@ -60,14 +63,16 @@ Changelog
6063

6164
* Fixd error in load_json in util.py
6265
* Code cleanup
63-
* Work with the SCTK version 32 and later (Drop support for SCTK version 31 and earlier)
66+
* Work with the SCTK version 32 and later (Drop support for SCTK
67+
version 31 and earlier)
6468
* Implement `--scancode` option for `gen`
6569

6670

6771
2023-07-14
6872
Release 9.0.0
6973

70-
* The tool will now show which worksheet (if .xlsx input) is the tool working on
74+
* The tool will now show which worksheet (if .xlsx input) is the tool
75+
working on
7176
* Error handling if defined worksheet does not exist
7277
* Adopt 3.3.1 specification: introduce ``ignored_resources``
7378

@@ -78,7 +83,8 @@ Changelog
7883
* Fixed the transform code for xlsx and json
7984
* Remove irrelevant error for attrib
8085
* Add support to identify worksheet name for XLSX input
81-
* The severity error level for "contains illegal name characters (or empty spaces) and is ignored" is changed from ERROR to WARNING
86+
* The severity error level for "contains illegal name characters (or
87+
empty spaces) and is ignored" is changed from ERROR to WARNING
8288
* Remove the limitation to ASCII only
8389
* Drop support for python3.6
8490
* Update valid chatacters for file/path name
@@ -100,10 +106,14 @@ Changelog
100106
2022-10-24
101107
Release 7.1.0
102108

103-
* Fixed version mismatch (https://github.com/nexB/aboutcode-toolkit/issues/510)
104-
* Improve `check` performance (https://github.com/nexB/aboutcode-toolkit/issues/511)
105-
* Relax the requirement to have the same format for input and output for `transform`
106-
* Collect and handle the "matched_text" from the `--license-text` option from the scancode-toolkit
109+
* Fixed version mismatch
110+
(https://github.com/nexB/aboutcode-toolkit/issues/510)
111+
* Improve `check` performance
112+
(https://github.com/nexB/aboutcode-toolkit/issues/511)
113+
* Relax the requirement to have the same format for input and output
114+
for `transform`
115+
* Collect and handle the "matched_text" from the `--license-text`
116+
option from the scancode-toolkit
107117

108118

109119
2022-03-21
@@ -133,7 +143,8 @@ Changelog
133143
* Update configuration scripts
134144
* Use readthedocs for documentation
135145
* Add Dockerfile to run aboutcode with docker
136-
* Add new option to choose extract license from ScanCode LicenseDB or DJC License Library
146+
* Add new option to choose extract license from ScanCode LicenseDB or
147+
DJC License Library
137148
* Add ability to transform XLSX file
138149
* Support XLSX file format for `inventory`, `gen` and `attrib`
139150
* Add 'spdx_license_key' support
@@ -142,9 +153,12 @@ Changelog
142153
* Bump PyYAML to 6.0
143154
* Add '%" as a supported character
144155
* Update default template
145-
* All errors are logged if and only if the `verbose` option is set. Otherwise, ony 'Critical' and 'Warning' errors will be showed/logged
146-
* Ability to generate attribution notice directly from an input inventory
147-
* Remove the restriction of requiring 'about_resource' field in the input if performing `attrib` from an inventory
156+
* All errors are logged if and only if the `verbose` option is set.
157+
Otherwise, ony 'Critical' and 'Warning' errors will be showed/logged
158+
* Ability to generate attribution notice directly from an input
159+
inventory
160+
* Remove the restriction of requiring 'about_resource' field in the
161+
input if performing `attrib` from an inventory
148162

149163
2021-04-02
150164
Release 6.0.0
@@ -157,17 +171,19 @@ Changelog
157171

158172
* Add support for `package_url` #396
159173
* Fixed #443 and #444 issue with multiple licenses/license_files
160-
* Fixed #442 no special characters allowed for `license_key`, `license_name` and `license_expression`
174+
* Fixed #442 no special characters allowed for `license_key`,
175+
`license_name` and `license_expression`
161176
* Fixed #446 Better error handling
162177

163178
2020-08-11
164179
Release 5.0.0
165180

166-
* Enhance the `transform` to also work with JSON file
181+
* Enhance the `transform` to also work with JSON file
167182
* Update transform code (See #427 and #428)
168183
* Fixed #431 - Error handling for empty "_file" fields
169184
* Fixed #432 - Handled UTF-8 variant invented by Microsoft
170-
* Fixed #433 - problem was caused by the different multi-lic file format between json and CSV (CSV with '\n' line break)
185+
* Fixed #433 - problem was caused by the different multi-lic file
186+
format between json and CSV (CSV with '\n' line break)
171187
* Fixed #436 - issue about copy with the `--reference` option
172188
* Fixed #396 - support for alternative output for Android
173189

@@ -207,7 +223,8 @@ Changelog
207223
* New UrlListField introduced for list of urls
208224
* The UrlField is now only taking single URL value
209225
* The owner is now a StringField instead of ListField
210-
* Format the ordering of the generated ABOUT file (See https://github.com/nexB/aboutcode-toolkit/issues/349#issuecomment-438871444)
226+
* Format the ordering of the generated ABOUT file (See
227+
https://github.com/nexB/aboutcode-toolkit/issues/349#issuecomment-438871444)
211228
* '+' and '(' and ')' is now supported in license_expression
212229
* The key 'about_resource_path' is removed
213230
* Revert back the requirement of the 'name' field
@@ -242,7 +259,8 @@ Changelog
242259

243260
* New `--vartext` option for `attrib`
244261
* Add support for `checksum_sha256` and `author_file`
245-
* `check` command will not count INFO message as error when `--verbose` is set
262+
* `check` command will not count INFO message as error when `--verbose`
263+
is set
246264
* Update `track_change` to `track_changes`
247265
* New `--filter` and `--mapping-output` options for `inventory`
248266

@@ -262,7 +280,8 @@ Changelog
262280
Release 3.1.0
263281

264282
* Fixed JSON input from AboutCode manger export and ScanCode output
265-
* Added a new option `mapping-file` to support using a custom file for mapping
283+
* Added a new option `mapping-file` to support using a custom file for
284+
mapping
266285
* Change the name of the option `--show-all` to `--verbose`
267286
* Better error handling for copying file with permission issue
268287
* Support timestamp in attribution output
@@ -274,28 +293,27 @@ Changelog
274293

275294
Release 3.0.*
276295

277-
ABOUT files is now YAML formatted.
278-
Supported license expression.
279-
Supported JSON input and output format: https://github.com/nexB/aboutcode-toolkit/issues/246 and https://github.com/nexB/aboutcode-toolkit/issues/277
280-
Support Python 3: https://github.com/nexB/aboutcode-toolkit/issues/280
281-
Refined help texts
282-
Refined USAGE texts
283-
Refined SPECs
296+
ABOUT files is now YAML formatted. Supported license expression.
297+
Supported JSON input and output format:
298+
https://github.com/nexB/aboutcode-toolkit/issues/246 and
299+
https://github.com/nexB/aboutcode-toolkit/issues/277 Support Python 3:
300+
https://github.com/nexB/aboutcode-toolkit/issues/280 Refined help texts
301+
Refined USAGE texts Refined SPECs
284302

285303
Input key changes:
286-
==================
287-
`about_file` is replaced by `about_file_path`
288-
`dje_license_key` is replaced by `license_expression`
289-
`version` is no longer a required field
290-
`home_url` is now `homepage_url`
304+
305+
`about_file` is replaced by `about_file_path` `dje_license_key` is
306+
replaced by `license_expression` `version` is no longer a required
307+
field `home_url` is now `homepage_url`
291308

292309
API Updated:
293-
============
294-
- Break down the 3 major functions: `inventory`, `genabout` and `genattrib` into 3 subcommands:
295-
i.e.
296-
`about inventory`, `about generate` and `about attrib`
297310

298-
- A new `check` subcommand: https://github.com/nexB/aboutcode-toolkit/issues/281
311+
- Break down the 3 major functions: `inventory`, `genabout` and
312+
`genattrib` into 3 subcommands:
313+
i.e. `about inventory`, `about generate` and `about attrib`
314+
315+
- A new `check` subcommand:
316+
https://github.com/nexB/aboutcode-toolkit/issues/281
299317

300318
- Some options changes
301319
`--extract_license` becomes `--fetch-license`
@@ -388,19 +406,20 @@ Changelog
388406
* the dje_license field has been renamed to dje_license_key
389407
* when a dje_license_key is present, a new dje_license_url will be
390408
reported when fetching data from the DejaCode API.
391-
* In genabout, the '--all_in_one' command line option has been removed.
392-
It was not well specified and did not work as advertised.
409+
* In genabout, the '--all_in_one' command line option has been
410+
removed. It was not well specified and did not work as advertised.
393411

394412
* in genattrib:
395413

396414
* the Component List is now optional.
397415
* there is a new experimental '--verification_location' command line
398-
option. This option will be removed in the future version. Do not use
399-
it.
416+
option. This option will be removed in the future version. Do not
417+
use it.
400418
* the '+' character is now supported in file names.
401419
* several bugs have been fixed.
402420
* error handling and error and warning reporting have been improved.
403-
* New documentation in doc: UsingAboutCodetoDocumentYourSoftwareAssets.pdf
421+
* New documentation in doc:
422+
UsingAboutCodetoDocumentYourSoftwareAssets.pdf
404423

405424

406425
2014-11-05 Philippe Ombredanne <pombredanne@nexb.com>
@@ -429,5 +448,5 @@ Changelog
429448

430449
Release 0.8.1
431450

432-
* Initial release with minimal capabilities to read and validate
433-
ABOUT files format 0.8.0 and output a CSV inventory.
451+
* Initial release with minimal capabilities to read and validate ABOUT
452+
files format 0.8.0 and output a CSV inventory.

README.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ version may be pre-installed, open a terminal and type:
5050

5151
Note
5252
~~~~
53-
Debian has decided that distutils is not a core python package, so it is not included in the last versions of debian and debian-based OSes.
53+
Debian has decided that distutils is not a core python package, so it
54+
is not included in the last versions of debian and debian-based OSes.
5455
A solution is to run: `sudo apt install python3-distutils`
5556

5657
On Windows or Mac, you can download the latest Python here:
@@ -85,7 +86,8 @@ To deactivate the virtualenv, run (on both posix and windows):
8586

8687
VERSIONING SCHEMA
8788
-----------------
88-
Starting at AboutCode version 4.0.0, the AboutCode Toolkit will follow SemVer for the versioning schema.
89+
Starting at AboutCode version 4.0.0, the AboutCode Toolkit will follow
90+
SemVer for the versioning schema.
8991

9092
i.e. MAJOR.MINOR.PATCH format
9193
1. MAJOR version when making incompatible API changes,

docs/source/general.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ The attributes that can be set in a configuration file are:
219219
- field_renamings: An optional map of source field name to target new field
220220
name that is used to rename CSV/JSON/XLSX fields.
221221

222-
.. code-block:: none
222+
.. code-block::
223223
224224
field_renamings:
225225
about_resource : 'Directory/Location'
@@ -238,7 +238,7 @@ renamed to "about_resource" and "foo" to "bar":
238238
For instance with this configuration, an error will be reported if the fields "name"
239239
and "version" are missing, or if any entry does not have a value set for these fields:
240240

241-
.. code-block:: none
241+
.. code-block::
242242
243243
required_fields:
244244
- name
@@ -252,7 +252,7 @@ and "version" are missing, or if any entry does not have a value set for these f
252252
For instance with this configuration, the target file will only contains the "name" and
253253
"version" fields:
254254

255-
.. code-block:: none
255+
.. code-block::
256256
257257
field_filters:
258258
- name
@@ -265,7 +265,7 @@ For instance with this configuration, the target file will only contains the "na
265265

266266
For instance with this configuration, the target file will not contain the "type" and "temp" fields:
267267

268-
.. code-block:: none
268+
.. code-block::
269269
270270
exclude_fields:
271271
- type
@@ -280,7 +280,7 @@ are defined here: :ref:`reference`
280280

281281
Here is an example of a gen command:
282282

283-
.. code-block:: none
283+
.. code-block::
284284
285285
about gen --fetch-license --reference /Users/harrypotter/myLicenseNoticeFiles/ /Users/harrypotter/myAboutFiles/myProject-bom.csv /Users/harrypotter/myAboutFiles/
286286
@@ -299,7 +299,7 @@ This gen example command does the following:
299299
Review the generated ABOUT file(s) to determine if it meets your requirements. Here is a
300300
simple example of a linux-redhat-7.2.ABOUT file that documents the directory /linux-redhat-7.2/ :
301301

302-
.. code-block:: none
302+
.. code-block::
303303
304304
about_resource: .
305305
name: Linux RedHat
@@ -354,7 +354,7 @@ here are a few relatively simple concepts that relate to the attribution documen
354354
The simplest modifications to the default_html.template file involve the labels and standard
355355
text. For example, here is the default template text for the Table of Contents:
356356

357-
.. code-block:: none
357+
.. code-block::
358358
359359
<div class="oss-table-of-contents">
360360
{% for about_object in abouts %}
@@ -367,7 +367,7 @@ text. For example, here is the default template text for the Table of Contents:
367367
If you would prefer something other than a simple space between the component name and
368368
the component version, you can modify it to something like this:
369369

370-
.. code-block:: none
370+
.. code-block::
371371
372372
<div class="oss-table-of-contents">
373373
{% for about_object in abouts %}
@@ -392,7 +392,7 @@ following example, which is intended to support a "license reference" rather tha
392392
document, the customized template modifies the data grouping to use a custom field
393393
called "confirmed_license":
394394

395-
.. code-block:: none
395+
.. code-block::
396396
397397
<div class="oss-table-of-contents">
398398
{% for group in abouts | groupby('confirmed_license') %}
@@ -410,7 +410,7 @@ using the jinja2 for-loop capabilities. Notice that the variable "group.grouper.
410410
actually the license name here, and that “License URL” can be any URL that you have chosen
411411
to store in your .ABOUT files:
412412

413-
.. code-block:: none
413+
.. code-block::
414414
415415
{% for group in abouts | groupby('confirmed_license') %}
416416
{% for confirmed_license in group.grouper.value %}

0 commit comments

Comments
 (0)