Skip to content

Commit 9e6d484

Browse files
committed
Documentation / workflow changes after renaming master to main
1 parent c467853 commit 9e6d484

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

.github/workflows/builddocartifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: DocArtifacts
33
on:
44
push:
55
branches-ignore:
6-
- master
6+
- main
77
pull_request:
88
defaults:
99
run:
@@ -17,7 +17,7 @@ jobs:
1717
os: [ubuntu-latest]
1818
python-version: [3.8]
1919
steps:
20-
- name: Checkout master
20+
- name: Checkout main
2121
uses: actions/checkout@v2
2222
with:
2323
path: main

.github/workflows/builddocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: DocBuild
22

33
on:
44
push:
5-
branches: master
5+
branches: main
66

77
defaults:
88
run:
@@ -16,7 +16,7 @@ jobs:
1616
os: [ubuntu-latest]
1717
python-version: [3.8]
1818
steps:
19-
- name: Checkout master
19+
- name: Checkout main
2020
uses: actions/checkout@v2
2121
with:
2222
path: main

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
_pytest-order_ - a pytest plugin to order test execution
22
========================================================
33

4-
[![PyPI version](https://badge.fury.io/py/pytest-order.svg)](https://pypi.org/project/pytest-order) [![Testsuite](https://github.com/pytest-dev/pytest-order/workflows/Testsuite/badge.svg)](https://github.com/pytest-dev/pytest-order/actions?query=workflow%3ATestsuite) [![DocBuild](https://github.com/pytest-dev/pytest-order/workflows/DocBuild/badge.svg)](https://github.com/pytest-dev/pytest-order/actions?query=workflow%3ADocBuild) [![codecov](https://codecov.io/gh/pytest-dev/pytest-order/branch/master/graph/badge.svg?token=M9PHWZSHUU)](https://codecov.io/gh/pytest-dev/pytest-order) [![Python version](https://img.shields.io/pypi/pyversions/pytest-order.svg)](https://pypi.org/project/pytest-order)
4+
[![PyPI version](https://badge.fury.io/py/pytest-order.svg)](https://pypi
5+
.org/project/pytest-order) [![Testsuite](https://github.com/pytest-dev/pytest-order/workflows/Testsuite/badge.svg)](https://github.com/pytest-dev/pytest-order/actions?query=workflow%3ATestsuite) [![DocBuild](https://github.com/pytest-dev/pytest-order/workflows/DocBuild/badge.svg)](https://github.com/pytest-dev/pytest-order/actions?query=workflow%3ADocBuild) [![codecov](https://codecov.io/gh/pytest-dev/pytest-order/branch/main/graph/badge.svg?token=M9PHWZSHUU)](https://codecov.io/gh/pytest-dev/pytest-order) [![Python version](https://img.shields.io/pypi/pyversions/pytest-order.svg)](https://pypi.org/project/pytest-order)
56

67
`pytest-order` is a pytest plugin that allows you to customize the order in which
78
your tests are run. It uses the marker `order` that defines when a specific
@@ -19,12 +20,12 @@ Documentation
1920
-------------
2021
Apart from this overview, the following information is available:
2122
- usage documentation for the [latest release](https://pytest-dev.github.io/pytest-order/stable/)
22-
- usage documentation for the [current master](https://pytest-dev.github.io/pytest-order/dev/)
23+
- usage documentation for the [current main branch](https://pytest-dev.github.io/pytest-order/dev/)
2324
- all examples shown in the documentation can also be found in the
24-
[repository](https://github.com/pytest-dev/pytest-order/tree/master/example)
25-
- the [Release Notes](https://github.com/pytest-dev/pytest-order/blob/master/CHANGELOG.md)
25+
[repository](https://github.com/pytest-dev/pytest-order/tree/main/example)
26+
- the [Release Notes](https://github.com/pytest-dev/pytest-order/blob/main/CHANGELOG.md)
2627
with a list of changes in the latest versions
27-
- a [list of open issues](https://github.com/pytest-dev/pytest-order/blob/master/old_issues.md)
28+
- a [list of open issues](https://github.com/pytest-dev/pytest-order/blob/main/old_issues.md)
2829
in the original project and their handling in `pytest-order`
2930

3031
Overview
@@ -94,7 +95,7 @@ This is a fork of [pytest-ordering](https://github.com/ftobia/pytest-ordering).
9495
That project is not maintained anymore, and there are several helpful PRs
9596
that are now integrated into `pytest-order`. The idea and most of the code
9697
has been created by Frank Tobia, the author of that plugin, and
97-
[contributors](https://github.com/pytest-dev/pytest-order/blob/master/AUTHORS).
98+
[contributors](https://github.com/pytest-dev/pytest-order/blob/main/AUTHORS).
9899

99100
Comparison with pytest_ordering
100101
-------------------------------
@@ -107,5 +108,5 @@ rationale see also
107108
Ordering relative to other tests and all of the configuration options are not
108109
available in the released version of `pytest-ordering`.
109110
However, most of these features are derived from
110-
[issues](https://github.com/pytest-dev/pytest-order/blob/master/old_issues.md)
111+
[issues](https://github.com/pytest-dev/pytest-order/blob/main/old_issues.md)
111112
and pull requests already existing in `pytest-ordering`.

docs/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The latest released version can be installed from
5454
5555
pip install pytest-order
5656
57-
The latest master can be installed from the GitHub sources:
57+
The latest main branch can be installed from the GitHub sources:
5858

5959
.. code:: bash
6060
@@ -63,7 +63,7 @@ The latest master can be installed from the GitHub sources:
6363
Examples
6464
--------
6565
Most examples shown in this documentation can be also found in the repository
66-
under `example <https://github.com/pytest-dev/pytest-order/tree/master/example/>`__
66+
under `example <https://github.com/pytest-dev/pytest-order/tree/main/example/>`__
6767
as working test files.
6868

6969
Quickstart

perf_tests/test_relative_dense.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ def test_performance_relative(fixture_path_relative_dense):
4141
args = [fixture_path_relative_dense]
4242
TimedSorter.nr_marks = 900
4343
pytest.main(args, [pytest_order])
44-
assert TimedSorter.elapsed < 1.2
44+
assert TimedSorter.elapsed < 1.4

0 commit comments

Comments
 (0)