Skip to content

Commit ce206ae

Browse files
authored
Merge pull request #8162 from nicoddemus/rm-travis-badge
2 parents 02e69e5 + 3eef150 commit ce206ae

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

README.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
:target: https://codecov.io/gh/pytest-dev/pytest
2121
:alt: Code coverage Status
2222

23-
.. image:: https://travis-ci.org/pytest-dev/pytest.svg?branch=master
24-
:target: https://travis-ci.org/pytest-dev/pytest
25-
2623
.. image:: https://github.com/pytest-dev/pytest/workflows/main/badge.svg
2724
:target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Amain
2825

scripts/append_codecov_token.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
"""
22
Appends the codecov token to the 'codecov.yml' file at the root of the repository.
33
4-
This is done by CI during PRs and builds on the pytest-dev repository so we can upload coverage, at least
5-
until codecov grows some native integration like it has with Travis and AppVeyor.
4+
This is done by CI during PRs and builds on the pytest-dev repository so we can
5+
upload coverage, at least until codecov grows some native integration with GitHub Actions.
66
77
See discussion in https://github.com/pytest-dev/pytest/pull/6441 for more information.
88
"""

scripts/publish-gh-release-notes.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
Script used to publish GitHub release notes extracted from CHANGELOG.rst.
33
4-
This script is meant to be executed after a successful deployment in Travis.
4+
This script is meant to be executed after a successful deployment in GitHub actions.
55
66
Uses the following environment variables:
77
@@ -12,11 +12,8 @@
1212
1313
https://github.com/settings/tokens
1414
15-
It should be encrypted using:
16-
17-
$travis encrypt GH_RELEASE_NOTES_TOKEN=<token> -r pytest-dev/pytest
18-
19-
And the contents pasted in the ``deploy.env.secure`` section in the ``travis.yml`` file.
15+
This token should be set in a secret in the repository, which is exposed as an
16+
environment variable in the main.yml workflow file.
2017
2118
The script also requires ``pandoc`` to be previously installed in the system.
2219

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
isolated_build = True
33
minversion = 3.20.0
44
distshare = {homedir}/.tox/distshare
5-
# make sure to update environment list in travis.yml and appveyor.yml
65
envlist =
76
linting
87
py36
@@ -23,7 +22,7 @@ commands =
2322
doctesting: {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest
2423
coverage: coverage combine
2524
coverage: coverage report -m
26-
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS TERM
25+
passenv = USER USERNAME COVERAGE_* PYTEST_ADDOPTS TERM
2726
setenv =
2827
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_DOCTESTING:} {env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:}
2928

0 commit comments

Comments
 (0)