Skip to content
This repository was archived by the owner on Nov 28, 2019. It is now read-only.

Latest commit

 

History

History
73 lines (46 loc) · 3.32 KB

CONTRIBUTING.md

File metadata and controls

73 lines (46 loc) · 3.32 KB

#Contributing to govhack2014

Please make your own fork the repository and use pull requests to submit changes. This lets TravisCi check for errors before the changes are committed to master.

Use issues to organise work

So that other people know what you are working on, either assign an existing issue to yourself or create a new issue and then assign it. Ask if you don't have access or need help doing this. Reference the issue number #nn in the pull request when you have something ready to share (this lets Github link back to the issue automatically).

Running govhack2014 locally

Use python runserver.py to start the govhack2014 Flask application.

GitHub Flow

We have chosen to use the Github Flow workflow as descibed here: (http://scottchacon.com/2011/08/31/github-flow.html).

  • Anything in the master branch is deployable
  • To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)
  • Commit to that branch locally and regularly push your work to the same named branch on the server
  • When you need feedback or help, or you think the branch is ready for merging, open a pull request
  • After someone else has reviewed and signed off on the feature, you can merge it into master
  • Once it is merged and pushed to ‘master’, you can and should deploy immediately

Unit tests

We are using TravisCi to run tests whenever a pull request is submitted or a commit is made.

PEP8 compliance

TravisCi is now checking pep8 and PyFlakes compliance before running the application tests using flake8. The setup.cfg includes the settings for flake8 - at this stage just that lines can be up to 99 characters instead of the default 80. You can install flake8 locally using pip install flake8 or your editor may have a flake8 plugin.

Python virtual environment

To get a python3 virtualenvwrapper project I installed python3 (minimum 3.3, 3.4 recommended) (and virtualenvwrapper), checked where it was using

which python3

then told virtualenvwrapper to use that python by setting

export VIRTUALENV_PYTHON=/usr/local/bin/python3

then if you don't already have a project directory, use
mkproject govhack to create it or, if it already exists, change to the project directory and use

mkvirtualenv govhack
setvirtualenvproject

Once it is setup, to stop defaulting to python3, unset the python env variable using

unset VIRTUALENV_PYTHON

This has left my old environments using python 2.7 and the new one using 3.4.1

##Git remotes for testing

Fork the repository to your own account so that you can make pull requests. Clone it to your computer.

On your computer add a new remote 'upstream' so you can update your fork from the original makehackvoid project. If you want to be able to see (fetch) and pull down pull requests from the original makehackvoid project for testing, add a second fetch line to .git/config fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*

In .git/config I have:

[remote "upstream"]
    url = https://github.com/makehackvoid/govhack2014.git
    fetch = +refs/heads/*:refs/remotes/upstream/*
    fetch = +refs/pull/*/head:refs/remotes/upstream/pr/*