diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-07 07:54:12 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-07 07:54:12 -0700 |
| commit | 22a425f8d68da1b78e18fb4f2a8e991f3d083188 (patch) | |
| tree | f474c319048c215bf47817cbf877cd63a7eb56ea | |
| parent | ad8b3548fe054d7744c22d2c5377b5cf3c704405 (diff) | |
| parent | cf4cc422c263e41cf5dd30e224dfd78e5db2e871 (diff) | |
| download | cryptography-22a425f8d68da1b78e18fb4f2a8e991f3d083188.tar.gz cryptography-22a425f8d68da1b78e18fb4f2a8e991f3d083188.tar.bz2 cryptography-22a425f8d68da1b78e18fb4f2a8e991f3d083188.zip | |
Merge branch 'master' into initial-repo
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | CONTRIBUTING.rst | 21 |
2 files changed, 32 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..b70ce55b --- /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 00000000..539da50f --- /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. |