Skip to content

Commit

Permalink
added to contributing.md to include PR process and general descriptio…
Browse files Browse the repository at this point in the history
…n. moved developer focused info to devtools/
  • Loading branch information
asampat3090 committed May 11, 2018
1 parent 7f14bd7 commit dbda50c
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 15 deletions.
38 changes: 23 additions & 15 deletions CONTRIBUTING.md
@@ -1,6 +1,23 @@
# Datmo

Guidelines for contributors coming soon.
## Contributing to Datmo
We encourage community contributions to Datmo. The best place to get started is by running examples
locally. Once you have it working, contributors can take a shot at improving our documentation. While
our documentation is continually updated with code updates, there is always much room for improvement.
Documentation can be found in the `docs/` directory, in the docstrings for functions in the code, and
in the `README` file.

## Pull Request Process
Every contribution, must be a pull request and must have adequate time for review by other committers.

The goal of every pull request is to merge it into the main master code branch. The tasks of reviewing
a new pull request will be done by the main committers / maintainers of the repository. Here are a few flows for how
a pull request might progress

1) the PR is not mergeable, in which case either the maintainer or the person who created the branch should then mention they are addressing it and then work on it. If not the case progress to 2
2) the PR is mergeable but requires changes that would need to be done by the person who created the branch / feature, in which case we comment and just keep the thread going -- then it may progress to either 3 or 4
3) the PR is mergeable and is good to go
4) the PR is mergeable and is almost good to go but requires changes that are quick and can be done by the maintainer -- or by other contributors to the main repo to make it consistent with existing code, in which case we close the current PR, bring the branch into the main repo, and make changes there, then merge

## Code Style Guidelines
Datmo uses [yapf](https://github.com/google/yapf) to autoformat code.
Expand All @@ -11,20 +28,11 @@ cd <git_root>
yapf -i <python_files changed>
```

If you're using Visual Studio Code and want to run `yapf -i [filename]` on save, install the [Run on Save] extension.(https://marketplace.visualstudio.com/items?itemName=emeraldwalk.RunOnSave)

```json
"emeraldwalk.runonsave": {
"commands": [
{
"match":"\\.py$",
"cmd":"yapf -i ${file}"
}
]
}
```

Our integration tests will fail if code is not formatted correctly

## Documentation Style Guidelines
Datmo uses [NumPy style documentation](https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt). Please follow these conventions when documenting code, since we use [Sphinx+Napoleon](http://www.sphinx-doc.org/en/stable/ext/napoleon.html) to automatically generate docs on [our Docs page](http://datmo.readthedocs.io/en/latest/)
Datmo uses [NumPy style documentation](https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt). Please follow these conventions when documenting code, since we use [Sphinx+Napoleon](http://www.sphinx-doc.org/en/stable/ext/napoleon.html) to automatically generate docs on [our Docs page](http://datmo.readthedocs.io/en/latest/)

## Developer Information
You can find more developer information in the [`devtools/` directory](/devtools) including helpful
code snippets and commands you might find helpful in the development process.
13 changes: 13 additions & 0 deletions devtools/README.md
Expand Up @@ -73,6 +73,19 @@ else
fi
```

If you're using Visual Studio Code and want to run `yapf -i [filename]` on save, install the [Run on Save] extension.(https://marketplace.visualstudio.com/items?itemName=emeraldwalk.RunOnSave)

```json
"emeraldwalk.runonsave": {
"commands": [
{
"match":"\\.py$",
"cmd":"yapf -i ${file}"
}
]
}
```

## Upload to PyPi
Versions of datmo are uploaded to [PyPI](https://pypi.org/project/datmo/) with the following steps. NOTE:
only those with credentials for the PyPI website will be able to upload new versions.
Expand Down

0 comments on commit dbda50c

Please sign in to comment.