diff options
| -rw-r--r-- | .github/workflows/pylint.yml (renamed from .github/workflows/doctest.yml) | 20 | ||||
| -rw-r--r-- | .github/workflows/pypy.yml | 30 | ||||
| -rw-r--r-- | .github/workflows/python.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/shellcheck.yml | 4 | ||||
| -rw-r--r-- | .travis.yml | 20 |
5 files changed, 49 insertions, 43 deletions
diff --git a/.github/workflows/doctest.yml b/.github/workflows/pylint.yml index 4f3f8e7b..349c9af4 100644 --- a/.github/workflows/doctest.yml +++ b/.github/workflows/pylint.yml @@ -1,30 +1,28 @@ -name: Python pytest, doctest and manpage-completion EXPECTED FAILURE +name: Pylint on: push: paths: - - '.github/workflows/doctest.yml' - - '*.py' + - '.github/workflows/pylint.yml' + - '**.py' jobs: - test_py: + test_pylint: runs-on: ubuntu-latest strategy: max-parallel: 4 matrix: - python-version: [2.7, 3.5, 3.6, 3.7, 3.8] + python-version: [3.6, 3.x] steps: - - uses: actions/checkout@v1 - with: - fetch-depth: 1 + - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt - - name: doctest + - name: Lint with pylint run: | - make test_pytest test_doctest test_other + make test_pylint diff --git a/.github/workflows/pypy.yml b/.github/workflows/pypy.yml new file mode 100644 index 00000000..dfb04042 --- /dev/null +++ b/.github/workflows/pypy.yml @@ -0,0 +1,30 @@ +name: Pypy tests + +on: + push: + paths: + - '.github/workflows/pypy.yml' + - '**.py' + +jobs: + test_pypy: + runs-on: ubuntu-latest + strategy: + max-parallel: 4 + matrix: + python-version: [pypy2, pypy3] + env: + TERM: dumb + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Pypy lints and tests + run: | + make test_pylint test_flake8 test_pytest test_doctest test_other diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 59558a20..82672bfb 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -1,10 +1,10 @@ -name: Python lints and tests +name: PEP8 and tests on: push: paths: - '.github/workflows/python.yml' - - '*.py' + - '**.py' jobs: test_py: @@ -12,19 +12,19 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.5, 3.6, 3.7, 3.8] + python-version: [2.7, 3.5, 3.x] + env: + TERM: dumb steps: - - uses: actions/checkout@v1 - with: - fetch-depth: 1 + - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt - - name: Lint and test with pylint, flake8, but not -d-o-c-t-e-s-t-, -m-a-n-c-o-m-p-l-e-t-e- + - name: Flake8 and test run: | - make test_pylint test_flake8 test_pytest + make test_flake8 test_pytest test_doctest test_other diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 22af007b..cd718a2d 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -10,9 +10,7 @@ jobs: test_shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - with: - fetch-depth: 1 + - uses: actions/checkout@v2 - name: Install latest stable shellcheck run: | curl -LO "https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.linux.x86_64.tar.xz" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ce55f33e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -dist: 'xenial' - -language: 'python' -jobs: - include: - - name: "Python 2.7 no linting" - python: '2.7' - env: PY2='TRUE' - - name: "Python 3" - python: - - '3.5' - - '3.6' - - '3.7' - - '3.8' - -install: - - 'pip install -r requirements.txt' - -script: - - 'if [ -z "${PY2}" ]; then make test; else make test_doctest test_pytest test_other; fi' |