Skip to content

Commit

Permalink
Merge branch 'master' into fix-mysql8-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Nothing4You authored Jan 22, 2022
2 parents b06a87c + 9100eab commit 3073d9c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@ jobs:
run: |
python setup.py check --restructuredtext
- name: Run pyroma
run: |
python -m pyroma -d .
# this ensures our database is ready. typically by the time the preparations have completed its first start logic.
# unfortunately we need this hacky workaround as GitHub Actions service containers can't reference data from our repo.
- name: Prepare mysql
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ jobs:
key: pip-lint
path: ${{ steps.pip-cache.outputs.dir }}

- name: Install dependencies
run: |
python -m pip install --upgrade --requirement requirements-dev.txt
- name: Run pyroma
run: |
python -m pyroma --min 10 --directory .
- name: flake8 Lint
uses: py-actions/flake8@v2.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Changes
-------

To be included in 1.0.0 (unreleased)
^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

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

0 comments on commit 3073d9c

Please sign in to comment.