Skip to content

Commit 54fc7d5

Browse files
authored
Merge branch 'main' into strict_sphinx
2 parents a74366d + 150881d commit 54fc7d5

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- v*
99
pull_request:

CONTRIBUTING.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ For merging, you should:
7373
3. Add a file in ``changelog.d/`` describing the changes. The filename should be ``{id}.{type}.rst``, where ``{id}`` is the number of the GitHub issue or pull request and ``{type}`` is one of ``breaking`` (for breaking changes), ``deprecation`` (for deprecations), or ``change`` (for non-breaking changes). For example, to add a new feature requested in GitHub issue #1234, add a file called ``changelog.d/1234.change.rst`` describing the change.
7474
4. Add yourself to ``AUTHORS.rst``.
7575

76-
.. [1] If you don't have all the necessary python versions available locally you can rely on Travis - it will
77-
`run the tests <https://travis-ci.org/python-desert/desert/pull_requests>`_ for each change you add in the pull request.
76+
.. [1] If you don't have all the necessary python versions available locally you can rely on GitHub Actions - it will
77+
`run the tests <https://github.com/python-desert/desert/actions>`_ for each change you add in the pull request.
7878
7979
It will be slower though ...
8080

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Desert: DRY deserialization
1212
* - code
1313
- | |latest-commit|
1414
* - tests
15-
- | |travis|
15+
- | |actions|
1616
| |codecov|
1717
* - package
1818
- | |version|
@@ -26,9 +26,9 @@ Desert: DRY deserialization
2626
:alt: Documentation Status
2727

2828

29-
.. |travis| image:: https://img.shields.io/travis/com/python-desert/desert/master
30-
:alt: Travis-CI Build Status
31-
:target: https://travis-ci.com/python-desert/desert
29+
.. |actions| image:: https://github.com/python-desert/desert/actions/workflows/ci.yml/badge.svg?branch=main
30+
:alt: GitHub Actions Build Status
31+
:target: https://github.com/python-desert/desert/actions?query=branch%3Amain
3232

3333
.. |codecov| image:: https://codecov.io/github/python-desert/desert/coverage.svg?branch=master
3434
:alt: Coverage Status

0 commit comments

Comments
 (0)