diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a913cf55..3fed3cdb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,8 +51,8 @@ jobs: - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python }} - - name: Install tox - run: pip install tox + - name: Build + run: make - name: Run tests - run: tox -e ${{ matrix.python }} + run: make check timeout-minutes: 5 diff --git a/setup.cfg b/setup.cfg index 04328554..7df0a041 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,3 +20,8 @@ libraries= [metadata] license_file = LICENSE + +[flake8] +max-line-length = 85 +ignore = E128, W503, E741 +exclude = build, doc, tests/dbapi20.py diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 8bb56694..00000000 --- a/tox.ini +++ /dev/null @@ -1,12 +0,0 @@ -[tox] -envlist = {3.6,3.7,3.8,3.9,3.10} - -[testenv] -commands = make check -whitelist_externals = make -passenv = PG* PSYCOPG2_TEST* - -[flake8] -max-line-length = 85 -ignore = E128, W503, E741 -exclude = build, doc, tests/dbapi20.py