Skip to content

Commit

Permalink
Merge branch 'main' into fix-pickle-backward-compat
Browse files Browse the repository at this point in the history
  • Loading branch information
hynek authored Jan 16, 2023
2 parents 1b3d89b + 14354bb commit ac27afc
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 126 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
run: |
python -VV
python -m site
python -m pip install --upgrade wheel tox tox-gh-actions
python -m pip install --upgrade wheel 'tox<4' tox-gh-actions
- run: python -m tox

Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
with:
python-version: "3.10"

- run: python -m pip install --upgrade wheel tox
- run: python -m pip install --upgrade wheel 'tox<4'
- run: python -m tox -e docs,changelog

pyright:
Expand All @@ -155,7 +155,7 @@ jobs:
with:
python-version: ${{env.PYTHON_LATEST}}

- run: python -m pip install --upgrade wheel tox
- run: python -m pip install --upgrade wheel 'tox<4'
- run: python -m tox -e pyright

package:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ tests-no-zope = [
"pytest-xdist[psutil]",
# Since the mypy error messages keep changing, we have to keep updating this
# pin.
'mypy>=0.971,<0.990; python_implementation == "CPython"',
'mypy>=0.991; python_implementation == "CPython"',
'pytest-mypy-plugins; python_implementation == "CPython" and python_version<"3.11"',
]
tests = ["attrs[tests-no-zope]", "zope.interface"]
Expand Down
Loading

0 comments on commit ac27afc

Please sign in to comment.