summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2021-02-13 12:37:01 -0600
committerGitHub <noreply@github.com>2021-02-13 13:37:01 -0500
commitd182dab3f7b51c3f3d5c13687f1abba81acd78e4 (patch)
tree1d9d133ca7a52cf574cc746e4e144134d8f8fd66
parent90f09650e289022e10570702eaf007f44d1cac05 (diff)
downloadpyopenssl-git-d182dab3f7b51c3f3d5c13687f1abba81acd78e4.tar.gz
rename main branch (#991)
* rename main branch * travis is gone, link GHA
-rw-r--r--CONTRIBUTING.rst4
-rw-r--r--README.rst9
2 files changed, 6 insertions, 7 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index ad10137..cc464ab 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -116,5 +116,5 @@ Feel free to cross-check this information with Keybase_.
.. _members of PyCA: https://github.com/orgs/pyca/people
.. _semantic newlines: http://rhodesmill.org/brandon/2012/one-sentence-per-line/
.. _reStructuredText: http://sphinx-doc.org/rest.html
-.. _CHANGELOG.rst: https://github.com/pyca/pyopenssl/blob/master/CHANGELOG.rst
-.. _`Code of Conduct`: https://github.com/pyca/pyopenssl/blob/master/CODE_OF_CONDUCT.rst
+.. _CHANGELOG.rst: https://github.com/pyca/pyopenssl/blob/main/CHANGELOG.rst
+.. _`Code of Conduct`: https://github.com/pyca/pyopenssl/blob/main/CODE_OF_CONDUCT.rst
diff --git a/README.rst b/README.rst
index 1366384..a628c8a 100644
--- a/README.rst
+++ b/README.rst
@@ -6,16 +6,15 @@ pyOpenSSL -- A Python wrapper around the OpenSSL library
:target: https://pyopenssl.org/en/stable/
:alt: Stable Docs
-.. image:: https://travis-ci.com/pyca/pyopenssl.svg?branch=master
- :target: https://travis-ci.com/pyca/pyopenssl
- :alt: Build status
+.. image:: https://github.com/pyca/pyopenssl/workflows/CI/badge.svg?branch=main
+ :target: https://github.com/pyca/pyopenssl/actions?query=workflow%3ACI+branch%3Amain
-.. image:: https://codecov.io/github/pyca/pyopenssl/branch/master/graph/badge.svg
+.. image:: https://codecov.io/github/pyca/pyopenssl/branch/main/graph/badge.svg
:target: https://codecov.io/github/pyca/pyopenssl
:alt: Test coverage
**Note:** The Python Cryptographic Authority **strongly suggests** the use of `pyca/cryptography`_
-where possible. If you are using pyOpenSSL for anything other than making a TLS connection
+where possible. If you are using pyOpenSSL for anything other than making a TLS connection
**you should move to cryptography and drop your pyOpenSSL dependency**.
High-level wrapper around a subset of the OpenSSL library. Includes