Skip to content

Commit 249b497

Browse files
Merge pull request #189 from arnav-mandal1234/docs
Update Deltacode documentation as part of Skeleton upgrade
2 parents 333c392 + a6e162f commit 249b497

5 files changed

Lines changed: 333 additions & 173 deletions

File tree

README.rst

Lines changed: 63 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
Deltacode
22
=========
3-
4-
+--------------+----------------------------------------------------------------------------------------------+
5-
| **Branch** | **Linux (Travis)** |
6-
+--------------+----------------------------------------------------------------------------------------------+
7-
| develop |.. image:: https://travis-ci.com/nexB/deltacode.svg?token=9MXbiHv3xZxwT2egFxby&branch=develop |
8-
| | :target: https://travis-ci.com/nexB/deltacode |
9-
+--------------+----------------------------------------------------------------------------------------------+
10-
11-
123
DeltaCode is a simple command line utility that leverages the power
134
of `scancode-toolkit <https://github.com/nexB/scancode-toolkit>`_
145
to determine file-level differences between two codebases.
@@ -28,39 +19,61 @@ locations.
2819
We are continuously working on new features, such as detecting copyright changes
2920
and detecting package version changes.
3021

22+
Build and tests status
23+
======================
3124

32-
Quick Start
33-
===========
34-
For more comprehensive installation instructions and development instructions, see:
35-
`Comprehensive Installation <https://github.com/nexB/deltacode/wiki/Comprehensive-Installation>`_
25+
We run tests on each commit on multiple CIs to ensure a good platform
26+
compatibility with multiple versions of Windows, Linux and macOS.
3627

37-
For development instructions, see:
38-
`Development Instructions <https://github.com/nexB/deltacode/wiki/Development>`_
28+
+--------------+--------------+
29+
| **Azure** | **RTD Build**|
30+
+==============+==============+
31+
| |azure| | |docs-rtd| |
32+
+--------------+--------------+
3933

40-
Make sure you have Python 3.8+ installed:
41-
* Download and install Python 3.8+ Windows
42-
https://www.python.org/downloads/windows/
43-
* Download and install Python 3.8+ for Mac
44-
https://www.python.org/downloads/mac-osx/
45-
* Download and install Python 3.8+ for Linux via distro package manager
34+
Documentation
35+
=============
4636

47-
Next, download and extract the latest DeltaCode release from::
37+
The DeltaCode documentation is hosted at
38+
`deltacode.readthedocs.io <https://deltacode.readthedocs.io/en/latest/>`_.
4839

49-
https://github.com/nexB/deltacode/releases/
40+
Installation
41+
============
5042

51-
Open a terminal, extract the downloaded release archive, then `cd` to
52-
the extracted directory and run this command to display the command
53-
help. DeltaCode will self-configure if needed::
43+
Before installing DeltaCode make sure that you have installed the prerequisites
44+
properly. This means installing Python 3.8 for x86/64 architectures.
45+
We support Python 3.8, 3.9 and 3.10.
5446

55-
./deltacode --help
47+
See `prerequisites <https://deltacode.readthedocs.io/en/latest/comprehensive_installation.html#prerequisites>`_
48+
for detailed information on the support platforms and Python versions.
5649

57-
Run a sample delta
50+
There are a few common ways to `install DeltaCode <https://deltacode.readthedocs.io/en/latest/comprehensive_installation.html>`_.
5851

59-
./deltacode -n samples/samples.json -o samples/samples.json
52+
- `Development installation from source code using a git clone
53+
<https://deltacode.readthedocs.io/en/latest/comprehensive_installation.html#source-code-install>`_
54+
55+
- `Development installation as a library with "pip install deltacode"
56+
<https://deltacode.readthedocs.io/en/latest/comprehensive_installation.html#pip-install>`_
57+
58+
- `Run in a Docker container with a git clone and "docker run"
59+
<https://deltacode.readthedocs.io/en/latest/comprehensive_installation.html#docker-install>`_
60+
61+
62+
Quick Start
63+
===========
64+
65+
Run this command to display the command
66+
help::
67+
68+
deltacode --help
69+
70+
Run a sample delta::
71+
72+
deltacode -n samples/samples.json -o samples/samples.json
6073

6174
Run a simple delta saved to the `output.json` file::
6275

63-
./deltacode -n samples/samples.json -o samples/samples.json -j output.json
76+
deltacode -n samples/samples.json -o samples/samples.json -j output.json
6477

6578
Then open `output.json` to view the delta results.
6679

@@ -75,33 +88,40 @@ Support
7588
If you have a problem, a suggestion or found a bug, please enter a ticket at:
7689
https://github.com/nexB/deltacode/issues
7790

