From e543073b4769c614bf3ec6a0d84e0ffa16cfb914 Mon Sep 17 00:00:00 2001 From: Marcel Hellkamp Date: Wed, 18 Dec 2019 13:19:33 +0100 Subject: Removed circle-ci and travis-ci in favor of GitHub actions. --- .circleci/config.yml | 44 ----------------------------------------- .github/workflows/run_tests.yml | 2 +- .travis.yml | 22 --------------------- README.rst | 14 +++---------- test/travis_setup.sh | 31 ----------------------------- 5 files changed, 4 insertions(+), 109 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .travis.yml delete mode 100755 test/travis_setup.sh diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 8d5f6e7..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: 2 -workflows: - version: 2 - test: - jobs: - - test-2.7 - - test-3.4 - - test-3.5 - - test-3.6 - - test-3.7 -jobs: - test-3.7: &test-template - parallelism: 1 - docker: - - image: circleci/python:3.7 - environment: - CIRCLE_ARTIFACTS: /tmp/circleci-artifacts - CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - steps: - - checkout - - run: python --version - - run: python -m unittest discover - - store_test_results: - path: /tmp/circleci-test-results - - store_artifacts: - path: /tmp/circleci-artifacts - - store_artifacts: - path: /tmp/circleci-test-results - test-3.6: - <<: *test-template - docker: - - image: circleci/python:3.6 - test-3.5: - <<: *test-template - docker: - - image: circleci/python:3.5 - test-3.4: - <<: *test-template - docker: - - image: circleci/python:3.4 - test-2.7: - <<: *test-template - docker: - - image: circleci/python:2.7 diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 70a2c0a..f878f8c 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -1,4 +1,4 @@ -name: Run tests +name: Tests on: [push, pull_request] jobs: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c15b4b0..0000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -group: travis_latest -language: python -sudo: required - -python: -# - "2.7.3" # Ubuntu 12.4LTS (precise) and Debian 7 LTS (wheezy) - - "2.7" - - "3.5" - - "3.6" - - "3.7" - - "nightly" - -install: - - travis_retry bash test/travis_setup.sh - -script: - - python -m coverage run -m unittest discover - - python -m coverage combine - - python -m coverage report 2>&1 - -after_success: - coveralls diff --git a/README.rst b/README.rst index 7531f4f..42c6c19 100644 --- a/README.rst +++ b/README.rst @@ -3,17 +3,9 @@ :alt: Bottle Logo :align: right -.. image:: https://travis-ci.org/bottlepy/bottle.svg?branch=master - :target: https://travis-ci.org/bottlepy/bottle - :alt: Bottle Build - -.. image:: https://circleci.com/gh/bottlepy/bottle.svg?style=svg - :target: https://circleci.com/gh/bottlepy/bottle - :alt: CI Bottle - -.. image:: https://coveralls.io/repos/github/bottlepy/bottle/badge.svg?branch=master - :target: https://coveralls.io/github/bottlepy/bottle?branch=master - :alt: Coverage +.. image:: https://github.com/bottlepy/bottle/workflows/Tests/badge.svg + :target: https://github.com/bottlepy/bottle/workflows/Tests + :alt: Tests Status .. image:: https://img.shields.io/pypi/v/bottle.svg :target: https://pypi.python.org/pypi/bottle/ diff --git a/test/travis_setup.sh b/test/travis_setup.sh deleted file mode 100755 index c8d5ab2..0000000 --- a/test/travis_setup.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -# This script is run by travis-ci prior to running tests. -set -e -set -x - -# Just to be sure -pip install -U pip -# pip is not able to install distribute: "ImportError: No module named _markerlib" -easy_install distribute - -pip install -U coverage -pip install coveralls - -# Server back-ends and template engines. Not all back-ends support all python versions and we only want to test for 2.7 and 3.6 to keep things sane -case ${TRAVIS_PYTHON_VERSION} in -2.7|3.6) - sudo apt-get update -y - sudo apt-get install -y libev-dev - pip install mako jinja2 waitress "cherrypy<9" cheroot paste tornado twisted meinheld gunicorn eventlet - ;; -esac - -case ${TRAVIS_PYTHON_VERSION} in -2.7) - pip install flup fapws3 bjoern gevent diesel - ;; -3.6) - pip install aiohttp-wsgi uvloop - ;; -esac -- cgit v1.2.1