From 4b8d4e2a109303cfb2e015fa72f3399724d928ae Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 27 May 2021 08:34:09 -0400 Subject: [PATCH 1/2] Remove SelectableGroups deprecation exception for flake8. --- CHANGES.rst | 5 +++++ importlib_metadata/__init__.py | 10 +--------- pytest.ini | 2 ++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 9e0e7c44..9a719436 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,8 @@ +v4.3.0 +======= + +* Remove SelectableGroups deprecation exception for flake8. + v4.2.0 ======= diff --git a/importlib_metadata/__init__.py b/importlib_metadata/__init__.py index 0da20fc8..fd1bed07 100644 --- a/importlib_metadata/__init__.py +++ b/importlib_metadata/__init__.py @@ -266,14 +266,6 @@ def _parse_groups(text): ) -def flake8_bypass(func): - # defer inspect import as performance optimization. - import inspect - - is_flake8 = any('flake8' in str(frame.filename) for frame in inspect.stack()[:5]) - return func if not is_flake8 else lambda: None - - class Deprecated: """ Compatibility add-in for mapping to indicate that @@ -309,7 +301,7 @@ def __getitem__(self, name): return super().__getitem__(name) def get(self, name, default=None): - flake8_bypass(self._warn)() + self._warn() return super().get(name, default) def __iter__(self): diff --git a/pytest.ini b/pytest.ini index 6bf69af1..871a2a47 100644 --- a/pytest.ini +++ b/pytest.ini @@ -5,3 +5,5 @@ doctest_optionflags=ALLOW_UNICODE ELLIPSIS # workaround for warning pytest-dev/pytest#6178 junit_family=xunit2 filterwarnings= + # Suppress deprecation warning in flake8 + ignore:SelectableGroups dict interface is deprecated::flake8 From abfe23baf9587db19daada1c5aef4451c9e94ea1 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 31 May 2021 10:57:04 -0400 Subject: [PATCH 2/2] Separate release number. --- CHANGES.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index d7896d79..97e200cb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +v4.5.0 +======= + +* #319: Remove ``SelectableGroups`` deprecation exception + for flake8. + v4.4.0 ======= @@ -17,8 +23,6 @@ v4.4.0 cast the result to a Sequence first (e.g. ``tuple(dist.entry_points)[0]``). -* Remove SelectableGroups deprecation exception for flake8. - v4.3.1 =======