Merge branch 'master' into initial-repo
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..b70ce55
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python:
+ - 2.6
+ - 2.7
+ - 3.2
+ - 3.3
+install:
+ - pip install pytest flake8
+script:
+ - py.test
+ - flake8 .
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 0000000..539da50
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,21 @@
+This repository has a mandatory code review policy. Contributions
+should happen through pull requests. Never commit to ``master``
+directly.
+
+When in doubt, refer to PEP 8 for Python code.
+
+Write docstrings like this::
+
+ def some_function(some_arg):
+ """
+ Does some things.
+
+ :param some_arg: Some argument.
+ """
+
+So, specifically:
+
+- Always use three double quotes.
+- Put the three double quotes on their own line.
+- No blank line at the end.
+- Use Sphinx parameter/attribute documentation syntax.