From 06aa0c537b53669c9f119af6f45289059887b55d Mon Sep 17 00:00:00 2001 From: Kevin Deldycke Date: Thu, 3 Sep 2020 11:36:29 +0200 Subject: [PATCH 1/3] Add reStructuredText markup classifier. --- src/trove_classifiers/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/trove_classifiers/__init__.py b/src/trove_classifiers/__init__.py index 05402fd..a4ff2b4 100644 --- a/src/trove_classifiers/__init__.py +++ b/src/trove_classifiers/__init__.py @@ -729,6 +729,7 @@ "Topic :: Text Processing :: Markup :: HTML", "Topic :: Text Processing :: Markup :: LaTeX", "Topic :: Text Processing :: Markup :: Markdown", + "Topic :: Text Processing :: Markup :: reStructuredText", "Topic :: Text Processing :: Markup :: SGML", "Topic :: Text Processing :: Markup :: VRML", "Topic :: Text Processing :: Markup :: XML", From 341b6e0c0da9bb2542fbd0f3c9647cfe8ea03044 Mon Sep 17 00:00:00 2001 From: Kevin Deldycke Date: Thu, 3 Sep 2020 17:31:28 +0200 Subject: [PATCH 2/3] Fix black formatting. --- tests/test_classifiers.py | 40 ++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/tests/test_classifiers.py b/tests/test_classifiers.py index a25d654..2cbf721 100644 --- a/tests/test_classifiers.py +++ b/tests/test_classifiers.py @@ -6,7 +6,13 @@ @pytest.mark.parametrize( "classifiers, deprecated_classifiers", [ - ({"Foo :: Bar", "Foo :: Bar :: Baz",}, {}), + ( + { + "Foo :: Bar", + "Foo :: Bar :: Baz", + }, + {}, + ), ({"Foo :: Bar"}, {"Biz :: Baz": ["Foo :: Bar"]}), ], ) @@ -17,15 +23,23 @@ def test_success(classifiers, deprecated_classifiers): @pytest.mark.parametrize( "classifiers, deprecated_classifiers, expected", [ - ({"Foo", "Foo :: Bar"}, {}, "Top-level classifier 'Foo' is invalid",), + ( + {"Foo", "Foo :: Bar"}, + {}, + "Top-level classifier 'Foo' is invalid", + ), ({"Foo :: Bar :: Baz"}, {}, "Classifier 'Foo :: Bar' is missing"), ( - {"Foo :: Bar",}, + { + "Foo :: Bar", + }, {"Biz :: Baz": ["Bing :: Bang"]}, "Classifier 'Bing :: Bang' does not exist", ), ( - {"Foo :: Bar",}, + { + "Foo :: Bar", + }, {"Foo :: Bar": []}, "Classifier 'Foo :: Bar' in both valid and deprecated classifiers", ), @@ -43,9 +57,21 @@ def test_success(classifiers, deprecated_classifiers): {}, "Classifiers starting or ending with whitespace are invalid", ), - ({"Foo: :: Bar"}, {}, "Classifiers containing ':' are invalid",), - ({"Foo :: B:ar"}, {}, "Classifiers containing ':' are invalid",), - ({"Foo :: Bar: Baz"}, {}, "Classifiers containing ':' are invalid",), + ( + {"Foo: :: Bar"}, + {}, + "Classifiers containing ':' are invalid", + ), + ( + {"Foo :: B:ar"}, + {}, + "Classifiers containing ':' are invalid", + ), + ( + {"Foo :: Bar: Baz"}, + {}, + "Classifiers containing ':' are invalid", + ), ], ) def test_failure(classifiers, deprecated_classifiers, expected): From fd7a112bf917a8afffa70c821ff23ba5fee72999 Mon Sep 17 00:00:00 2001 From: Kevin Deldycke Date: Thu, 3 Sep 2020 17:34:26 +0200 Subject: [PATCH 3/3] Sorting is case-sensitive. --- src/trove_classifiers/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trove_classifiers/__init__.py b/src/trove_classifiers/__init__.py index a4ff2b4..3ec2291 100644 --- a/src/trove_classifiers/__init__.py +++ b/src/trove_classifiers/__init__.py @@ -729,10 +729,10 @@ "Topic :: Text Processing :: Markup :: HTML", "Topic :: Text Processing :: Markup :: LaTeX", "Topic :: Text Processing :: Markup :: Markdown", - "Topic :: Text Processing :: Markup :: reStructuredText", "Topic :: Text Processing :: Markup :: SGML", "Topic :: Text Processing :: Markup :: VRML", "Topic :: Text Processing :: Markup :: XML", + "Topic :: Text Processing :: Markup :: reStructuredText", "Topic :: Utilities", "Typing :: Typed", }