Merge pull request #339 from waketzheng/update-ci
Update ci action versions and avoid `make ci` install deps twice
This commit is contained in:
commit
4a1fc4cfa0
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -21,8 +21,8 @@ jobs:
|
||||
steps:
|
||||
- name: Start MySQL
|
||||
run: sudo systemctl start mysql.service
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-python@v2
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.x'
|
||||
- name: Install and configure Poetry
|
||||
|
4
.github/workflows/pypi.yml
vendored
4
.github/workflows/pypi.yml
vendored
@ -7,8 +7,8 @@ jobs:
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-python@v2
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.x'
|
||||
- name: Install and configure Poetry
|
||||
|
@ -8,6 +8,7 @@
|
||||
|
||||
**Upgrade note:**
|
||||
1. Use column name as unique key name for mysql
|
||||
2. Drop support for Python3.7
|
||||
|
||||
## 0.7
|
||||
|
||||
|
11
Makefile
11
Makefile
@ -14,13 +14,15 @@ up:
|
||||
deps:
|
||||
@poetry install -E asyncpg -E asyncmy
|
||||
|
||||
style: deps
|
||||
_style:
|
||||
@isort -src $(checkfiles)
|
||||
@black $(black_opts) $(checkfiles)
|
||||
style: deps _style
|
||||
|
||||
check: deps
|
||||
_check:
|
||||
@black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
|
||||
@ruff check $(checkfiles)
|
||||
check: deps _check
|
||||
|
||||
test: deps
|
||||
$(py_warn) TEST_DB=sqlite://:memory: py.test
|
||||
@ -34,9 +36,10 @@ test_mysql:
|
||||
test_postgres:
|
||||
$(py_warn) TEST_DB="postgres://postgres:$(POSTGRES_PASS)@$(POSTGRES_HOST):$(POSTGRES_PORT)/test_\{\}" pytest -vv -s
|
||||
|
||||
testall: deps test_sqlite test_postgres test_mysql
|
||||
_testall: test_sqlite test_postgres test_mysql
|
||||
testall: deps _test_all
|
||||
|
||||
build: deps
|
||||
@poetry build
|
||||
|
||||
ci: check testall
|
||||
ci: check _testall
|
||||
|
Loading…
x
Reference in New Issue
Block a user