Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump test/docs/actions dependencies #134

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '${{ matrix.python }}'
- name: Run tests
Expand Down Expand Up @@ -48,14 +48,14 @@ jobs:
extra_name: ', check docs'
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
if: "!endsWith(matrix.python, '-dev')"
with:
python-version: '${{ matrix.python }}'
- name: Setup python (dev)
uses: deadsnakes/action@v2.0.2
uses: deadsnakes/action@v2.1.1
if: endsWith(matrix.python, '-dev')
with:
python-version: '${{ matrix.python }}'
Expand All @@ -77,9 +77,9 @@ jobs:
python: ['3.7', '3.8', '3.9', '3.10', '3.11']
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '${{ matrix.python }}'
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ python setup.py sdist --formats=zip
python -m pip install dist/*.zip

if [ "$CHECK_FORMATTING" = "1" ]; then
pip install black
pip install black~=23.0
if ! black --check . ; then
cat <<EOF
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Expand Down
8 changes: 2 additions & 6 deletions docs-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile docs-requirements.in
#
Expand Down Expand Up @@ -40,8 +40,6 @@ idna==3.4
# trio
imagesize==1.4.1
# via sphinx
importlib-metadata==5.0.0
# via sphinx
incremental==22.10.0
# via towncrier
iniconfig==1.1.1
Expand Down Expand Up @@ -109,8 +107,6 @@ trio==0.22.0
# via -r docs-requirements.in
urllib3==1.26.12
# via requests
zipp==3.10.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
1 change: 1 addition & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
("py:obj", "bytes-like"),
]


# XX hack the RTD theme until
# https://github.com/rtfd/sphinx_rtd_theme/pull/382
# is shipped (should be in the release after 0.2.4)
Expand Down
5 changes: 0 additions & 5 deletions pytest_trio/_tests/test_async_fixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@


def test_single_async_fixture(testdir):

testdir.makepyfile(
"""
import pytest
Expand All @@ -25,7 +24,6 @@ async def test_simple(fix1):


def test_async_fixture_recomputed_for_each_test(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -56,7 +54,6 @@ async def test_second(fix1):


def test_nested_async_fixture(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -89,7 +86,6 @@ async def test_both(fix1, fix2):


def test_async_within_sync_fixture(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -122,7 +118,6 @@ async def test_simple(sync_fix):
# async fixture...
@pytest.mark.xfail(reason="Not implemented yet")
def test_raise_in_async_fixture_cause_pytest_error(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down
6 changes: 0 additions & 6 deletions pytest_trio/_tests/test_async_yield_fixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def test_after():


def test_nested_async_yield_fixture(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -93,7 +92,6 @@ def test_after():


def test_async_yield_fixture_within_sync_fixture(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -139,7 +137,6 @@ def test_after():


def test_async_yield_fixture_within_sync_yield_fixture(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -190,7 +187,6 @@ def test_after():


def test_async_yield_fixture_with_multiple_yields(testdir):

testdir.makepyfile(
"""
import pytest
Expand All @@ -217,7 +213,6 @@ async def test_actual_test(fix1):


def test_async_yield_fixture_with_nursery(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -253,7 +248,6 @@ async def test_actual_test(server):


def test_async_yield_fixture_crashed_teardown_allow_other_teardowns(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down
4 changes: 0 additions & 4 deletions pytest_trio/_tests/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@


def test_async_test_is_executed(testdir):

testdir.makepyfile(
"""
import pytest
Expand All @@ -27,7 +26,6 @@ def test_check_async_test_called():


def test_async_test_as_class_method(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -60,7 +58,6 @@ def test_check_async_test_called():

@pytest.mark.xfail(reason="Raises pytest internal error so far...")
def test_sync_function_with_trio_mark(testdir):

testdir.makepyfile(
"""
import pytest
Expand All @@ -77,7 +74,6 @@ def test_invalid():


def test_skip_and_xfail(testdir):

testdir.makepyfile(
"""
import functools
Expand Down
3 changes: 0 additions & 3 deletions pytest_trio/_tests/test_sync_fixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ async def test_single_sync_fixture(sync_fix):


def test_single_yield_fixture(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -47,7 +46,6 @@ def test_after():


def test_single_yield_fixture_with_async_deps(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down Expand Up @@ -90,7 +88,6 @@ def test_after():


def test_sync_yield_fixture_crashed_teardown_allow_other_teardowns(testdir):

testdir.makepyfile(
"""
import pytest
Expand Down
4 changes: 2 additions & 2 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pytest==7.2.0
pytest==7.3.1
pytest-cov==4.0.0
hypothesis==6.56.4
hypothesis==6.72.0