summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2016-10-15 14:56:14 +0200
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-10-15 07:56:14 -0500
commitc3b38e54183489a9afd11ce200bdb5317fc7ab75 (patch)
tree66d1ff605fe7112187692496f3d4e5090e17d030 /CONTRIBUTING.rst
parentfe2a0a11b4678b3dc92c5b9cc6b06f371be970fd (diff)
downloadpyopenssl-git-c3b38e54183489a9afd11ce200bdb5317fc7ab75.tar.gz
Prepare 16.2.0 (#555)16.2.0
* Add empty line to CHANGELOG so extraction works * Fix a bunch of links * Prepare 16.2.0
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r--CONTRIBUTING.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 558e142..8539f61 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -28,7 +28,7 @@ Code
Create different pull requests for unrelated features or bugfixes.
- Code should follow `PEP 8`_, especially in the "do what code around you does" sense.
Follow OpenSSL naming for callables whenever possible is preferred.
-- New tests should use `py.test-style assertions`_ instead of the old ``self.assertXYZ``-style.
+- New tests should use `pytest-style assertions`_ instead of the old ``self.assertXYZ``-style.
- Pull requests that introduce code must test all new behavior they introduce as well as for previously untested or poorly tested behavior that they touch.
- Pull requests are not allowed to break existing tests.
We usually don't comment on pull requests that are breaking the CI because we consider them work in progress.
@@ -111,7 +111,7 @@ Feel free to cross-check this information with Keybase_.
.. _Keybase: https://keybase.io/hynek
.. _pyca/pyopenssl: https://github.com/pyca/pyopenssl
.. _PEP 8: https://www.python.org/dev/peps/pep-0008/
-.. _py.test-style assertions: https://pytest.org/latest/assert.html
+.. _pytest-style assertions: http://docs.pytest.org/en/latest/assert.html
.. _cryptography code review process: https://cryptography.io/en/latest/development/reviewing-patches/
.. _freenode: https://freenode.net
.. _mailing list: https://mail.python.org/mailman/listinfo/cryptography-dev