Skip to content

Commit

Permalink
Merge pull request #8162 from nicoddemus/rm-travis-badge
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Dec 17, 2020
2 parents 02e69e5 + 3eef150 commit ce206ae
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
3 changes: 0 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
:target: https://codecov.io/gh/pytest-dev/pytest
:alt: Code coverage Status

.. image:: https://travis-ci.org/pytest-dev/pytest.svg?branch=master
:target: https://travis-ci.org/pytest-dev/pytest

.. image:: https://github.com/pytest-dev/pytest/workflows/main/badge.svg
:target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Amain

Expand Down
4 changes: 2 additions & 2 deletions scripts/append_codecov_token.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"""
Appends the codecov token to the 'codecov.yml' file at the root of the repository.
This is done by CI during PRs and builds on the pytest-dev repository so we can upload coverage, at least
until codecov grows some native integration like it has with Travis and AppVeyor.
This is done by CI during PRs and builds on the pytest-dev repository so we can
upload coverage, at least until codecov grows some native integration with GitHub Actions.
See discussion in https://github.com/pytest-dev/pytest/pull/6441 for more information.
"""
Expand Down
9 changes: 3 additions & 6 deletions scripts/publish-gh-release-notes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""
Script used to publish GitHub release notes extracted from CHANGELOG.rst.
This script is meant to be executed after a successful deployment in Travis.
This script is meant to be executed after a successful deployment in GitHub actions.
Uses the following environment variables:
Expand All @@ -12,11 +12,8 @@
https://github.com/settings/tokens
It should be encrypted using:
$travis encrypt GH_RELEASE_NOTES_TOKEN=<token> -r pytest-dev/pytest
And the contents pasted in the ``deploy.env.secure`` section in the ``travis.yml`` file.
This token should be set in a secret in the repository, which is exposed as an
environment variable in the main.yml workflow file.
The script also requires ``pandoc`` to be previously installed in the system.
Expand Down
3 changes: 1 addition & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
isolated_build = True
minversion = 3.20.0
distshare = {homedir}/.tox/distshare
# make sure to update environment list in travis.yml and appveyor.yml
envlist =
linting
py36
Expand All @@ -23,7 +22,7 @@ commands =
doctesting: {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest
coverage: coverage combine
coverage: coverage report -m
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS TERM
passenv = USER USERNAME COVERAGE_* PYTEST_ADDOPTS TERM
setenv =
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_DOCTESTING:} {env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_XDIST:}

Expand Down

0 comments on commit ce206ae

Please sign in to comment.