diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index e2e84e6..e91406e 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -11,13 +11,11 @@ on: jobs: build: - runs-on: ubuntu-20.04 timeout-minutes: 5 strategy: matrix: python-version: [3.6, 3.7, 3.8, 3.9, '3.10'] - steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -27,14 +25,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip + pip install tox tox-gh-actions pip install -r requirements/test.txt - - name: Lint with flake8 - run: | - flake8 ddt.py test - # # 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: Test with pytest run: | - pytest + tox diff --git a/MANIFEST.in b/MANIFEST.in index 29f37ed..1aa3b43 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,6 @@ include *.md recursive-include test *.py *.json *.yaml +include MANIFEST.in +include LICENSE.md +include tox.ini +global-exclude *.py[cod] __pycache__ diff --git a/ddt.py b/ddt.py index d2e0c7d..77d1d9d 100644 --- a/ddt.py +++ b/ddt.py @@ -23,7 +23,7 @@ from collections.abc import Sequence -__version__ = '1.7.1' +__version__ = '1.7.2' # These attributes will not conflict with any real python attribute # They are added to the decorated test method and processed later diff --git a/tox.ini b/tox.ini index 5a082a9..2f426d4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35 +envlist = py36,py37,py38,py39,py310 [testenv] deps = @@ -14,18 +14,16 @@ commands = pytest --cov=ddt --cov-report html flake8 ddt.py test -[testenv:py27] -deps = - {[testenv]deps} - mock - Sphinx - sphinxcontrib-programoutput -commands = - pytest --cov=ddt --cov-report html - flake8 ddt.py test - sphinx-build -b html docs docs/_build - [flake8] max-line-length = 127 exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,.tox,.venv max-complexity = 10 + +[gh-actions] +python = + 3.8: py38 + 3.6: py36 + 3.7: py37 + 3.8: py38 + 3.9: py39 + 3.10: py310