Skip to content

Commit 3073d9c

Browse files
authored
Merge branch 'master' into fix-mysql8-tests
2 parents b06a87c + 9100eab commit 3073d9c

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ jobs:
8989
run: |
9090
python setup.py check --restructuredtext
9191
92-
- name: Run pyroma
93-
run: |
94-
python -m pyroma -d .
95-
9692
# this ensures our database is ready. typically by the time the preparations have completed its first start logic.
9793
# unfortunately we need this hacky workaround as GitHub Actions service containers can't reference data from our repo.
9894
- name: Prepare mysql

.github/workflows/lint.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ jobs:
3737
key: pip-lint
3838
path: ${{ steps.pip-cache.outputs.dir }}
3939

40+
- name: Install dependencies
41+
run: |
42+
python -m pip install --upgrade --requirement requirements-dev.txt
43+
44+
- name: Run pyroma
45+
run: |
46+
python -m pyroma --min 10 --directory .
47+
4048
- name: flake8 Lint
4149
uses: py-actions/[email protected]
4250
with:

CHANGES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Changes
22
-------
33

44
To be included in 1.0.0 (unreleased)
5-
^^^^^^^^^^^^^^^^^^^
5+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
* Don't send sys.argv[0] as program_name to MySQL server by default #620
88
* Fix timed out MySQL 8.0 connections raising InternalError rather than OperationalError #660

0 commit comments

Comments
 (0)