Skip to content

Commit b7aa3e1

Browse files
committed
Fixed #120 - Update RTD
* The default RTD for aboutcode-toolkit should be at https://aboutcode-toolkit.readthedocs.io/en/latest/index.html Signed-off-by: Chin Yeung Li <[email protected]>
1 parent a937828 commit b7aa3e1

File tree

6 files changed

+238
-40
lines changed

6 files changed

+238
-40
lines changed

docs/source/_static/theme_overrides.css

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ div.custom-admonition-important.admonition {
9999
color: #000000;
100100
background: #ffff66;
101101
background: #ffff99;
102+
background: #fff3cd;
102103
border-radius: 5px 5px 0px 0px;
103104
border-bottom: solid 1px #e8e8e8;
104105
}
@@ -117,8 +118,12 @@ div.custom-admonition-caution.admonition {
117118
/* note */
118119
.custom-admonition-note .admonition-title {
119120
color: #ffffff;
121+
/* color: #000000; */
120122
background: #3399ff;
121123
background: #006bb3;
124+
background: #cce5ff;
125+
background: #b3d7ff;
126+
background: #2196f3;
122127
border-radius: 5px 5px 0px 0px;
123128
}
124129
div.custom-admonition-note.admonition {
@@ -127,6 +132,8 @@ div.custom-admonition-note.admonition {
127132
background: #ffffff;
128133
border: solid 1px #e8e8e8;
129134
border: solid 1px #cccccc;
135+
/* border: solid 1px #80bdff; */
136+
/* border: solid 1px #2196f3; */
130137
border-radius: 5px;
131138
/* box-shadow: 5px 5px 18px #d8d8d8; */
132139
box-shadow: 1px 1px 5px 3px #d8d8d8;
@@ -136,9 +143,20 @@ div.custom-admonition-note.admonition {
136143
/* todo */
137144
.custom-admonition-todo .admonition-title {
138145
color: #000000;
146+
color: #cc0000;
139147
background: #cce6ff;
148+
background: #ffcc00;
149+
background: #ffeb99;
150+
background: #ccffff;
151+
background: #ffd9b3;
152+
background: #ffffff;
140153
border-radius: 5px 5px 0px 0px;
141154
border-bottom: solid 1px #99ccff;
155+
border-bottom: solid 1px #ffcc00;
156+
border-bottom: solid 1px #ffeb99;
157+
border-bottom: solid 1px #e8e8e8;
158+
border-bottom: solid 1px #ffd9b3;
159+
border-bottom: solid 1px #d8d8d8;
142160
}
143161
div.custom-admonition-todo.admonition {
144162
color: #000000;
@@ -147,6 +165,10 @@ div.custom-admonition-todo.admonition {
147165
border: solid 1px #e8e8e8;
148166
border: solid 1px #cccccc;
149167
border: solid 1px #99ccff;
168+
border: solid 1px #ffcc00;
169+
border: solid 1px #ffeb99;
170+
border: solid 1px #ffd9b3;
171+
border: solid 1px #cc0000;
150172
border-radius: 5px;
151173
/* box-shadow: 5px 5px 18px #d8d8d8; */
152174
box-shadow: 1px 1px 5px 3px #d8d8d8;
@@ -194,17 +216,21 @@ div.rst-content {
194216
.rst-content .guilabel {
195217
/* border: 1px solid #7fbbe3; */
196218
/* border: 1px solid #e7f2fa; */
197-
border: 1px solid #ffff99;
219+
/* border: 1px solid #ffff99; */
198220
/* border: 1px solid #ccffcc; */
199221
/* border: 1px solid #f2f2f2; */
200222
/* border: 1px solid #e6f2ff; */
223+
/* border: 1px solid #fff3cd; */
224+
border: 1px solid #ccffff;
201225

202226
/* background: #e7f2fa; */
203227
/* background: #e6ffff; */
204-
background: #ffff99;
228+
/* background: #ffff99; */
205229
/* background: #ccffcc; */
206230
/* background-color: #f2f2f2; */
207231
/* background: #e6f2ff; */
232+
/* background: #fff3cd; */
233+
background: #ccffff;
208234

209235
/* font-size: 80%; */
210236
font-size: 100%;
@@ -361,3 +387,31 @@ code, .rst-content tt, .rst-content code {
361387
margin-bottom: 0px;
362388
line-height: 24px;
363389
}
390+
391+
/* === */
392+
393+
/* this is used by the genindex added via layout.html (see source/_templates/) to sidebar toc */
394+
.reference.internal.toc-index {
395+
color: #d9d9d9;
396+
}
397+
398+
.reference.internal.toc-index.current {
399+
background-color: #ffffff;
400+
color: #000000;
401+
font-weight: bold;
402+
}
403+
404+
.toc-index-div {
405+
border-top: solid 1px #666666;
406+
margin-top: 10px;
407+
padding-top: 10px;
408+
}
409+
410+
/* The next 2 fix the poor vertical spacing in genindex.html (the alphabetized index) */
411+
.indextable.genindextable {
412+
margin-bottom: 20px;
413+
}
414+
415+
div.genindex-jumpbox {
416+
margin-bottom: 20px;
417+
}

docs/source/general.rst

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,20 @@
44
General
55
=======
66

7-
.. contents::
8-
:depth: 3
9-
107
AboutCode Toolkit Defined
118
=========================
129

13-
AboutCode Toolkit is a tool for your software development team to document your code inside your codebase, typically in preparation for a product release, side-by-side with the actual code. AboutCode Toolkit files have a simple, standard format that identifies components and their associated licenses. The current AboutCode Toolkit subcommands are:
10+
AboutCode Toolkit is a tool for your software development team to document your code inside your codebase, typically in preparation for a product release, side-by-side with the actual code. ABOUT file(s) have a simple, standard format that identifies components and their associated licenses. The current AboutCode Toolkit subcommands are:
1411

15-
- **attrib**: Generate a Product Attribution notice document (HTML format) from your AboutCode Toolkit files. You can also generate documents for other purposes (such as a License Reference) by varying your input control file and your template.
12+
- **attrib**: Generate a Product Attribution notice document (HTML format) from your ABOUT file(s). You can also generate documents for other purposes (such as a License Reference) by varying your input control file and your template.
1613

17-
- **check**: A simple command to validate the AboutCode Toolkit files and output errors/warnings if any on the terminal.
14+
- **check**: A simple command to validate the ABOUT file(s) and output errors/warnings if any on the terminal.
1815

19-
- **collect_redist_src**: A command to collect and copy sources that have 'redistribute' flagged as 'True' in AboutCode Toolkit files or from an inventory.
16+
- **collect_redist_src**: A command to collect and copy sources that have 'redistribute' flagged as 'True' in ABOUT file(s) or from an inventory.
2017

21-
- **gen**: Create AboutCode Toolkit files from a Software Inventory file (.csv or .json format) which is typically created from a software audit, and insert these AboutCode Toolkit files into your codebase. You can regenerate the AboutCode Toolkit files from a new Software Inventory file whenever you make changes.
18+
- **gen**: Create ABOUT file(s) from a Software Inventory file (.csv or .json format) which is typically created from a software audit, and insert these AboutCode Toolkit files into your codebase. You can regenerate the AboutCode Toolkit files from a new Software Inventory file whenever you make changes.
2219

23-
- **inventory**: Generate a Software Inventory list (.csv or .json format) from your codebase based on your AboutCode Toolkit files. Note that this Software Inventory will only include components that have AboutCode Toolkit data. In another word, if you do not create AboutCode Toolkit files for your own original software components, these components will not show up in the generated inventory.
20+
- **inventory**: Generate a Software Inventory list (.csv or .json format) from your codebase based on ABOUT file(s). Note that this Software Inventory will only include components that have AboutCode Toolkit data. In another word, if you do not create AboutCode Toolkit files for your own original software components, these components will not show up in the generated inventory.
2421

2522
- **transform**: A command to transform an input CSV/JSON by applying renaming and/or filtering and then output to a new CSV/JSON file.
2623

@@ -38,8 +35,8 @@ Some key terminology that applies to AboutCode Toolkit tool usage:
3835

3936
- **Product BOM or BOM** - means a subset list of the components in a Development codebase (Software Inventory) that are Deployed on a particular Product Release (a Product Bill of Materials).
4037

41-
Using gen to Generate AboutCode Toolkit Files
42-
=============================================
38+
Using gen to Generate ABOUT file(s)
39+
===================================
4340

4441
Prepare Your Software Inventory for gen Standard Field Names
4542
------------------------------------------------------------
@@ -217,10 +214,10 @@ For instance with this configuration, the target file will not contain the "type
217214
- type
218215
- temp
219216
220-
Run gen to Generate AboutCode Toolkit Files
221-
-------------------------------------------
217+
Run gen to Generate ABOUT file(s)
218+
---------------------------------
222219

223-
When your software inventory is ready, you can save it as a .csv or .json file, and use it as input to run gen to generate your AboutCode Toolkit files. The official gen parameters are defined here: :ref:`reference`
220+
When your software inventory is ready, you can save it as a .csv or .json file, and use it as input to run gen to generate ABOUT file(s). The official gen parameters are defined here: :ref:`reference`
224221

225222
Here is an example of a gen command:
226223

@@ -238,7 +235,7 @@ This gen example command does the following:
238235

239236
- Specifies a target output directory.
240237

241-
Review your generated AboutCode Toolkit files to determine if they meet your requirements. Here is a simple example of a linux-redhat-7.2.ABOUT file that documents the directory /linux-redhat-7.2/ :
238+
Review the generated ABOUT file(s) to determine if it meets your requirements. Here is a simple example of a linux-redhat-7.2.ABOUT file that documents the directory /linux-redhat-7.2/ :
242239

243240
.. code-block:: none
244241
@@ -255,7 +252,7 @@ Review your generated AboutCode Toolkit files to determine if they meet your req
255252
owner: Red Hat
256253
redistribute: Y
257254
258-
You can make the appropriate changes to your input software inventory and then run gen as often as necessary to replace the generated AboutCode Toolkit files with the improved output.
255+
You can make appropriate changes to your input software inventory and then run gen as often as necessary to replace the ABOUT file(s) with the improved version.
259256

260257
Using attrib to Generate a Product Attribution Notice Package
261258
=============================================================
@@ -378,7 +375,7 @@ In summary, you can start with simple, cosmetic customizations to the default_ht
378375
Run attrib to Generate a Product Attribution Notice Package
379376
-----------------------------------------------------------
380377

381-
When you have generated the AboutCode Toolkit files by gen, you can then run attrib to generate your product attribution notice package. The official attrib parameters are defined here: :ref:`reference`
378+
When you have generated ABOUT file(s) by gen, you can then run attrib to generate your product attribution notice package. The official attrib parameters are defined here: :ref:`reference`
382379

383380
Here is an example of a attrib command:
384381

@@ -388,7 +385,7 @@ Note that this example attrib command does the following:
388385

389386
- Activates the --template option to specify a custom output template.
390387

391-
- Specifies the path of the AboutCode Toolkit files needed to generate the output document.
388+
- Specifies the path of the ABOUT file(s) that use to generate the output attribution.
392389

393390
- Specifies the full path (include file name) of the output document to be generated.
394391

@@ -397,12 +394,12 @@ A successful execution of attrib will create a .html (or .json depends on the te
397394
Using inventory to Generate a Software Inventory
398395
================================================
399396

400-
Generate a Software Inventory of Your Codebase from AboutCode Toolkit Files
401-
---------------------------------------------------------------------------
397+
Generate a Software Inventory of Your Codebase from ABOUT file(s)
398+
-----------------------------------------------------------------
402399

403-
One of the major features of the ABOUT File specification is that the .ABOUT files are very simple text files that can be created, viewed and edited using any standard text editor. Your software development and maintenance processes may require or encourage your software developers to maintain .ABOUT files and/or associated text files manually. For example, when a developer addresses a software licensing issue with a component, it is appropriate to adjust the associated AboutCode Toolkit files manually.
400+
One of the major features of the ABOUT File specification is that the .ABOUT files are very simple text files that can be created, viewed and edited using any standard text editor. Your software development and maintenance processes may require or encourage your software developers to maintain .ABOUT files and/or associated text files manually. For example, when a developer addresses a software licensing issue with a component, it is appropriate to adjust the associated ABOUT file(s) manually.
404401

405-
If your organization adopts the practice of manually creating and maintaining AboutCode Toolkit files, you can easily re-create your software inventory from your codebase using inventory. The official inventory parameters are defined here: :ref:`reference`
402+
If your organization adopts the practice of manually creating and maintaining ABOUT file(s), you can easily re-create your software inventory from your codebase using inventory. The official inventory parameters are defined here: :ref:`reference`
406403

407404
A successful execution of inventory will create a complete software inventory in .csv format or .json format based on defined format.
408405

docs/source/home.rst

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
.. _home:
2+
3+
=================
4+
AboutCode Toolkit
5+
=================
6+
7+
Introduction
8+
------------
9+
The AboutCode Toolkit and ABOUT files provide a simple way to document the
10+
origin, license, usage and other important or interesting information about
11+
third-party software components that you use in your project.
12+
13+
You start by storing ABOUT files (a small YAML formatted text file with field/value pairs)
14+
side-by-side with each of the third-party software components you use.
15+
Each ABOUT file documents origin and license for one software.
16+
There are many examples of ABOUT files (valid or invalid) in the testdata/
17+
directory of the whole repository.
18+
19+
The current version of the AboutCode Toolkit can read these ABOUT files so that you
20+
can collect and validate the inventory of third-party components that you use.
21+
22+
In addition, this tool is able to generate attribution notices and
23+
identify redistributable source code used in your project to help you comply
24+
with open source licenses conditions.
25+
26+
This version of the AboutCode Toolkit follows the ABOUT specification version 3.2.1 at:
27+
https://aboutcode-toolkit.readthedocs.io/en/latest/specification.html
28+
29+
30+
Build and tests status
31+
----------------------
32+
33+
+-------+-----------------+--------------+
34+
|Branch | **Linux/macOS** | **Windows** |
35+
+=======+=================+==============+
36+
|Master | |master-posix| | |master-win| |
37+
+-------+-----------------+--------------+
38+
|Develop| |devel-posix| | |devel-win| |
39+
+-------+-----------------+--------------+
40+
41+
42+
REQUIREMENTS
43+
------------
44+
The AboutCode Toolkit is tested with Python 3.6.2 or above only on Linux, Mac and Windows.
45+
You will need to install a Python interpreter if you do not have one already
46+
installed.
47+
48+
On Linux and Mac, Python is typically pre-installed. To verify which
49+
version may be pre-installed, open a terminal and type:
50+
51+
python --version
52+
53+
On Windows or Mac, you can download the latest Python here:
54+
https://www.python.org/downloads/
55+
56+
Download the .msi installer for Windows or the .dmg archive for Mac.
57+
Open and run the installer using all the default options.
58+
59+
60+
INSTALLATION
61+
------------
62+
Checkout or download and extract the AboutCode Toolkit from:
63+
https://github.com/nexB/aboutcode-toolkit/
64+
65+
To install all the needed dependencies in a virtualenv, run (on posix):
66+
source configure
67+
or on windows:
68+
configure
69+
70+
71+
Activate the virtualenv
72+
-----------------------
73+
To activate the virtualenv, run (on posix):
74+
source bin/activate
75+
or on windows:
76+
bin\\activate
77+
78+
79+
Deactivate the virtualenv
80+
-------------------------
81+
To deactivate the virtualenv, run (on both posix and windows):
82+
deactivate
83+
84+
85+
VERSIONING SCHEMA
86+
-----------------
87+
Starting at AboutCode version 4.0.0, the AboutCode Toolkit will follow SemVer for the versioning schema.
88+
89+
i.e. MAJOR.MINOR.PATCH format
90+
1. MAJOR version when making incompatible API changes,
91+
2. MINOR version when making functionality in a backwards compatible manner, and
92+
3. PATCH version when making backwards compatible bug fixes.
93+
94+
95+
REFERENCE
96+
---------
97+
See https://github.com/nexB/aboutcode-toolkit/blob/master/REFERENCE.rst for reference
98+
on aboutcode-toolkit usage.
99+
100+
101+
TESTS and DEVELOPMENT
102+
---------------------
103+
To install all the needed development dependencies, run (on posix):
104+
source configure etc/conf/dev
105+
or on windows:
106+
configure etc/conf/dev
107+
108+
To verify that everything works fine you can run the test suite with:
109+
py.test
110+
111+
112+
HELP and SUPPORT
113+
----------------
114+
If you have a question or find a bug, enter a ticket at:
115+
116+
https://github.com/nexB/aboutcode-toolkit
117+
118+
For issues, you can use:
119+
120+
https://github.com/nexB/aboutcode-toolkit/issues
121+
122+
123+
SOURCE CODE
124+
-----------
125+
The AboutCode Toolkit is available through GitHub. For the latest version visit:
126+
https://github.com/nexB/aboutcode-toolkit
127+
128+
129+
HACKING
130+
-------
131+
We accept pull requests provided under the same license as this tool.
132+
You agree to the http://developercertificate.org/
133+
134+
135+
LICENSE
136+
-------
137+
The AboutCode Toolkit is released under the Apache 2.0 license.
138+
See (of course) the about.ABOUT file for details.
139+
140+
141+
.. |master-posix| image:: https://api.travis-ci.org/nexB/aboutcode-toolkit.png?branch=master
142+
:target: https://travis-ci.org/nexB/aboutcode-toolkit
143+
:alt: Linux Master branch tests status
144+
.. |devel-posix| image:: https://api.travis-ci.org/nexB/aboutcode-toolkit.png?branch=develop
145+
:target: https://travis-ci.org/nexB/aboutcode-toolkit
146+
:alt: Linux Develop branch tests status
147+
148+
.. |master-win| image:: https://ci.appveyor.com/api/projects/status/uwj2gh8i9ga1mqwn/branch/master?png=true
149+
:target: https://ci.appveyor.com/project/nexB/aboutcode-toolkit
150+
:alt: Windows Master branch tests status
151+
.. |devel-win| image:: https://ci.appveyor.com/api/projects/status/uwj2gh8i9ga1mqwn/branch/develop?png=true
152+
:target: https://ci.appveyor.com/project/nexB/aboutcode-toolkit
153+
:alt: Windows Develop branch tests status

docs/source/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Welcome to the AboutCode Toolkit's Documentation.
77
.. toctree::
88
:maxdepth: 2
99

10+
AboutCode Toolkit <home.rst>
1011
General <general.rst>
1112
Specification <specification.rst>
1213
Reference <reference.rst>

0 commit comments

Comments
 (0)