Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
lint:

runs-on: ubuntu-latest
container: snakepacker/python:all

strategy:
matrix:
Expand All @@ -19,17 +20,16 @@ jobs:
- mypy

steps:
- uses: actions/checkout@v2
- name: tox ${{ matrix.linter }}
uses: docker://snakepacker/python:all
- uses: actions/checkout@v4
- name: Run tox ${{ matrix.linter }}
run: tox
env:
TOXENV: ${{ matrix.linter }}
with:
args: tox

build:
needs: lint
runs-on: ubuntu-latest
container: snakepacker/python:all

services:
postgres:
Expand All @@ -46,20 +46,17 @@ jobs:

matrix:
toxenv:
- py38
- py39
- py310
- py311
- py312

steps:
- uses: actions/checkout@v2

- name: tox ${{ matrix.toxenv }}
uses: docker://snakepacker/python:all
- uses: actions/checkout@v4
- name: Run tox ${{ matrix.toxenv }}
run: tox
env:
FORCE_COLOR: 1
TOXENV: ${{ matrix.toxenv }}
PG_DSN: postgres://test:test@postgres:5432/test
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
with:
args: /bin/bash -c "wait-for-port postgres:5432 && tox"
8 changes: 0 additions & 8 deletions pylama.ini

This file was deleted.

1 change: 1 addition & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
filterwarnings =
ignore::DeprecationWarning
python_classes = TestSuite*
asyncio_mode = auto
10 changes: 10 additions & 0 deletions ruff.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
line-length = 80
target-version = "py39"

[lint]
select = [
"E", # pycodestyle errors
"W", # pycodestyle warnings
"C90", # mccabe
"F", # pyflakes
]
20 changes: 12 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"Operating System :: Microsoft",
"Operating System :: POSIX",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Programming Language :: Python",
Expand Down Expand Up @@ -58,26 +58,30 @@
"async_timeout",
"psycopg[pool]>=3.0,<4",
"aiopg[sa]~=1.4.0",
"asyncpg~=0.29.0",
"pytest~=6.2.5",
"asyncpg~=0.30.0",
"pytest~=8.2.0",
"pytest-cov~=3.0.0",
"aiomisc~=15.2.4",
"pytest-asyncio~=0.26.0",
"aiomisc~=17.7.7",
"aiomisc-pytest~=1.2.1",
"mock~=4.0.1",
"sqlalchemy[asyncio]~=1.4.27",
],
"develop": [
"async_timeout",
"psycopg[pool]>=3.0,<4",
"aiopg[sa]~=1.4.0",
"asyncpg~=0.27.0",
"pytest~=6.2.5",
"asyncpg~=0.30.0",
"pytest~=8.2.0",
"pytest-cov~=3.0.0",
"pylama~=7.7.1",
"aiomisc~=15.2.4",
"pytest-asyncio~=0.26.0",
"aiomisc~=17.7.7",
"aiomisc-pytest~=1.2.1",
"mock~=4.0.3",
"sqlalchemy[asyncio]~=1.4.27",
"black~=21.9b0",
"tox~=3.24",
"ruff~=0.11.9",
"twine",
"wheel",
"types-psycopg2",
Expand Down
10 changes: 4 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = lint,mypy,py3{8,9,10,11}{,-uvloop}
envlist = lint,mypy,py3{9,10,11,12}{,-uvloop}

[testenv]
passenv = COVERALLS_*, FORCE_COLOR, PG_DSN
Expand All @@ -17,13 +17,12 @@ commands=
- coveralls

[testenv:lint]
allowlist_externals = pylama
allowlist_externals = ruff
deps =
pyflakes==2.4.0
pylama
ruff

commands=
pylama -o pylama.ini hasql tests
ruff check hasql tests

[testenv:checkdoc]
deps =
Expand All @@ -40,6 +39,5 @@ usedevelop = true

deps =
mypy==1.17.1

commands =
mypy --install-types --non-interactive hasql tests
Loading