Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation: Updated installation and contribution documentation #4148

Merged
merged 6 commits into from
Aug 29, 2024
Merged
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
7 changes: 1 addition & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
<!--
Thank you for your pull request!

Please use a Pull Request title that follows the requested syntax since it will be included in the release notes), see:
https://github.com/silx-kit/silx/blob/main/CONTRIBUTING.rst#pull-request-title-format
-->
<!-- Thank you for your pull request! -->

Checklist:

Expand Down
67 changes: 53 additions & 14 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
How to contribute to *silx*
===========================
How to contribute
=================

This document describes how to contribute to the *silx* project.
The process is similar to many other open-source projects like *numpy*, just lighter as the project is smaller, so you won't be surprised with the pipeline.

*scikit-image* provides a nice tutorial in `their own CONTRIBUTING guide`_.
Development process
-------------------

This project follows the standard open-source project github workflow,
which is described in other projects like `scikit-image <https://scikit-image.org/docs/stable/development/contribute.html>`_.

1. Create your GitHub account `https://help.github.com/categories/setup/`
and upload your SSH keys.
1. Create your `GitHub <https://github.com/>`_ account and upload your SSH keys.

2. Fork the silx project from `https://github.com/silx-kit/silx/`.
The button is on the top right of the page.
2. Fork the silx project from https://github.com/silx-kit/silx/.

3. Clone your GitHub version locally on the computer you intend to work on.
3. Clone your GitHub repository on yout local computer.

.. code-block:: bash

git clone [email protected]/<your_user_name>/silx
cd silx

4. Install the dependencies defined in *requirements-dev.txt*.

Expand All @@ -42,16 +42,17 @@ The process is similar to many other open-source projects like *numpy*, just lig

10. Create a pull request (PR) from your feature branch on GitHub to trigger
the review process. Indicate this PR is related to the issue you opened in 6.
Make sure to follow the `Pull Request title format`_.

11. Discuss with the maintainer who is reviewing your code using the GitHub interface.

If you encounter any problems or have any questions you can always ask on the `Issues page`_.
If you encounter any problems or have any questions you can always ask on the `Issues page <https://github.com/silx-kit/silx/issues>`_.


Pull Request title format
-------------------------

To ease release notes authoring, please use the following syntax for the title of your Pull Requests (PR)::
To ease release notes authoring, when creating a Pull Request (PR), please use the following syntax for the title::

<Subpackage/Module/Topic>: <Action> <summary of the main change affecting silx's users>

Expand Down Expand Up @@ -79,8 +80,46 @@ With:

- **Summary**: A short description of the main change as you would like to read it from release notes.

.. _their own CONTRIBUTING guide: https://github.com/scikit-image/scikit-image/blob/3736339272b9d129f98fc723b508ac5490c171fa/CONTRIBUTING.rst
.. _Issues page: https://github.com/silx-kit/silx/issues

Code formatting
---------------
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved documentation from installation to contribution


To format the code, use `black <https://black.readthedocs.io>`_.


How-to build the documentation
------------------------------

To build the documentation, using `Sphinx <http://www.sphinx-doc.org/>`_, run:

.. code-block:: bash

pip install . # Make sure to install the same version as the source
sphinx-build doc/source/ build/html

.. note::

To re-generate the example script screenshots, build the documentation with the
environment variable ``DIRECTIVE_SNAPSHOT_QT`` set to ``True``.


How-to run the tests
--------------------

To run the tests of an installed version of *silx*, run the following on the python interpreter:

.. code-block:: python

import silx.test
silx.test.run_tests()

To run the test suite of a development version, use the *run_tests.py* script at
the root of the source project.

.. code-block:: bash

python ./run_tests.py


How-to make a release
---------------------
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ License
-------

The source code of *silx* is licensed under the MIT license.
See the `LICENSE <https://github.com/silx-kit/silx/blob/master/LICENSE>`_ and
`copyright <https://github.com/silx-kit/silx/blob/master/copyright>`_ files for details.
See the `LICENSE <https://github.com/silx-kit/silx/blob/main/LICENSE>`_ and
`copyright <https://github.com/silx-kit/silx/blob/main/copyright>`_ files for details.

Citation
--------
Expand Down
4 changes: 2 additions & 2 deletions doc/source/applications/view.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Custom plot selection

Plot custom curves from selected 1D datasets.

How to access :
............
How to access
.............

.. grid :: 1 2 2 2

Expand Down
1 change: 1 addition & 0 deletions doc/source/contributing.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.. include:: ../../CONTRIBUTING.rst
8 changes: 8 additions & 0 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,28 @@ You can install **silx** via `pip <https://pypi.org/project/pip>`_, `conda <http

pip install silx[full]

See :ref:`Installation with pip`

.. tab-item:: conda

.. code-block:: bash

conda install -c conda-forge silx

See :ref:`Installation with conda`


.. tab-item:: Debian & Ubuntu

.. code-block:: bash

sudo apt-get install silx

See :ref:`Installation on Debian & Ubuntu`

|silx_installer_btn| or decompress the |silx_archive|.


:ref:`Applications`
-------------------

Expand Down
Loading
Loading