Merge pull request #163 from jsocol/clean-up-ci

Split out CI(push) from PR(pull_request) actions

3 files changed, 26 insertions, 17 deletions

diff --git a/.github/workflows/tox.yml b/.github/workflows/ci.yml
index 35afafc..6fd6ea6 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,10 @@
-name: tox
-on: [push, pull_request]
+name: CI
+on:
+  push:
+    branches:
+      - main
 jobs:
-  tox:
+  test:
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
new file mode 100644
index 0000000..904644d
--- /dev/null
+++ b/.github/workflows/pr.yml
@@ -0,0 +1,20 @@
+name: Pull Request
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]  # [macos-latest, ubuntu-latest, windows-latest]
+        python: ['3.7', '3.8', '3.9', 'pypy-3.9']  # Nose fails on Python 3.10+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+      - run: pip install --upgrade pip
+      - run: pip install tox
+      - run: tox -e py
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 2ff0fc0..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: python
-python:
- - "2.7"
- - "3.5"
- - "3.6"
- - "3.7"
- - "3.8"
- - "pypy"
- - "pypy3"
-install:
- - pip install -q "flake8"
-script:
- - nosetests --with-coverage --cover-package=statsd
- - flake8 statsd/