From c71a1523fbe600f51dc3fe1722e81507a0c0fd40 Mon Sep 17 00:00:00 2001 From: Darren Burns Date: Tue, 2 Aug 2022 15:25:35 +0100 Subject: [PATCH] Remove a bunch of 3.6 stuff --- .github/workflows/pythonpackage.yml | 2 +- tests/test_inspect.py | 13 ------------- tests/test_pretty.py | 9 --------- tests/test_repr.py | 12 +++--------- 4 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index dbadb79d..0c0f7fe9 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest, macos-latest] - python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-beta.4"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0-beta.4"] defaults: run: shell: bash diff --git a/tests/test_inspect.py b/tests/test_inspect.py index 79737c01..f2befbb9 100644 --- a/tests/test_inspect.py +++ b/tests/test_inspect.py @@ -13,11 +13,6 @@ from rich._inspect import ( ) from rich.console import Console -skip_py36 = pytest.mark.skipif( - sys.version_info.minor == 6 and sys.version_info.major == 3, - reason="rendered differently on py3.6", -) - skip_py37 = pytest.mark.skipif( sys.version_info.minor == 7 and sys.version_info.major == 3, reason="rendered differently on py3.7", @@ -89,7 +84,6 @@ class FooSubclass(Foo): pass -@skip_py36 def test_render(): console = Console(width=100, file=io.StringIO(), legacy_windows=False) @@ -118,7 +112,6 @@ def test_inspect_text(): assert render("Hello") == expected -@skip_py36 @skip_py37 @skip_pypy3 def test_inspect_empty_dict(): @@ -194,7 +187,6 @@ def test_inspect_coroutine(): assert render(coroutine).startswith(expected) -@skip_py36 def test_inspect_integer(): expected = ( "╭────── ───────╮\n" @@ -210,7 +202,6 @@ def test_inspect_integer(): assert expected == render(1) -@skip_py36 def test_inspect_integer_with_value(): expected = "╭────── ───────╮\n│ int([x]) -> integer │\n│ int(x, base=10) -> integer │\n│ │\n│ ╭────────────────────────╮ │\n│ │ 1 │ │\n│ ╰────────────────────────╯ │\n│ │\n│ denominator = 1 │\n│ imag = 0 │\n│ numerator = 1 │\n│ real = 1 │\n╰────────────────────────────╯\n" value = render(1, value=True) @@ -218,7 +209,6 @@ def test_inspect_integer_with_value(): assert value == expected -@skip_py36 @skip_py37 @skip_py310 @skip_py311 @@ -255,7 +245,6 @@ def test_inspect_integer_with_methods_python38_and_python39(): assert render(1, methods=True) == expected -@skip_py36 @skip_py37 @skip_py38 @skip_py39 @@ -297,7 +286,6 @@ def test_inspect_integer_with_methods_python310only(): assert render(1, methods=True) == expected -@skip_py36 @skip_py37 @skip_py38 @skip_py39 @@ -341,7 +329,6 @@ def test_inspect_integer_with_methods_python311_and_above(): assert render(1, methods=True) == expected -@skip_py36 @skip_py37 @skip_pypy3 def test_broken_call_attr(): diff --git a/tests/test_pretty.py b/tests/test_pretty.py index 353dae97..77e988a0 100644 --- a/tests/test_pretty.py +++ b/tests/test_pretty.py @@ -15,11 +15,6 @@ from rich.measure import Measurement from rich.pretty import Node, Pretty, _ipy_display_hook, install, pprint, pretty_repr from rich.text import Text -skip_py36 = pytest.mark.skipif( - sys.version_info.minor == 6 and sys.version_info.major == 3, - reason="rendered differently on py3.6", -) - skip_py37 = pytest.mark.skipif( sys.version_info.minor == 7 and sys.version_info.major == 3, reason="rendered differently on py3.7", @@ -266,7 +261,6 @@ def test_small_width(): assert result == expected -@skip_py36 def test_broken_repr(): class BrokenRepr: def __repr__(self): @@ -278,7 +272,6 @@ def test_broken_repr(): assert result == expected -@skip_py36 def test_broken_getattr(): class BrokenAttr: def __getattr__(self, name): @@ -495,7 +488,6 @@ def test_attrs_empty(): assert result == expected -@skip_py36 @skip_py310 @skip_py311 def test_attrs_broken(): @@ -511,7 +503,6 @@ def test_attrs_broken(): assert result == expected -@skip_py36 @skip_py37 @skip_py38 @skip_py39 diff --git a/tests/test_repr.py b/tests/test_repr.py index 3c2f48a4..faabb90f 100644 --- a/tests/test_repr.py +++ b/tests/test_repr.py @@ -1,15 +1,10 @@ -import pytest import sys from typing import Optional -from rich.console import Console +import pytest + import rich.repr - - -skip_py36 = pytest.mark.skipif( - sys.version_info.minor == 6 and sys.version_info.major == 3, - reason="rendered differently on py3.6", -) +from rich.console import Console skip_py37 = pytest.mark.skipif( sys.version_info.minor == 7 and sys.version_info.major == 3, @@ -71,7 +66,6 @@ def test_rich_repr() -> None: assert (repr(Foo("hello", bar=3))) == "Foo('hello', 'hello', bar=3, egg=1)" -@skip_py36 @skip_py37 def test_rich_repr_positional_only() -> None: _locals = locals().copy()