Merge pull request #427 from betatim/update-contrib-docs

[MRG] Update the contributing docs

CONTRIBUTING.md

@@ -2,12 +2,43 @@
 
 This document covers:
 
+- Process for making a code contribution
 - Setting up for Local Development
 - Running Tests
 - Updating and Freezing BuildPack Dependencies
-- Merging a Pull Request
 - Creating a Release
 
+
+## Process for making a code contribution
+
+This outlines the process for getting changes to the code of
+repo2docker merged. This serves as information on when a PR is "done".
+
+Contributions should follow these guidelines:
+
+* all changes by pull request (PR);
+* please prefix the title of your pull request with `[MRG]` if the contribution
+  is complete and should be subjected to a detailed review;
+* create a PR as early as possible, marking it with `[WIP]` while you work on
+  it (good to avoid duplicated work, get broad review of functionality or API,
+  or seek collaborators);
+* a PR solves one problem (do not mix problems together in one PR) with the
+  minimal set of changes;
+* describe why you are proposing the changes you are proposing;
+* try to not rush changes (the definition of rush depends on how big your
+  changes are);
+* someone else has to merge your PR;
+* new code needs to come with a test;
+* apply [PEP8](https://www.python.org/dev/peps/pep-0008/) as much
+  as possible, but not too much;
+* no merging if travis is red;
+* do use merge commits instead of merge-by-squashing/-rebasing. This makes it
+  easier to find all changes since the last deployment `git log --merges --pretty=format:"%h %<(10,trunc)%an %<(15)%ar %s" <deployed-revision>..`
+* [when you merge do deploy to mybinder.org](http://mybinder-sre.readthedocs.io/en/latest/deployment/how.html)
+
+These are not hard rules to be enforced by :police_car: but instead guidelines.
+
+
 ## Setting up for Local Development
 
 To develop & test repo2docker locally, you need:
@@ -81,6 +112,7 @@ Server:
 
 Then you are good to go!
 
+
 ## Running tests
 
 We have a lot of tests for various cases supported by repo2docker in the `tests/`
@@ -163,49 +195,18 @@ See the subsections below for more detailed instructions.
 
 ### Make a Pull Request
 
-Once you've made the commit, please make a Pull Request to the `jupyter/repo2docker`
+Once you've made the commit, please make a Pull Request to the `jupyterhub/repo2docker`
 repository, with a description of what versions were bumped / what new packages were
 added and why. If you fix a bug or add new functionality consider adding a new
 test to prevent the bug from coming back/the feature breaking in the future.
 
 
-## Merging a Pull Request
-
-There are not a lot of rules around merging a Pull Request (PR), we rely on
-individuals to be responsible and tread softly when doing so. Below a few
-standard procedures that have proven useful over time that we do follow:
-
-* do not merge your own PR
-* wait for Travis to complete
-* check if test coverage has gone up or down, consider discussing additional
-  tests to keep coverage at the same level or even increase it
-* do use merge commits instead of merge-by-squashing/-rebasing. This makes it
-  easier to find all changes since the last deployment `git log --merges --pretty=format:"%h %<(10,trunc)%an %<(15)%ar %s" <deployed-revision>..`
-* [when you merge do deploy to mybinder.org](http://mybinder-sre.readthedocs.io/en/latest/deployment/how.html)
-
-
-
 ## Creating a Release
 
 We try to make a release of repo2docker every few months if possible.
 
-## Obtain access credentials
+We follow semantic versioning.
 
-To release repo2docker, you will need proper access credentials prior to beginning the process.
+Check hat the Change log is ready and then tag a new release on GitHub.
 
-1. Access to the PyPI package for repo2docker
+When the travis run completes check that the new release is available on PyPI.
-2. Access to push tags to the jupyter/repo2docker repository
-3. Access to push images to dockerhub on jupyter/repo2docker
-
-If you do not have access to any of these, please contact a current maintainer of the project!
-
-## Release Process Steps
-
-1. Make a new release on GitHub. When the tag is create travis will build
-   and deploy that tag as the latest release.
-
-2. Tag and push a docker image:
-   ```bash
-   docker build -t jupyter/repo2docker:v<version> .
-   docker push jupyter/repo2docker:v<version>
-   ```

README.md

@@ -1,15 +1,19 @@
-# jupyter-repo2docker
+# repo2docker
 
 [![Build Status](https://travis-ci.org/jupyter/repo2docker.svg?branch=master)](https://travis-ci.org/jupyter/repo2docker)
 [![Documentation Status](https://readthedocs.org/projects/repo2docker/badge/?version=latest)](http://repo2docker.readthedocs.io/en/latest/?badge=latest)
 
-**jupyter-repo2docker** takes as input a repository source, such as a GitHub
+`repo2docker` fetches a git repository and builds a container image based on
-repository. It then builds, runs, and/or pushes Docker images built from that source.
+the configuration files found in the repository.
 
 See the [repo2docker documentation](http://repo2docker.readthedocs.io)
 for more information.
 
-## Prerequisites
+See the [contributing guide](CONTRIBUTING.md) for information on contributing to
+repo2docker.
+
+## Using repo2docker
+### Prerequisites
 
 1. Docker to build & run the repositories. The [community edition](https://store.docker.com/search?type=edition&offering=community)
    is recommended.
@@ -17,9 +21,11 @@ for more information.
 
 Supported on Linux and macOS. [See documentation note about Windows support.](http://repo2docker.readthedocs.io/en/latest/install.html#note-about-windows-support)
 
-## Installation
+### Installation
 
-To install from PyPI, the python packaging index, using `pip`:
+This a quick guide to installing `repo2docker`, see our documentation for [a full guide](https://repo2docker.readthedocs.io/en/latest/install.html).
+
+To install from PyPI:
 
 ```bash
 pip install jupyter-repo2docker
@@ -33,11 +39,11 @@ cd repo2docker
 pip install -e .
 ```
 
-## Usage
+### Usage
 
-The core feature of repo2docker is to fetch a repository (from GitHub or locally),
+The core feature of repo2docker is to fetch a git repository (from GitHub or locally),
 build a container image based on the specifications found in the repository &
-optionally launch a local Jupyter Notebook you can use to explore it.
+optionally launch the container that you can use to explore the repository.
 
 **Note that Docker needs to be running on your machine for this to work.**
 
@@ -62,11 +68,13 @@ with the contents of the repository you had just built!
 For more information on how to use ``repo2docker``, see the
 [usage guide](http://repo2docker.readthedocs.io/en/latest/usage.html).
 
+
 ## Repository specifications
 
 Repo2Docker looks for configuration files in the source repository to
-determine how the Docker image should be built. It is philosophically similar
+determine how the Docker image should be built. For a list of the configuration
-to [Heroku Build Packs](https://devcenter.heroku.com/articles/buildpacks).
+files that ``repo2docker`` can use, see the
+[complete list of configuration files](https://repo2docker.readthedocs.io/en/latest/config_files.html).
 
-For a list of the configuration files that ``repo2docker`` can use,
+The philosophy of repo2docker is inspired by
-see the [usage guide](http://repo2docker.readthedocs.io/en/latest/usage.html).
+[Heroku Build Packs](https://devcenter.heroku.com/articles/buildpacks).