From d86e7854897d5ba008d9875e8e3616ea2731c94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?= Date: Wed, 9 Sep 2026 19:22:42 -0600 Subject: [PATCH 1/2] Use Tox v4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Edgar Ramírez Mondragón --- .github/workflows/tests.yml | 2 +- tox.ini | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ee5ebe76c..bf6c0b25d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -68,7 +68,7 @@ jobs: sudo apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}" - name: Install tox - run: pip install "tox < 4" + run: pip install "tox < 5" - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python }} diff --git a/tox.ini b/tox.ini index b56b7b6a0..945921a4c 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,10 @@ envlist = {3.10,3.11,3.12,3.13,3.14,3.15} [testenv] +description = run tests on Python {py_dot_ver} commands = make check -whitelist_externals = make -passenv = PG* PSYCOPG2_TEST* +allowlist_externals = make +passenv = PG*,PSYCOPG2_TEST* basepython = python{envname} [flake8] From 2b3cac0f44181d5079c32e4d9b27e1d7f6e98f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edgar=20Ram=C3=ADrez=20Mondrag=C3=B3n?= Date: Sat, 12 Sep 2026 20:15:20 -0600 Subject: [PATCH 2/2] Get rid Tox --- .github/workflows/tests.yml | 8 ++++---- setup.cfg | 5 +++++ tox.ini | 14 -------------- 3 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 tox.ini diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bf6c0b25d..f153d1f2a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -67,14 +67,14 @@ jobs: | awk '{print $2}') sudo apt-get -qq -y install "libpq-dev=${pqver}" "libpq5=${pqver}" - - name: Install tox - run: pip install "tox < 5" - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python }} allow-prereleases: true + - name: Install + run: pip install . - name: Run tests env: - MATRIX_PYTHON: ${{ matrix.python }} - run: tox -e ${MATRIX_PYTHON%-dev} + PYTHON_VERSION: ${{ matrix.python }} + run: make check timeout-minutes: 5 diff --git a/setup.cfg b/setup.cfg index dcea6a984..b9b8f7552 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,3 +20,8 @@ libraries= [metadata] license_files = 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 945921a4c..000000000 --- a/tox.ini +++ /dev/null @@ -1,14 +0,0 @@ -[tox] -envlist = {3.10,3.11,3.12,3.13,3.14,3.15} - -[testenv] -description = run tests on Python {py_dot_ver} -commands = make check -allowlist_externals = make -passenv = PG*,PSYCOPG2_TEST* -basepython = python{envname} - -[flake8] -max-line-length = 85 -ignore = E128, W503, E741 -exclude = build, doc, tests/dbapi20.py