Skip to content

Commit

Permalink
modernize CI setup (#13)
Browse files Browse the repository at this point in the history
- use GitHub Actions for CI
- use pre-commit (black, flake8, pyupgrade)
- add support for Python 3.9
  • Loading branch information
jugmac00 authored Jan 20, 2021
1 parent fac9221 commit b5d3f2e
Show file tree
Hide file tree
Showing 12 changed files with 110 additions and 246 deletions.
50 changes: 50 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events
push:
pull_request:
schedule:
- cron: '0 12 * * 0' # run once a week on Sunday

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
tests:
name: "Python ${{ matrix.python-version }}"
runs-on: "ubuntu-latest"

strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3"]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: "actions/checkout@v2"
- uses: "actions/setup-python@v2"
with:
python-version: "${{ matrix.python-version }}"
- name: "Install dependencies"
run: |
set -xe
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade virtualenv tox tox-gh-actions
- name: "Run tox targets for ${{ matrix.python-version }}"
run: "python -m tox"

- name: "Report to coveralls"
# coverage is only created in the py39 environment
# --service=github is a workaround for bug
# https://github.com/coveralls-clients/coveralls-python/issues/251
if: "matrix.python-version == '3.9'"
run: |
pip install coveralls
coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
11 changes: 10 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
repos:
- repo: https://github.com/psf/black
rev: stable
rev: 20.8b1
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
rev: "3.8.4"
hooks:
- id: flake8
- repo: https://github.com/asottile/pyupgrade
rev: v2.7.4
hooks:
- id: pyupgrade
args: [--py36-plus]
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ CHANGES

- Make Python 3.6 the minimal version

- Use GitHub Actions for CI.

0.8 (2016-12-28)
================

Expand Down
2 changes: 2 additions & 0 deletions CREDITS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ CREDITS

* Denis Krienbühl (bug reports)

* Jürgen Gmach (CI)

* Special thanks to CONTACT software.
23 changes: 14 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
.. image:: https://github.com/morepath/more.transaction/workflows/CI/badge.svg?branch=master
:target: https://github.com/morepath/more.transaction/actions?workflow=CI
:alt: CI Status

.. image:: https://coveralls.io/repos/github/morepath/more.transaction/badge.svg?branch=master
:target: https://coveralls.io/github/morepath/more.transaction?branch=master

.. image:: https://img.shields.io/pypi/v/more.transaction.svg
:target: https://pypi.org/project/more.transaction/

.. image:: https://img.shields.io/pypi/pyversions/more.transaction.svg
:target: https://pypi.org/project/more.transaction/


more.transaction: SQLAlchemy and ZODB integration for Morepath
==============================================================

Expand All @@ -9,12 +23,3 @@ See https://github.com/morepath/morepath_sqlalchemy for a demo.
.. _transaction: https://pypi.python.org/pypi/transaction

.. _Morepath: http://morepath.readthedocs.org

Build Status
------------

.. image:: https://travis-ci.com/morepath/more.transaction.svg?branch=master
:target: https://travis-ci.com/morepath/more.transaction

.. image:: https://coveralls.io/repos/morepath/more.transaction/badge.svg?branch=master
:target: https://coveralls.io/r/morepath/more.transaction?branch=master
170 changes: 0 additions & 170 deletions bootstrap.py

This file was deleted.

4 changes: 2 additions & 2 deletions more/transaction/tests/test_default_commit_veto.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def test_it_true_x_tm_anythingelse():
assert callFUT(response)


class DummyRequest(object):
class DummyRequest:
path_info = "/"

def __init__(self):
Expand All @@ -71,7 +71,7 @@ def make_body_seekable(self):
self.made_seekable += 1


class DummyResponse(object):
class DummyResponse:
def __init__(self, status="200 OK", headers=None):
self.status = status
if headers is None:
Expand Down
Loading

0 comments on commit b5d3f2e

Please sign in to comment.