Merge pull request #22 from ForeverWintr/new-ci

New ci

Author: ForeverWintr

.github/workflows/python-package.yml renamed to .github/workflows/test.yml

@@ -1,22 +1,23 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Python package
+name: Test
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev ]
   pull_request:
-    branches: [ master ]
+
 
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11.0"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,14 +28,21 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest
+        python -m pip install flake8
         pip install tox tox-gh-actions
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        pip install -r requirements-dev.txt
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Run tox with tox-gh-actions
-      run: tox
+      run: tox -e py
+
+    - name: Upload coverage
+      uses: codecov/codecov-action@v2
+      with:
+        files: ./coverage.xml # optional
+        fail_ci_if_error: true # optional (default = false)
+        verbose: true # optional (default = false)

.travis.yml

@@ -1,6 +1,6 @@
 # MetaFunctions
-[![Build Status](https://travis-ci.org/ForeverWintr/metafunctions.svg?branch=master)](https://travis-ci.org/ForeverWintr/metafunctions) [![Build status](https://ci.appveyor.com/api/projects/status/8120lqx7e9ys2m0u/branch/master?svg=true)](https://ci.appveyor.com/project/ForeverWintr/metafunctions/branch/master) [![Codecov](https://codecov.io/gh/ForeverWintr/metafunctions/coverage.svg?branch=master)](https://codecov.io/gh/ForeverWintr/metafunctions)
-![GithubActions Badge](https://github.com/ForeverWintr/metafunctions/actions/workflows/python-package.yml/badge.svg)
+![GithubActions Badge](https://github.com/ForeverWintr/metafunctions/actions/workflows/test.yml/badge.svg)
+[![Codecov](https://codecov.io/gh/ForeverWintr/metafunctions/coverage.svg?branch=master)](https://codecov.io/gh/ForeverWintr/metafunctions)
 
 
 

README.md

@@ -3,11 +3,12 @@
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
+# Note: These versions are used when you run tox locally, but gh actions has its own env list.
 [tox]
 envlist = py35, py36, py37, py38, py39, py310
 
 [gh-actions]
-python = 
+python =
     3.6: py36
     3.7: py37
     3.8: py38
@@ -19,8 +20,7 @@ python =
 deps =
     coverage
     ansicolors
-    colors.py
 commands =
     coverage run -pm unittest discover
     coverage combine
-
+    coverage xml