From 8a308040a9c1d34923622735ac5fe147432f2cfa Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Thu, 17 Apr 2014 10:22:05 -0500 Subject: [PATCH] Update CONTRIBUTING.md --- CONTRIBUTING.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1e7808..0febefc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,14 +1,20 @@ # Pull Requests -Pull requests should be made against the `working` branch. +Pull requests should be made against the `devel` branch. Pull requests should be made from a git feature branch. Pull requests will not be accepted that: + +1. Are not made against the `devel` branch +1. Are submitted from a branch named `devel` +1. Don't pass pep8/pyflakes/flake8 +1. Do not work with Python 2.4-3.4 or pypy +1. Add python modules not included with the Python standard library # Coding Guidelines -In general, I follow strict pep8 and pyflakes. All code must pass these tests. Since we support python 2.4-3.4, pyflakes reports unknown names in python 3. pyflakes is run in python 2.7 only in my tests. +In general, I follow strict pep8 and pyflakes. All code must pass these tests. Since we support python 2.4-3.4 and pypy, pyflakes reports unknown names in python 3. pyflakes is run in python 2.7 only in my tests. # Supported Python Versions -All code needs to support Python 2.4-3.4. +All code needs to support Python 2.4-3.4 and pypy. # Permitted Python Modules