Skip to content

Commit c5f21e3

Browse files
committed
Move documentation from GitHub Pages to Read the Docs
- deploy on publish, change PyPI key name to default
1 parent 1aeecfa commit c5f21e3

22 files changed

+65
-183
lines changed

.github/workflows/builddocartifacts.yml

Lines changed: 0 additions & 50 deletions
This file was deleted.

.github/workflows/builddocs.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.github/workflows/pythontests.yml

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -76,52 +76,3 @@ jobs:
7676
with:
7777
env_vars: OS
7878
name: codecov-pytest-order
79-
80-
deploy:
81-
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
82-
83-
runs-on: ubuntu-latest
84-
85-
needs: [linter, test]
86-
87-
steps:
88-
- uses: actions/checkout@v2
89-
with:
90-
path: main
91-
- name: Set up Python
92-
uses: actions/setup-python@v2
93-
with:
94-
python-version: "3.8"
95-
- name: Install wheel
96-
run: |
97-
python -m pip install --upgrade pip
98-
pip install wheel
99-
- name: Build package
100-
run: |
101-
cd main
102-
python setup.py sdist bdist_wheel
103-
- name: Publish package to PyPI
104-
uses: pypa/gh-action-pypi-publish@master
105-
with:
106-
packages_dir: main/dist/
107-
user: __token__
108-
password: ${{ secrets.PYPI_API_TOKEN_PYTEST_ORDER }}
109-
- name: Create release docs
110-
run: |
111-
pip install sphinx
112-
cd main/docs
113-
make html
114-
- name: Checkout gh-pages
115-
uses: actions/checkout@v2
116-
with:
117-
ref: gh-pages
118-
path: doc
119-
- name: Copy and commit changes
120-
run: |
121-
cp -r main/docs/build/html/* doc/stable
122-
cd doc
123-
git config user.name "CI Build"
124-
git config user.email "[email protected]"
125-
git add stable/*
126-
git commit -a -m "Release documentation"
127-
git push

.github/workflows/release-deploy.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: release-deploy
2+
3+
on:
4+
release:
5+
types: [ published ]
6+
7+
jobs:
8+
9+
deploy:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
fail-fast: true
13+
matrix:
14+
python-version: [ '3.10' ]
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
with:
19+
path: main
20+
21+
- name: Set up Python ${{ matrix.python-version }}
22+
uses: actions/setup-python@v2
23+
with:
24+
python-version: ${{ matrix.python-version }}
25+
26+
- name: Build package
27+
run: |
28+
python -m pip install --upgrade pip
29+
python -m pip install build
30+
cd main
31+
python -m build
32+
33+
- name: Publish package to PyPI
34+
uses: pypa/gh-action-pypi-publish@master
35+
with:
36+
user: __token__
37+
password: ${{ secrets.PYPI_TOKEN }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
### Infrastructure
44
- added pytest 7.0 to CI tests
5+
- moved documentation to [Read the Docs](https://pytest-order.readthedocs.io)
56

67
## [Version 1.0.1](https://pypi.org/project/pytest-order/1.0.1/) (2022-01-09)
78
Bugfix release.

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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/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)
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://readthedocs.org/projects/pytest-pyfakefs/badge/?version=latest)](https://pytest-pyfakefs.readthedocs.io/en/latest/?badge=latest) [![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)
55

66
`pytest-order` is a pytest plugin that allows you to customize the order in which
77
your tests are run. It uses the marker `order` that defines when a specific
@@ -19,8 +19,8 @@ versions >= 5.0.0 for all versions except Python 3.10, and for pytest >=
1919
Documentation
2020
-------------
2121
Apart from this overview, the following information is available:
22-
- usage documentation for the [latest release](https://pytest-dev.github.io/pytest-order/stable/)
23-
- usage documentation for the [current main branch](https://pytest-dev.github.io/pytest-order/dev/)
22+
- usage documentation for the [latest release](https://pytest-order.readthedocs.io/en/stable/)
23+
- usage documentation for the [current main branch](https://pytest-order.readthedocs.io/en/latest/)
2424
- most examples shown in the documentation can also be found in the
2525
[repository](https://github.com/pytest-dev/pytest-order/tree/main/example)
2626
- the [Release Notes](https://github.com/pytest-dev/pytest-order/blob/main/CHANGELOG.md)
@@ -31,23 +31,23 @@ Apart from this overview, the following information is available:
3131
Features
3232
--------
3333
`pytest-order` provides the following features:
34-
- ordering of tests [by index](https://pytest-dev.github.io/pytest-order/stable/usage.html#ordering-by-numbers)
34+
- ordering of tests [by index](https://pytest-order.readthedocs.io/en/stable/usage.html#ordering-by-numbers)
3535
- ordering of tests both from the start and from the end (via negative
3636
index)
37-
- ordering of tests [relative to each other](https://pytest-dev.github.io/pytest-order/stable/usage.html#order-relative-to-other-tests)
37+
- ordering of tests [relative to each other](https://pytest-order.readthedocs.io/en/stable/usage.html#order-relative-to-other-tests)
3838
(via the `before` and `after` marker attributes)
3939
- session-, module- and class-scope ordering via the
40-
[order-scope](https://pytest-dev.github.io/pytest-order/stable/configuration.html#order-scope) option
40+
[order-scope](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-scope) option
4141
- directory scope ordering via the
42-
[order-scope-level](https://pytest-dev.github.io/pytest-order/stable/configuration.html#order-scope-level) option
42+
[order-scope-level](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-scope-level) option
4343
- hierarchical module and class-level ordering via the
44-
[order-group-scope](https://pytest-dev.github.io/pytest-order/stable/configuration.html#order-group-scope) option
44+
[order-group-scope](https://pytest-order.readthedocs.io/en/stable/configuration.html#order-group-scope) option
4545
- ordering tests with `pytest-dependency` markers if using the
46-
[order-dependencies](https://pytest-dev.github.io/pytest-order/stable/configuration.html#order-dependencies) option,
46+
[order-dependencies](hhttps://pytest-order.readthedocs.io/en/stable/configuration.html#order-dependencies) option,
4747
more information about `pytest-dependency` compatibility
48-
[here](https://pytest-dev.github.io/pytest-order/stable/other_plugins.html#relationship-with-pytest-dependency)
48+
[here](https://pytest-order.readthedocs.io/en/stable/other_plugins.html#relationship-with-pytest-dependency)
4949
- sparse ordering of tests via the
50-
[sparse-ordering](https://pytest-dev.github.io/pytest-order/stable/configuration.html#sparse-ordering) option
50+
[sparse-ordering](https://pytest-order.readthedocs.io/en/stable/configuration.html#sparse-ordering) option
5151

5252
Overview
5353
--------

example/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Reference test without ordering from the quick start chapter.
2-
See https://pytest-dev.github.io/pytest-order/dev/#quickstart
2+
See https://pytest-order.readthedocs.io/en/stable/#quickstart
33
"""
44

55

example/test_classes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Shows how to use relative sorting in test classes, see
2-
See https://pytest-dev.github.io/pytest-order/dev/#referencing-of-tests-in-other-classes-or-modules # noqa: E501
2+
See https://pytest-order.readthedocs.io/en/stable/#referencing-of-tests-in-other-classes-or-modules # noqa: E501
33
"""
44
import pytest
55

example/test_combined.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""Shows how combined ordinal and relative sorting is handled.
2-
See https://pytest-dev.github.io/pytest-order/dev/#combination-of-absolute-and-relative-ordering # noqa: E501
2+
See https://pytest-order.readthedocs.io/en/stable/#combination-of-absolute-and-relative-ordering # noqa: E501
33
"""
44
import pytest
55

example/test_module1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""One of the test files showing the use of the --order-scope option.
2-
See https://pytest-dev.github.io/pytest-order/dev/#order-scope
2+
See https://pytest-order.readthedocs.io/en/stable/#order-scope
33
"""
44
import pytest
55

0 commit comments

Comments
 (0)