8000 Drop python 3.7 support by rytilahti · Pull Request #455 · python-kasa/python-kasa · GitHub
[go: up one dir, main page]

Skip to content

Drop python 3.7 support #455

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

Merged
merged 6 commits into from
May 17, 2023
Merged
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
python-version: ["3.10"]
python-version: ["3.11"]

steps:
- uses: "actions/checkout@v2"
Expand Down Expand Up @@ -64,14 +64,14 @@ jobs:

strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
python-version: ["3.8", "3.9", "3.10", "3.11", "pypy-3.8"]
os: [ubuntu-latest, macos-latest, windows-latest]
# exclude pypy on windows, as the poetry install seems to be very flaky:
# PermissionError(13, 'The process cannot access the file because it is being used by another process'))
# at C:\hostedtoolcache\windows\PyPy\3.7.10\x86\site-packages\requests\models.py:761 in generate
exclude:
- python-version: pypy-3.7
os: windows-latest
# exclude:
# - python-version: pypy-3.8
# os: windows-latest

steps:
- uses: "actions/checkout@v2"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
rev: v3.4.0
hooks:
- id: pyupgrade
args: ['--py37-plus']
args: ['--py38-plus']

- repo: https://github.com/python/black
rev: 23.3.0
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ build:
image: latest

python:
version: 3.7
version: 3.8
pip_install: true
extra_requirements:
- docs
4 changes: 0 additions & 4 deletions kasa/tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ async def test_raw_command(dev):
assert "Usage" in res.output


@pytest.mark.skipif(sys.version_info < (3, 8), reason="3.8 is first one with asyncmock")
async def test_emeter(dev: SmartDevice, mocker):
runner = CliRunner()

Expand Down Expand Up @@ -103,9 +102,6 @@ async def test_brightness(dev):
assert "Brightness: 12" in res.output


# Invoke fails when run on py3.7 with the following error:
# E + where 1 = <Result TypeError("object list can't be used in 'await' expression")>.exit_code
@pytest.mark.skipif(sys.version_info < (3, 8), reason="fails on python3.7")
async def test_json_output(dev: SmartDevice, mocker):
"""Test that the json output produces correct output."""
mocker.patch("kasa.Discover.discover", return_value=[dev])
Expand Down
2 changes: 0 additions & 2 deletions kasa/tests/test_discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ async def test_type_unknown():
Discover._get_device_class(invalid_info)


@pytest.mark.skipif(sys.version_info < (3, 8), reason="3.8 is first one with asyncmock")
async def test_discover_single(discovery_data: dict, mocker):
"""Make sure that discover_single returns an initialized SmartDevice instance."""
mocker.patch("kasa.TPLinkSmartHomeProtocol.query", return_value=discovery_data)
Expand All @@ -71,7 +70,6 @@ async def test_discover_single(discovery_data: dict, mocker):
]


@pytest.mark.skipif(sys.version_info < (3, 8), reason="3.8 is first one with asyncmock")
@pytest.mark.parametrize("msg, data", INVALIDS)
async def test_discover_invalid_info(msg, data, mocker):
"""Make sure that invalid discovery information raises an exception."""
Expand Down
2 changes: 0 additions & 2 deletions kasa/tests/test_protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ async def test_protocol_retry_recoverable_error(mocker):
assert conn.call_count == 6


@pytest.mark.skipif(sys.version_info < (3, 8), reason="3.8 is first one with asyncmock")
@pytest.mark.parametrize("retry_count", [1, 3, 5])
async def test_protocol_reconnect(mocker, retry_count):
remaining = retry_count
Expand Down Expand Up @@ -98,7 +97,6 @@ def aio_mock_writer(_, __):
assert response == {"great": "success"}


@pytest.mark.skipif(sys.version_info < (3, 8), reason="3.8 is first one with asyncmock")
@pytest.mark.parametrize("log_level", [logging.WARNING, logging.DEBUG])
async def test_protocol_logging(mocker, caplog, log_level):
caplog.set_level(log_level)
Expand Down
5 changes: 0 additions & 5 deletions kasa/tests/test_readme_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,10 @@ def test_lightstrip_examples(mocker):
assert not res["failed"]


@pytest.mark.skipif(
sys.version_info < (3, 8), reason="3.7 handles asyncio.run differently"
)
def test_discovery_examples(mocker):
"""Test discovery examples."""
p = asyncio.run(get_device_for_file("KP303(UK)_1.0_1.0.3.json"))

# This succeeds on python 3.8 but fails on 3.7
# ValueError: a coroutine was expected, got [<DeviceType.Strip model KP303(UK) ...
mocker.patch("kasa.discover.Discover.discover", return_value=[p])
res = xdoctest.doctest_module("kasa.discover", "all")
assert not res["failed"]
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include = ["CHANGELOG.md"]
kasa = "kasa.cli:cli"

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.8"
anyio = "*" # see https://github.com/python-trio/asyncclick/issues/18
importlib-metadata = "*"
asyncclick = ">=8"
Expand Down
0