Skip to content

Commit

Permalink
DOC: Add contributing document (#415)
Browse files Browse the repository at this point in the history
  • Loading branch information
janbjorge authored Jan 12, 2024
1 parent e7198d0 commit a8485ad
Show file tree
Hide file tree
Showing 7 changed files with 254 additions and 38 deletions.
169 changes: 169 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
# Contributing

Contributions are welcome, and they are greatly appreciated! Every
little bit helps, and credit will always be given.

You can contribute in many ways:

## Types of Contributions

### Report Bugs
Report bugs at https://github.com/equinor/fmu-dataio/issues.

If you are reporting a bug, please include:

* Your operating system name and version.
* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.

### Fix Bugs
Look through the Git issues for bugs. Anything tagged with "bug"
and "help wanted" is open to whoever wants to implement it.

### Implement Features
Look through the Git issues for features. Anything tagged with "enhancement"
and "help wanted" is open to whoever wants to implement it.

### Write Documentation
Yes, fmu-dataio could always use more documentation, whether as part of the
official fmu-dataio docs, in docstrings, or even on the web in blog posts,
articles, and such.

### Submit Feedback
The best way to send feedback is to file an issue
at https://github.com/equinor/fmu-dataio/issues.

If you are proposing a feature:

* Explain in detail how it would work.
* Keep the scope as narrow as possible, to make it easier to implement.

### Get Started!
Ready to contribute? Here's how to set up ``fmu-dataio`` for local development.

1. Fork the ``fmu-dataio`` repo on Github equinor to your personal user
2. Clone your fork locally:

```bash
$ git clone [email protected]:your_name_here/fmu-dataio
$ cd fmu-dataio
$ git remote add upstream [email protected]:equinor/fmu-dataio
$ git remote -v
origin [email protected]:your_name_here/fmu-dataio (fetch)
origin [email protected]:your_name_here/fmu-dataio (push)
upstream [email protected]:equinor/fmu-dataio (fetch)
upstream [email protected]:equinor/fmu-dataio (push)
```

3. Install your local copy into a virtualenv. Using python 3, this is how you set
up your fork for local development (first time):

```bash
$ cd <fmu-dataio>
$ python -m venv .
$ source bin/activate
$ pip install pip -U
$ pip install ".[dev,docs]"
$ pytest # No tests should fail. (exit code 0)
```

4. Create a branch for local development:

```bash
$ git checkout -b name-of-your-bugfix-or-feature
```

Now you can make your changes locally.

5. When you're done making changes, check that your changes pass ruff and the tests:

```bash
$ ruff check .
$ pytest

```

6. Commit your changes (see below) and push your branch to GitHub:

```bash
$ git add .
$ git commit -m "AAA: Your detailed description of your changes."
$ git push origin name-of-your-bugfix-or-feature
```

7. Submit a pull request through the Github website.


### Writing commit messages
The following takes effect from year 2021.

Commit messages should be clear and follow a few basic rules. Example:

```
ENH: add functionality X to numpy.<submodule>.
```

The first line of the commit message starts with a capitalized acronym
(options listed below) indicating what type of commit this is. Then a blank
line, then more text if needed. Lines shouldn't be longer than 72
characters. If the commit is related to a ticket, indicate that with
``"See #3456", "Cf. #3344, "See ticket 3456", "Closes #3456"`` or similar.

Read `Chris Beams hints on commit messages <https://chris.beams.io/posts/git-commit/>`_.

Describing the motivation for a change, the nature of a bug for bug fixes or
some details on what an enhancement does are also good to include in a commit message.
Messages should be understandable without looking at the code changes.
A commit message like FIX: fix another one is an example of what not to do;
the reader has to go look for context elsewhere.

Standard acronyms to start the commit message with are:

```
API: an (incompatible) API change (will be rare)
BLD: change related to building fmu-dataio
BUG: bug fix
CLN: code cleanup, maintenance commit (refactoring, typos, PEP, etc.)
DEP: deprecate something, or remove a deprecated object
DOC: documentation, addition, updates
ENH: enhancement, new functionality
FIX: fixes wrt to technical issues
PERF: performance or bench-marking
REL: related to releasing fmu-dataio
REV: revert an earlier commit
TST: addition or modification of tests
```

### Type Hints
As of 2024, fmu-dataio requires the use of type annotations in all new feature
developments, incorporating Python 3.10's enhanced syntax for type hints.
This facilitates a more concise and readable style.

### Style Guidelines
- For Python versions prior to 3.10, include the following import for compatibility:


```python
from __future__ import annotations
```

- Use Python's built-in generics (e.g., `list`, `tuple`) directly. This approach is preferred over importing types like `List` or `Tuple` from the `typing` module.

- Apply the new union type syntax using the pipe (`|`) for clarity and simplicity. For example:

```python
primes: list[int | float] = []
```

- For optional types, use `None` with the pipe (`|`) instead of `Optional`. For instance:

```python
maybe_primes: list[int | None] = []
```

Note: These guidelines align with PEP 604 and are preferred for all new code submissions and when
updating existing code.


### Pull Request Guidelines
Before you submit a pull request: Ensure that your feature includes a test.
34 changes: 0 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,3 @@ including post- and pre-processing jobs and as part of ERT `FORWARD_MODEL`, both

The metadata standard is defined by a [JSON schema](https://json-schema.org/). Within Equinor,
the schema is available on a Radix-hosted endpoint ⚡


## Installation

Install a specific version (e.g. 1.2.3) directly from github through:

```console
pip install git+ssh://[email protected]/equinor/[email protected]
```

Local development and testing:

Make your own fork of fmu-dataio and then clone it locally on unix.
Create a virtual environment:
```console
python -m venv my_venv
```
Activate the venv:
```console
source my_venv/bin/activate
```
Upgrade pip and install fmu-dataio from the source:
```console
pip install --upgrade pip
pip install -e .
```
Install requirements for running tests:
```console
pip install -e .[dev,docs]
```
Then run the command:
```console
pytest
```
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
release = fmu.dataio.__version__

extensions = [
"myst_parser",
"sphinxcontrib.apidoc",
"sphinx.ext.viewcode",
"sphinx.ext.napoleon",
Expand Down Expand Up @@ -52,7 +53,7 @@
# General information about the project.
project = "fmu.dataio"
current_year = date.today().year
copyright = "Equinor " + str(current_year) + f" (fmu-dataio release {release})"
copyright = f"Equinor {current_year} (fmu-dataio release {release})"


# Sort members by input order in classes
Expand Down
2 changes: 2 additions & 0 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.. include:: ../CONTRIBUTING.md
:parser: myst_parser.sphinx_
18 changes: 15 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
Welcome to fmu-dataio' documentation!
======================================
Welcome to FMU-dataio's documentation
=====================================

Contents:
FMU-dataio is a specialized library for managing data in Fast Model Update (FMU) workflows. It focuses on exporting data while adhering to the FMU standards, which include both file and folder conventions, and rich metadata integration for various data consumers. The library is designed for consistent usage across different stages of FMU workflows, such as pre- and post-processing jobs, and is compatible with Ensemble Reservoir Tool (ERT) FORWARD_MODEL, within and outside RMS.

Developed and maintained by Equinor, FMU-dataio streamlines data handling in subsurface reservoir modeling and is integral to FMU's efficiency and accuracy.

For further details, visit the official documentation: `fmu-dataio documentation <https://fmu-dataio.readthedocs.io/en/latest/>`_.

.. toctree::
:maxdepth: 2
:caption: About

installation
contributing

.. toctree::
:maxdepth: 2
:caption: User Guide and Reference

overview
preparations
Expand Down
65 changes: 65 additions & 0 deletions docs/installation.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
.. highlight:: shell

============
Installation
============

From pip
--------

For a selection of platforms (Linux/Windows/MacOS; all 64bit) and Python versions:

.. code-block:: console
$ pip install fmu-dataio
Stable release in Equinor
-------------------------

Within Equinor, the stable release is pre-installed, so all you have
to do is:

.. code-block:: python
import fmu.dataio
From github
------------

.. code-block:: console
$ pip install git+https://github.com/equinor/fmu-dataio
From downloaded sources
-----------------------

The sources for FMU-dataio can be downloaded from the `Equinor Github repo`_.

You can either clone the public repository:

.. code-block:: console
$ git clone [email protected]:equinor/fmu-dataio
For required python packages, see the pyproject.toml file in the root folder.

Once you have a copy of the source, and you have a `virtual environment`_,
then always run tests (run first compile and install with ``pip install .``):

.. code-block:: console
$ pytest
Next you can install it with:

.. code-block:: console
$ pip install .
.. _Equinor Github repo: https://github.com/equinor/fmu-dataio
.. _virtual environment: http://docs.python-guide.org/en/latest/dev/virtualenvs/
.. _manual install of Shapely: https://towardsdatascience.com/install-shapely-on-windows-72b6581bb46c
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dev = [
]
docs = [
"autoapi",
"myst-parser",
"pydocstyle",
"sphinx-autodoc-typehints<1.23",
"sphinx-rtd-theme",
Expand Down

0 comments on commit a8485ad

Please sign in to comment.