From 4e4cb05368a00eb03094c3b43347030a49e72f53 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Thu, 5 Aug 2021 22:34:20 -0500 Subject: [PATCH 1/3] Remove TravisCI (finally) --- .github/workflows/test.yml | 3 ++- .travis.yml | 51 -------------------------------------- README.rst | 4 +-- 3 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ddbf3ff..77e4fdde 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest"] - python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "pypy-3.6", "pypy-3.7"] + python-version: [3.5, 3.6, 3.7, 3.8, 3.9, "3.10-dev", "pypy-3.6", "pypy-3.7"] steps: - name: Checkout uses: actions/checkout@v2 @@ -30,6 +30,7 @@ jobs: coverage run -m pytest --doctest-modules toolz/ pytest bench/ pep8 --ignore="E731,W503,E402" --exclude=conf.py,tests,examples,bench -r --show-source . + coverage report --show-missing --fail-under=100 finish: needs: test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9787dfcc..00000000 --- a/.travis.yml +++ /dev/null @@ -1,51 +0,0 @@ -sudo: false -language: python -python: - - "3.5" - - "3.6" - - "3.7" - - "3.8" - - "3.9" - - "nightly" - - "pypy3.5-7.0" - - "pypy3.6-7.1.1" - -env: - global: - - PEP8_IGNORE="E731,W503,E402" - - secure: "B1ICJrU2eswNMjyGdmq9Z6Tbw33fQTqnGAZnNf2JuhEPl5fiI0OiyyL18WqbdwkNan0dIM7muOkCGIecYB+FSjXI/zDIyO0MhdaMDVQUDEbjW7STZZUHNYzcqrrj/isc2YPl/YfrjLKvV0w0AtS1wIq+YR9TjYQp9UxqBpqW770=" - - secure: "Iv+zVkk/Relq43+QTLHAX8a7jpm/oVXVfJDqBmZjisblO0/toNNnoXI6OEjkd1QwZOUDkJ76rKsht9aeMllndKZ4XotuzxpP1iI6MrX+r9+hzI1xfJs2OqKDnxmtNV4fTlzhGTKXJbkSICjCfvWx20hFlgBB+NghcnQTW5GVw/w=" - -# command to install dependencies -install: - - pip install coverage pep8 pytest - -# command to run tests -# require 100% coverage (not including test files) to pass Travis CI test -# To skip pypy: - if [[ $TRAVIS_PYTHON_VERSION != 'pypy' ]]; then DOSTUFF ; fi -script: - - export MAJOR_PYTHON_VERSION=`echo $TRAVIS_PYTHON_VERSION | cut -c 1` - - coverage run --source=toolz $(which pytest) - --doctest-modules toolz/ - - if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then coverage report --show-missing --fail-under=100 ; fi - - if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then pep8 --ignore=$PEP8_IGNORE --exclude=conf.py,tests,examples,bench -r --show-source . ; fi - # For convenience, make sure simple test commands work - - python setup.py develop - - pytest - -# load coverage status to https://coveralls.io -after_success: - - if [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then pip install coveralls --use-mirrors ; coveralls ; fi - -# publish new version to pypi -deploy: - provider: pypi - skip_existing: true - on: - tags: true - user: __token__ - password: $PYPI_PASSWORD1$PYPI_PASSWORD2 - distributions: "sdist bdist_wheel" - -notifications: - email: false diff --git a/README.rst b/README.rst index 00ecc856..92f34393 100644 --- a/README.rst +++ b/README.rst @@ -124,8 +124,8 @@ Community See our `mailing list `__. We're friendly. -.. |Build Status| image:: https://travis-ci.org/pytoolz/toolz.svg?branch=master - :target: https://travis-ci.org/pytoolz/toolz +.. |Build Status| image:: https://github.com/pytoolz/toolz/workflows/Test/badge.svg + :target: https://github.com/pytoolz/toolz/actions .. |Coverage Status| image:: https://coveralls.io/repos/pytoolz/toolz/badge.svg?branch=master :target: https://coveralls.io/r/pytoolz/toolz .. |Version Status| image:: https://badge.fury.io/py/toolz.svg From cffc85dba46bfcdb116d320f6a114f52ae4526a2 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Thu, 5 Aug 2021 22:39:10 -0500 Subject: [PATCH 2/3] Coverage check isn't strict if in PyPy --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77e4fdde..e5ac4dfa 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,6 +30,9 @@ jobs: coverage run -m pytest --doctest-modules toolz/ pytest bench/ pep8 --ignore="E731,W503,E402" --exclude=conf.py,tests,examples,bench -r --show-source . + - name: Coverate + if: (! contains(matrix.python-version, 'pypy')) + run: | coverage report --show-missing --fail-under=100 finish: From 9cf978ecb6df3a59bffe28ef9ff475f51d33c9f7 Mon Sep 17 00:00:00 2001 From: Erik Welch Date: Thu, 5 Aug 2021 22:42:38 -0500 Subject: [PATCH 3/3] Who needs coveralls when we require 100% coverage? --- .github/workflows/test.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5ac4dfa..a1f52b3d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,13 +34,3 @@ jobs: if: (! contains(matrix.python-version, 'pypy')) run: | coverage report --show-missing --fail-under=100 - - finish: - needs: test - runs-on: ubuntu-latest - steps: - - name: Coveralls Finished - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.github_token }} - parallel-finished: true