78-
For other questions, discussions, and chats, we have:
91+
For discussions and chats, we have:
7992

80-
- an official Gitter channel at https://gitter.im/aboutcode-org/discuss
81-
Gitter also has an IRC bridge at https://irc.gitter.im/
93+
* an official Gitter channel for `web-based chats
94+
<https://gitter.im/aboutcode-org/discuss>`_.
95+
Gitter is also accessible via an `IRC bridge <https://irc.gitter.im/>`_.
96+
There are other AboutCode project-specific channels available there too.
97+
98+
* an official `#aboutcode` IRC channel on liberachat (server web.libera.chat).
99+
This channel receives build and commit notifications and can be noisy.
100+
You can use your favorite IRC client or use the `web chat
101+
<https://web.libera.chat/?#aboutcode>`_.
82102

83-
- an official #aboutcode IRC channel on liberachat (server web.libera.chat)
84-
for DeltaCode and other related tools. Note that this receives
85-
notifications from repos so it can be a tad noisy. You can use your
86-
favorite IRC client or use the web chat at
87-
https://web.libera.chat/?#aboutcode .
88103

89104

90105
Source code
91106
===========
92107

108+
* https://github.com/nexB/deltacode/releases
93109
* https://github.com/nexB/deltacode.git
110+
* https://pypi.org/project/deltacode/
94111

95112

96113
License
97114
=======
98115

99116
* Apache-2.0 with an acknowledgement required to accompany the delta output.
100117

101-
See the NOTICE file for more details.
102-
118+
See the NOTICE file and the .ABOUT files that document the origin and license of
119+
the third-party code used in DeltaCode for more details.
103120

104-
Documentation & FAQ
105-
===================
121+
.. |azure| image:: https://dev.azure.com/nexB/deltacode/_apis/build/status/nexB.deltacode?branchName=develop
122+
:target: https://dev.azure.com/nexB/deltacode/_build/latest?definitionId=1&branchName=develop
123+
:alt: Azure tests status (Linux, macOS, Windows)
106124

107-
https://github.com/nexB/deltacode/wiki
125+
.. |docs-rtd| image:: https://readthedocs.org/projects/deltacode/badge/?version=latest
126+
:target: https://deltacode.readthedocs.io/en/latest/?badge=latest
127+
:alt: Documentation Status

docs/source/deltacode/GSOC_2021_report.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@ Links
4949
-----
5050

5151
..
52-
[Project Link] https://summerofcode.withgoogle.com/organizations/5312205181943808/#6516503005888512
52+
[Project Link] https://summerofcode.withgoogle.com/archive/2021/projects/6580434925780992
5353
54-
- `Project Details <https://summerofcode.withgoogle.com/organizations/5312205181943808/#6516503005888512>`_
55-
- `Proposal <https://docs.google.com/document/d/19btijAja6x8hbD_X-dGor1RiiEGF3-1gEHYkzqzC3xQ/edit#heading=h.z6ne0og04bp5>`_
54+
- `Project Details <https://summerofcode.withgoogle.com/archive/2021/projects/6580434925780992>`_
55+
- `Proposal <https://docs.google.com/document/d/19btijAja6x8hbD_X-dGor1RiiEGF3-1gEHYkzqzC3xQ/edit>`_
5656
- `ScanCode Toolkit <https://github.com/nexB/scancode-toolkit>`_
5757
- `DeltaCode <https://github.com/nexB/deltacode>`_
5858

5959
------------
6060

6161
I’ve had a wonderful time during these three months and have learned plenty of things. I would
6262
really like to thank `@pombredanne <https://github.com/pombredanne>`_,
63-
`@majurg <https://github.com/majurg>`_, and `@JonoYang <https://github.com/JonoYang>`_ for their
63+
`@steven-esser <https://github.com/steven-esser>`_, and `@JonoYang <https://github.com/JonoYang>`_ for their
6464
constant support throughout the journey. From good job claps to nit-picky constructive
6565
code-reviews, I enjoyed every bit of this GSoC project.
6666

6767
I had a wonderful time during the GSOC, I learned a lot of things during this time.I really
6868
enjoyed this project. I would really like to thank my mentors
6969
`@pombredanne <https://github.com/pombredanne>`_,
70-
`@majurg <https://github.com/majurg>`_, and `@TG1999 <https://github.com/TG1999>`_,
70+
`@steven-esser <https://github.com/steven-esser>`_, and `@TG1999 <https://github.com/TG1999>`_,
7171
and all other About code members who constantly supported me throughout this project.

0 commit comments

Comments
 (0)