Simplify

CONTRIBUTING.md

@@ -8,14 +8,11 @@ matches the input source.
 ## Running linting
 Run `make lint`.
 
-## Rebuilding the auto-generated list of classifiers
-Run `make build`.
-
 ## Adding a new classifier
-To add a new classifier, edit `_internal/classifiers.py`, then rebuild the
-compiled list of classifiers with `make build`.
+To add a new classifier, add to the `classifiers` set in
+`trove_classifiers/__init__.py`.
 
 ## Deprecating a classifier
 To deprecate a classifier, move it from `classifiers` to
-`deprecated_classifiers` in `_internal/classifiers.py`, and list any new
+`deprecated_classifiers` in `trove_classifiers/__init__.py`, and list any new
 classifiers that may replace it.

Makefile

@@ -10,19 +10,14 @@ BINDIR = $(PWD)/.state/env/bin
 	# install various types of requirements
 	$(BINDIR)/python -m pip install -r requirements/dev.txt
 
-build: .state/env/pyvenv.cfg
-	$(BINDIR)/python -m _internal.generator
-
 test: .state/env/pyvenv.cfg
 	$(BINDIR)/pytest
-	$(eval TMPDIR := $(shell mktemp -d))
-	$(BINDIR)/python -m _internal.generator --output $(TMPDIR)/test.py
-	diff trove_classifiers/__init__.py $(TMPDIR)/test.py
+	$(BINDIR)/python -m tester
 
 lint: .state/env/pyvenv.cfg
-	$(BINDIR)/black --check _internal tests
+	$(BINDIR)/black --check tests tester trove_classifiers
 
 reformat: .state/env/pyvenv.cfg
-	$(BINDIR)/black _internal tests
+	$(BINDIR)/black tests tester trove_classifiers
 
 .PHONY: build test lint reformat

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='trove-classifiers',
-    version='1.0.0',
+    version='2020.04.01',
     description="Cannonical source for classifiers on PyPI (pypi.org).",
     long_description=long_description,
     long_description_content_type="text/markdown",

tester/__init__.py

@@ -0,0 +1,53 @@
+class InvalidClassifier(Exception):
+    pass
+
+
+def trove_tester(classifiers, deprecated_classifiers):
+    # Check the classifiers
+    for classifier in classifiers:
+        split = classifier.split(" :: ")
+
+        # Check if this is an invalid top-level classifier
+        if len(split) == 1:
+            raise InvalidClassifier(f"Top-level classifier {classifier!r} is invalid")
+
+        # Check if all parent classifiers are specified
+        for i in range(2, len(split)):
+            parent = " :: ".join(split[:i])
+            if parent not in classifiers:
+                raise InvalidClassifier(f"Classifier {parent!r} is missing")
+
+        # Check the sub-classifiers
+        for sub in split:
+
+            # Check for whitespace
+            if sub.strip().rstrip() != sub:
+                raise InvalidClassifier(
+                    "Classifiers starting or ending with whitespace are invalid"
+                )
+
+            # Check for private classifiers
+            if sub.lower().startswith("private"):
+                raise InvalidClassifier(
+                    "Classifiers starting with 'Private' are invalid"
+                )
+
+            # Check for stray colons
+            if ":" in sub:
+                raise InvalidClassifier("Classifiers containing ':' are invalid")
+
+    # Check the deprecated classifiers
+    for deprecated_classifier, deprecated_by in deprecated_classifiers.items():
+
+        # Check if the classifier is in both lists
+        if deprecated_classifier in classifiers:
+            raise InvalidClassifier(
+                f"Classifier {deprecated_classifier!r} in both valid and deprecated classifiers"
+            )
+
+        # Check if all deprecated_by classifiers exist
+        for new_classifier in deprecated_by:
+            if new_classifier not in classifiers:
+                raise InvalidClassifier(f"Classifier {new_classifier!r} does not exist")
+
+    print("All classifiers passed :)")

tester/__main__.py

@@ -0,0 +1,4 @@
+from tester import trove_tester
+from trove_classifiers import classifiers, deprecated_classifiers
+
+trove_tester(classifiers, deprecated_classifiers)

tests/test_tester.py

@@ -0,0 +1,55 @@
+import pytest
+
+from tester import trove_tester, InvalidClassifier
+
+
+@pytest.mark.parametrize(
+    "classifiers, deprecated_classifiers",
+    [
+        ({"Foo :: Bar", "Foo :: Bar :: Baz",}, {}),
+        ({"Foo :: Bar"}, {"Biz :: Baz": ["Foo :: Bar"]}),
+    ],
+)
+def test_success(classifiers, deprecated_classifiers):
+    trove_tester(classifiers, deprecated_classifiers)
+
+
+@pytest.mark.parametrize(
+    "classifiers, deprecated_classifiers, expected",
+    [
+        ({"Foo", "Foo :: Bar"}, {}, "Top-level classifier 'Foo' is invalid",),
+        ({"Foo :: Bar :: Baz"}, {}, "Classifier 'Foo :: Bar' is missing"),
+        (
+            {"Foo :: Bar",},
+            {"Biz :: Baz": ["Bing :: Bang"]},
+            "Classifier 'Bing :: Bang' does not exist",
+        ),
+        (
+            {"Foo :: Bar",},
+            {"Foo :: Bar": []},
+            "Classifier 'Foo :: Bar' in both valid and deprecated classifiers",
+        ),
+        ({"Private :: Foo"}, {}, "Classifiers starting with 'Private' are invalid"),
+        ({"private :: Foo"}, {}, "Classifiers starting with 'Private' are invalid"),
+        ({"Foo :: Private"}, {}, "Classifiers starting with 'Private' are invalid"),
+        ({"Foo :: private"}, {}, "Classifiers starting with 'Private' are invalid"),
+        (
+            {" Foo :: Bar"},
+            {},
+            "Classifiers starting or ending with whitespace are invalid",
+        ),
+        (
+            {"Foo :: Bar "},
+            {},
+            "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",),
+    ],
+)
+def test_failure(classifiers, deprecated_classifiers, expected):
+    with pytest.raises(InvalidClassifier) as excinfo:
+        trove_tester(classifiers, deprecated_classifiers)
+
+    assert excinfo.value.args == (expected,)

trove_classifiers/__init__.py

@@ -1,6 +1,3 @@
-# THIS FILE IS AUTOGENERATED
-# Edit `_internal/classifiers.py` instead, and run `make build` to regenerate
-
 classifiers = {
     "Development Status :: 1 - Planning",
     "Development Status :: 2 - Pre-Alpha",
@@ -703,6 +700,6 @@
 }
 
 deprecated_classifiers = {
-    "Natural Language :: Ukranian": ['Natural Language :: Ukrainian'],
+    "Natural Language :: Ukranian": ["Natural Language :: Ukrainian"],
     "Topic :: Communications :: Chat :: AOL Instant Messenger": [],
 }