From 6a4583d0a809bd15d79f6f9d963dc35b69d78a9a Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Wed, 12 May 2021 18:17:42 +0200 Subject: [PATCH] Deprecate pallets stubs (#5424) Part of #5423 * Support new metadata fields in check_consistent --- stubs/Flask/METADATA.toml | 1 + stubs/Jinja2/METADATA.toml | 1 + stubs/MarkupSafe/METADATA.toml | 1 + stubs/Werkzeug/METADATA.toml | 1 + stubs/click/METADATA.toml | 1 + stubs/itsdangerous/METADATA.toml | 1 + tests/check_consistent.py | 5 ++--- 7 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stubs/Flask/METADATA.toml b/stubs/Flask/METADATA.toml index 637e96e2e..a6ffc1309 100644 --- a/stubs/Flask/METADATA.toml +++ b/stubs/Flask/METADATA.toml @@ -1,3 +1,4 @@ version = "0.1" python2 = true requires = ["types-Jinja2", "types-Werkzeug", "types-click"] +obsolete_since = "2.0" diff --git a/stubs/Jinja2/METADATA.toml b/stubs/Jinja2/METADATA.toml index 1d2527760..89f4021f9 100644 --- a/stubs/Jinja2/METADATA.toml +++ b/stubs/Jinja2/METADATA.toml @@ -1,3 +1,4 @@ version = "0.1" python2 = true requires = ["types-MarkupSafe"] +obsolete_since = "3.0" diff --git a/stubs/MarkupSafe/METADATA.toml b/stubs/MarkupSafe/METADATA.toml index 31f638bf3..0917f9d1a 100644 --- a/stubs/MarkupSafe/METADATA.toml +++ b/stubs/MarkupSafe/METADATA.toml @@ -1,2 +1,3 @@ version = "0.1" python2 = true +obsolete_since = "2.0" diff --git a/stubs/Werkzeug/METADATA.toml b/stubs/Werkzeug/METADATA.toml index e43ccaae3..632569976 100644 --- a/stubs/Werkzeug/METADATA.toml +++ b/stubs/Werkzeug/METADATA.toml @@ -1,3 +1,4 @@ version = "0.1" python2 = true requires = [] +obsolete_since = "2.0" diff --git a/stubs/click/METADATA.toml b/stubs/click/METADATA.toml index 31f638bf3..6b725d317 100644 --- a/stubs/click/METADATA.toml +++ b/stubs/click/METADATA.toml @@ -1,2 +1,3 @@ version = "0.1" python2 = true +obsolete_since = "8.0" diff --git a/stubs/itsdangerous/METADATA.toml b/stubs/itsdangerous/METADATA.toml index 31f638bf3..0917f9d1a 100644 --- a/stubs/itsdangerous/METADATA.toml +++ b/stubs/itsdangerous/METADATA.toml @@ -1,2 +1,3 @@ version = "0.1" python2 = true +obsolete_since = "2.0" diff --git a/tests/check_consistent.py b/tests/check_consistent.py index 395bb4c53..ff8f20bcd 100755 --- a/tests/check_consistent.py +++ b/tests/check_consistent.py @@ -21,6 +21,7 @@ consistent_files = [ {"stdlib/@python2/builtins.pyi", "stdlib/@python2/__builtin__.pyi"}, {"stdlib/threading.pyi", "stdlib/_dummy_threading.pyi"}, ] +metadata_keys = {"version", "python2", "python3", "requires", "extra_description", "obsolete_since"} def assert_stubs_only(directory): @@ -161,9 +162,7 @@ def check_metadata(): major, minor = version.split(".") assert major.isdigit() and minor.isdigit(), msg for key in data: - assert key in { - "version", "python2", "python3", "requires" - }, f"Unexpected key {key} for {distribution}" + assert key in metadata_keys, f"Unexpected key {key} for {distribution}" assert isinstance(data.get("python2", False), bool), f"Invalid python2 value for {distribution}" assert isinstance(data.get("python3", True), bool), f"Invalid python3 value for {distribution}" assert isinstance(data.get("requires", []), list), f"Invalid requires value for {distribution}"