use GitHub Actions for CI

morepath · Jan 23, 2021 · f44d2d6 · f44d2d6
1 parent c725d85
commit f44d2d6
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 46 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,15 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: stable
+    rev: 20.8b1
     hooks:
       - id: black
-        language_version: python3.7
+        args: [--line-length=80]
+  - 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]
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,10 @@ CHANGES
 
 - Drop support for Python 3.4 and 3.5.
 
+- Add support for Python 3.9.
+
+- Use GitHub Actions for CI.
+
 
 0.3 (2020-04-26)
 ----------------

diff --git a/CREDITS.txt b/CREDITS.txt
@@ -2,3 +2,5 @@ CREDITS
 =======
 
 * Henri Hulski (author)
+
+* Jürgen Gmach (CI)
diff --git a/README.rst b/README.rst
@@ -1,3 +1,17 @@
+.. image:: https://github.com/morepath/more.pony/workflows/CI/badge.svg?branch=master
+   :target: https://github.com/morepath/more.pony/actions?workflow=CI
+   :alt: CI Status
+
+.. image:: https://coveralls.io/repos/github/morepath/more.pony/badge.svg?branch=master
+    :target: https://coveralls.io/github/morepath/more.pony?branch=master
+
+.. image:: https://img.shields.io/pypi/v/more.pony.svg
+  :target: https://pypi.org/project/more.pony/
+
+.. image:: https://img.shields.io/pypi/pyversions/more.pony.svg
+  :target: https://pypi.org/project/more.pony/
+
+
 more.pony: Pony ORM integration in Morepath
 ===========================================
 

diff --git a/pyproject.toml b/pyproject.toml
diff --git a/setup.py b/setup.py
@@ -26,6 +26,7 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
     install_requires=["morepath >= 0.19", "pony >= 0.7.13"],

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
-envlist = py36, py37, py38, pypy3, pep8, coverage
-skipsdist = True
+envlist = py36, py37, py38, py39, pypy3, pre-commit, coverage
 skip_missing_interpreters = True
 
 [testenv]
@@ -9,16 +8,26 @@ extras = test
 
 commands = pytest {posargs}
 
-[testenv:pep8]
-basepython = python3.7
-extras = pep8
-
-commands = flake8 more
-           black --check .
+[testenv:pre-commit]
+deps = pre-commit
+commands = pre-commit run --all-files
 
 [testenv:coverage]
-basepython = python3.7
+basepython = python3
 extras = test
          coverage
 
 commands = pytest --cov --cov-fail-under=100 {posargs}
+
+[gh-actions]
+python =
+    3.6: py36
+    3.7: py37
+    3.8: py38
+    3.9: py39, pre-commit, mypy, coverage
+
+[flake8]
+max-line-length = 88
+ignore =
+    E231  # clashes with black
+    W503