From db0b347abdaa16281b3bc685a0edfdb5a21223ea Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:13:21 -0500
Subject: [PATCH 01/14] Add dependency on trove-classifiers=1.0.0

---
 requirements/main.in  | 1 +
 requirements/main.txt | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/requirements/main.in b/requirements/main.in
index f39a8dd9b5cb..5909c1630099 100644
--- a/requirements/main.in
+++ b/requirements/main.in
@@ -53,6 +53,7 @@ sqlalchemy-citext
 stdlib-list
 structlog
 transaction
+trove-classifiers
 typeguard
 webauthn
 whitenoise
diff --git a/requirements/main.txt b/requirements/main.txt
index f33964e53f2d..4497017698b9 100644
--- a/requirements/main.txt
+++ b/requirements/main.txt
@@ -569,6 +569,9 @@ transaction==3.0.0 \
 translationstring==1.3 \
     --hash=sha256:4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d \
     --hash=sha256:e26c7bf383413234ed442e0980a2ebe192b95e3745288a8fd2805156d27515b4
+trove-classifiers==1.0.0 \
+    --hash=sha256:22a935078ca8e81ad19cfdb16c70ed6a0138799ff19ff889ed8f93f62d507716 \
+    --hash=sha256:930e50d6eb0766a56780d3c991e4b4ace95f47b060c68c9b78dea034f84ffc4d
 typeguard==2.7.1 \
     --hash=sha256:1d3710251d3d3d6c64e0c49f45edec2e88ddc386a51e89c3ec0703efeb8b3b81 \
     --hash=sha256:2d545c71e9439c21bcd7c28f5f55b3606e6106f7031ab58375656a1aed483ef2

From b980db9a9b8f1a78f720f232115c386b4a30c4ac Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:14:44 -0500
Subject: [PATCH 02/14] Remove a random comment

---
 warehouse/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/warehouse/views.py b/warehouse/views.py
index ceca604f6e9f..90664984f7b5 100644
--- a/warehouse/views.py
+++ b/warehouse/views.py
@@ -54,8 +54,6 @@
 from warehouse.utils.paginate import ElasticsearchPage, paginate_url_factory
 from warehouse.utils.row_counter import RowCount
 
-# 403, 404, 410, 500,
-
 
 @view_config(context=HTTPException)
 @notfound_view_config(append_slash=HTTPMovedPermanently)

From 48dd4bd84e3836372a567d91b915c5dec58965d3 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:16:16 -0500
Subject: [PATCH 03/14] Update list classifiers HTML view

---
 tests/unit/test_views.py                   | 10 +++-------
 warehouse/templates/pages/classifiers.html |  4 ++--
 warehouse/views.py                         | 12 +++---------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/tests/unit/test_views.py b/tests/unit/test_views.py
index f03729e88eaf..ff0a9af04e1e 100644
--- a/tests/unit/test_views.py
+++ b/tests/unit/test_views.py
@@ -22,11 +22,11 @@
     HTTPSeeOther,
     HTTPServiceUnavailable,
 )
+from trove_classifiers import classifiers
 from webob.multidict import MultiDict
 
 from warehouse import views
 from warehouse.views import (
-    classifiers,
     current_user_indicator,
     flash_messages,
     forbidden,
@@ -35,6 +35,7 @@
     health,
     httpexception_view,
     index,
+    list_classifiers,
     locale,
     opensearchxml,
     robotstxt,
@@ -424,12 +425,7 @@ def raiser(*args, **kwargs):
 
 
 def test_classifiers(db_request):
-    classifier_a = ClassifierFactory(classifier="I am first")
-    classifier_b = ClassifierFactory(classifier="I am last")
-
-    assert classifiers(db_request) == {
-        "classifiers": [(classifier_a.classifier,), (classifier_b.classifier,)]
-    }
+    assert list_classifiers(db_request) == {"classifiers": sorted(classifiers)}
 
 
 def test_stats(db_request):
diff --git a/warehouse/templates/pages/classifiers.html b/warehouse/templates/pages/classifiers.html
index f762a1c5699f..07b37fda92c1 100644
--- a/warehouse/templates/pages/classifiers.html
+++ b/warehouse/templates/pages/classifiers.html
@@ -32,9 +32,9 @@ <h2>{% trans %}List of classifiers{% endtrans %}</h2>
     <ul>
     {% for classifier in classifiers %}
       <li>
-        <a href="{{ request.route_path('search', _query={'c': classifier.classifier}) }}">{{ classifier.classifier }}</a>
+        <a href="{{ request.route_path('search', _query={'c': classifier}) }}">{{ classifier }}</a>
         &nbsp;
-        <button type="button" class="button button--small margin-top margin-bottom copy-tooltip copy-tooltip-w" data-tooltip-label="{% trans %}Copy to clipboard{% endtrans %}" data-clipboard-text="{{ classifier.classifier }}">
+        <button type="button" class="button button--small margin-top margin-bottom copy-tooltip copy-tooltip-w" data-tooltip-label="{% trans %}Copy to clipboard{% endtrans %}" data-clipboard-text="{{ classifier }}">
           {% trans %}Copy{% endtrans %}
         </button>
       </li>
diff --git a/warehouse/views.py b/warehouse/views.py
index 90664984f7b5..28620fb7fefd 100644
--- a/warehouse/views.py
+++ b/warehouse/views.py
@@ -38,6 +38,7 @@
 from sqlalchemy import func
 from sqlalchemy.orm import aliased, joinedload
 from sqlalchemy.sql import exists
+from trove_classifiers import classifiers
 
 from warehouse.accounts import REDIRECT_FIELD_NAME
 from warehouse.accounts.models import User
@@ -259,15 +260,8 @@ def locale(request):
 @view_config(
     route_name="classifiers", renderer="pages/classifiers.html", has_translations=True
 )
-def classifiers(request):
-    classifiers = (
-        request.db.query(Classifier.classifier)
-        .filter(Classifier.deprecated.is_(False))
-        .order_by(Classifier.classifier)
-        .all()
-    )
-
-    return {"classifiers": classifiers}
+def list_classifiers(request):
+    return {"classifiers": sorted(classifiers)}
 
 
 @view_config(

From 35d32aa3371e59878263fd3c27e9910c239bc19a Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:18:07 -0500
Subject: [PATCH 04/14] Update list classifiers API action

---
 tests/unit/legacy/api/test_pypi.py |  7 ++-----
 warehouse/legacy/api/pypi.py       | 11 ++---------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/tests/unit/legacy/api/test_pypi.py b/tests/unit/legacy/api/test_pypi.py
index 9082b9a33cf5..429daa77227f 100644
--- a/tests/unit/legacy/api/test_pypi.py
+++ b/tests/unit/legacy/api/test_pypi.py
@@ -14,6 +14,7 @@
 import pytest
 
 from pyramid.httpexceptions import HTTPBadRequest, HTTPMovedPermanently, HTTPNotFound
+from trove_classifiers import classifiers
 
 from warehouse.legacy.api import pypi
 
@@ -67,14 +68,10 @@ def test_forbidden_legacy():
 
 
 def test_list_classifiers(db_request):
-    ClassifierFactory.create(classifier="foo :: bar")
-    ClassifierFactory.create(classifier="foo :: baz")
-    ClassifierFactory.create(classifier="fiz :: buz")
-
     resp = pypi.list_classifiers(db_request)
 
     assert resp.status_code == 200
-    assert resp.text == "fiz :: buz\nfoo :: bar\nfoo :: baz"
+    assert resp.text == "\n".join(sorted(classifiers))
 
 
 def test_search():
diff --git a/warehouse/legacy/api/pypi.py b/warehouse/legacy/api/pypi.py
index d595ab2702fc..c0f41b72d3be 100644
--- a/warehouse/legacy/api/pypi.py
+++ b/warehouse/legacy/api/pypi.py
@@ -13,6 +13,7 @@
 from pyramid.httpexceptions import HTTPGone, HTTPMovedPermanently, HTTPNotFound
 from pyramid.response import Response
 from pyramid.view import forbidden_view_config, view_config
+from trove_classifiers import classifiers
 
 from warehouse.classifiers.models import Classifier
 
@@ -74,16 +75,8 @@ def forbidden_legacy(exc, request):
 
 @view_config(route_name="legacy.api.pypi.list_classifiers")
 def list_classifiers(request):
-    classifiers = (
-        request.db.query(Classifier.classifier)
-        .filter(Classifier.deprecated.is_(False))
-        .order_by(Classifier.classifier)
-        .all()
-    )
-
     return Response(
-        text="\n".join(c[0] for c in classifiers),
-        content_type="text/plain; charset=utf-8",
+        text="\n".join(sorted(classifiers)), content_type="text/plain; charset=utf-8",
     )
 
 

From 99fb89a2fdddb65c8a79998903ff1ef134bcbb75 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:19:09 -0500
Subject: [PATCH 05/14] Update search filter for deprecated classifiers

---
 warehouse/views.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/warehouse/views.py b/warehouse/views.py
index 28620fb7fefd..57f093ddbd72 100644
--- a/warehouse/views.py
+++ b/warehouse/views.py
@@ -38,7 +38,7 @@
 from sqlalchemy import func
 from sqlalchemy.orm import aliased, joinedload
 from sqlalchemy.sql import exists
-from trove_classifiers import classifiers
+from trove_classifiers import classifiers, deprecated_classifiers
 
 from warehouse.accounts import REDIRECT_FIELD_NAME
 from warehouse.accounts.models import User
@@ -305,11 +305,11 @@ def search(request):
     classifiers_q = (
         request.db.query(Classifier)
         .with_entities(Classifier.classifier)
-        .filter(Classifier.deprecated.is_(False))
         .filter(
             exists([release_classifiers.c.trove_id]).where(
                 release_classifiers.c.trove_id == Classifier.id
-            )
+            ),
+            Classifier.classifier.notin_(deprecated_classifiers.keys()),
         )
         .order_by(Classifier.classifier)
     )

From f2849e4fe8cd060cd48c7604b3def3f656d3f6db Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:25:08 -0500
Subject: [PATCH 06/14] New validators for classifiers and deprecated
 classifiers

---
 tests/unit/forklift/test_legacy.py | 74 +++++++++++++++++++++---------
 warehouse/forklift/legacy.py       | 71 ++++++++++++++--------------
 2 files changed, 90 insertions(+), 55 deletions(-)

diff --git a/tests/unit/forklift/test_legacy.py b/tests/unit/forklift/test_legacy.py
index d3e8543f23ef..bbc3e06a6417 100644
--- a/tests/unit/forklift/test_legacy.py
+++ b/tests/unit/forklift/test_legacy.py
@@ -328,25 +328,42 @@ def test_validate_description_content_type_invalid(self, data):
             legacy._validate_description_content_type(form, field)
 
     def test_validate_no_deprecated_classifiers_valid(self, db_request):
-        valid_classifier = ClassifierFactory(deprecated=False)
-        validator = legacy._no_deprecated_classifiers(db_request)
+        valid_classifier = ClassifierFactory(classifier="AA :: BB")
 
         form = pretend.stub()
         field = pretend.stub(data=[valid_classifier.classifier])
 
-        validator(form, field)
+        legacy._validate_no_deprecated_classifiers(form, field)
 
-    def test_validate_no_deprecated_classifiers_invalid(self, db_request):
-        deprecated_classifier = ClassifierFactory(classifier="AA: BB", deprecated=True)
-        validator = legacy._no_deprecated_classifiers(db_request)
-        db_request.registry = pretend.stub(settings={"warehouse.domain": "host"})
-        db_request.route_url = pretend.call_recorder(lambda *a, **kw: "/url")
+    @pytest.mark.parametrize(
+        "deprecated_classifiers", [({"AA :: BB": []}), ({"AA :: BB": ["CC :: DD"]})]
+    )
+    def test_validate_no_deprecated_classifiers_invalid(
+        self, db_request, deprecated_classifiers, monkeypatch
+    ):
+        monkeypatch.setattr(legacy, "deprecated_classifiers", deprecated_classifiers)
 
         form = pretend.stub()
-        field = pretend.stub(data=[deprecated_classifier.classifier])
+        field = pretend.stub(data=["AA :: BB"])
 
         with pytest.raises(ValidationError):
-            validator(form, field)
+            legacy._validate_no_deprecated_classifiers(form, field)
+
+    def test_validate_classifiers_valid(self, db_request, monkeypatch):
+        monkeypatch.setattr(legacy, "classifiers", {"AA :: BB"})
+
+        form = pretend.stub()
+        field = pretend.stub(data=["AA :: BB"])
+
+        legacy._validate_classifiers(form, field)
+
+    @pytest.mark.parametrize("data", [(["AA :: BB"]), (["AA :: BB", "CC :: DD"])])
+    def test_validate_classifiers_invalid(self, db_request, data):
+        form = pretend.stub()
+        field = pretend.stub(data=data)
+
+        with pytest.raises(ValidationError):
+            legacy._validate_classifiers(form, field)
 
 
 def test_construct_dependencies():
@@ -1639,7 +1656,7 @@ def test_upload_fails_with_invalid_classifier(self, pyramid_config, db_request):
                 ),
             }
         )
-        db_request.POST.extend([("classifiers", "Environment :: Other Environment")])
+        db_request.POST.extend([("classifiers", "Invalid :: Classifier")])
 
         with pytest.raises(HTTPBadRequest) as excinfo:
             legacy.file_upload(db_request)
@@ -1648,12 +1665,29 @@ def test_upload_fails_with_invalid_classifier(self, pyramid_config, db_request):
 
         assert resp.status_code == 400
         assert resp.status == (
-            "400 Invalid value for classifiers. "
-            "Error: 'Environment :: Other Environment' is not a valid choice "
-            "for this field"
+            "400 Invalid value for classifiers. Error: Classifier 'Invalid :: "
+            "Classifier' is not a valid classifier."
         )
 
-    def test_upload_fails_with_deprecated_classifier(self, pyramid_config, db_request):
+    @pytest.mark.parametrize(
+        "deprecated_classifiers, expected",
+        [
+            (
+                {"AA :: BB": ["CC :: DD"]},
+                "400 Invalid value for classifiers. Error: Classifier 'AA :: "
+                "BB' has been deprecated, use the following classifier(s) "
+                "instead: ['CC :: DD']",
+            ),
+            (
+                {"AA :: BB": []},
+                "400 Invalid value for classifiers. Error: Classifier 'AA :: "
+                "BB' has been deprecated.",
+            ),
+        ],
+    )
+    def test_upload_fails_with_deprecated_classifier(
+        self, pyramid_config, db_request, monkeypatch, deprecated_classifiers, expected
+    ):
         pyramid_config.testing_securitypolicy(userid=1)
 
         user = UserFactory.create()
@@ -1662,7 +1696,9 @@ def test_upload_fails_with_deprecated_classifier(self, pyramid_config, db_reques
         project = ProjectFactory.create()
         release = ReleaseFactory.create(project=project, version="1.0")
         RoleFactory.create(user=user, project=project)
-        classifier = ClassifierFactory(classifier="AA :: BB", deprecated=True)
+        classifier = ClassifierFactory(classifier="AA :: BB")
+
+        monkeypatch.setattr(legacy, "deprecated_classifiers", deprecated_classifiers)
 
         filename = "{}-{}.tar.gz".format(project.name, release.version)
 
@@ -1689,11 +1725,7 @@ def test_upload_fails_with_deprecated_classifier(self, pyramid_config, db_reques
         resp = excinfo.value
 
         assert resp.status_code == 400
-        assert resp.status == (
-            "400 Invalid value for classifiers. "
-            "Error: Classifier 'AA :: BB' has been deprecated, see /url "
-            "for a list of valid classifiers."
-        )
+        assert resp.status == expected
 
     @pytest.mark.parametrize(
         "digests",
diff --git a/warehouse/forklift/legacy.py b/warehouse/forklift/legacy.py
index 5d90ccf2963e..a3f5a4669cd7 100644
--- a/warehouse/forklift/legacy.py
+++ b/warehouse/forklift/legacy.py
@@ -37,6 +37,7 @@
 from pyramid.view import view_config
 from sqlalchemy import exists, func, orm
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
+from trove_classifiers import classifiers, deprecated_classifiers
 
 from warehouse import forms
 from warehouse.admin.flags import AdminFlagValue
@@ -340,6 +341,38 @@ def _raise(message):
         )
 
 
+def _validate_no_deprecated_classifiers(form, field):
+    invalid_classifiers = set(field.data or []) & deprecated_classifiers.keys()
+    if invalid_classifiers:
+        first_invalid_classifier_name = sorted(invalid_classifiers)[0]
+        deprecated_by = deprecated_classifiers[first_invalid_classifier_name]
+
+        if deprecated_by:
+            raise wtforms.validators.ValidationError(
+                f"Classifier {first_invalid_classifier_name!r} has been "
+                "deprecated, use the following classifier(s) instead: "
+                f"{deprecated_by}"
+            )
+        else:
+            raise wtforms.validators.ValidationError(
+                f"Classifier {first_invalid_classifier_name!r} has been deprecated."
+            )
+
+
+def _validate_classifiers(form, field):
+    invalid = sorted(set(field.data or []) - classifiers)
+
+    if invalid:
+        if len(invalid) == 1:
+            raise wtforms.validators.ValidationError(
+                f"Classifier {invalid[0]!r} is not a valid classifier."
+            )
+        else:
+            raise wtforms.validators.ValidationError(
+                f"Classifiers {invalid!r} are not valid classifiers."
+            )
+
+
 def _construct_dependencies(form, types):
     for name, kind in types.items():
         for item in getattr(form, name).data:
@@ -437,7 +470,10 @@ class MetadataForm(forms.Form):
     keywords = wtforms.StringField(
         description="Keywords", validators=[wtforms.validators.Optional()]
     )
-    classifiers = wtforms.fields.SelectMultipleField(description="Classifier")
+    classifiers = ListField(
+        description="Classifier",
+        validators=[_validate_no_deprecated_classifiers, _validate_classifiers],
+    )
     platform = wtforms.StringField(
         description="Platform", validators=[wtforms.validators.Optional()]
     )
@@ -702,32 +738,6 @@ def _is_duplicate_file(db_session, filename, hashes):
     return None
 
 
-def _no_deprecated_classifiers(request):
-    deprecated_classifiers = {
-        classifier.classifier
-        for classifier in (
-            request.db.query(Classifier.classifier)
-            .filter(Classifier.deprecated.is_(True))
-            .all()
-        )
-    }
-
-    def validate_no_deprecated_classifiers(form, field):
-        invalid_classifiers = set(field.data or []) & deprecated_classifiers
-        if invalid_classifiers:
-            first_invalid_classifier = sorted(invalid_classifiers)[0]
-            host = request.registry.settings.get("warehouse.domain")
-            classifiers_url = request.route_url("classifiers", _host=host)
-
-            raise wtforms.validators.ValidationError(
-                f"Classifier {first_invalid_classifier!r} has been "
-                f"deprecated, see {classifiers_url} for a list of valid "
-                "classifiers."
-            )
-
-    return validate_no_deprecated_classifiers
-
-
 @view_config(
     route_name="forklift.legacy.file_upload",
     uses_session=True,
@@ -816,16 +826,9 @@ def file_upload(request):
         if any(isinstance(value, FieldStorage) for value in values):
             raise _exc_with_message(HTTPBadRequest, f"{field}: Should not be a tuple.")
 
-    # Look up all of the valid classifiers
-    all_classifiers = request.db.query(Classifier).all()
-
     # Validate and process the incoming metadata.
     form = MetadataForm(request.POST)
 
-    # Add a validator for deprecated classifiers
-    form.classifiers.validators.append(_no_deprecated_classifiers(request))
-
-    form.classifiers.choices = [(c.classifier, c.classifier) for c in all_classifiers]
     if not form.validate():
         for field_name in _error_message_order:
             if field_name in form.errors:

From b1ee0ff7980933bb946076de92f13a3fa72cd04d Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:27:43 -0500
Subject: [PATCH 07/14] Create new classifiers on upload

---
 tests/unit/forklift/test_legacy.py | 72 ++++++++++++++++++++++++++++++
 warehouse/forklift/legacy.py       | 24 ++++++++--
 2 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/tests/unit/forklift/test_legacy.py b/tests/unit/forklift/test_legacy.py
index bbc3e06a6417..55ecdd451bab 100644
--- a/tests/unit/forklift/test_legacy.py
+++ b/tests/unit/forklift/test_legacy.py
@@ -2818,6 +2818,78 @@ def test_upload_succeeds_creates_release(self, pyramid_config, db_request, metri
             ),
         ]
 
+    def test_upload_succeeds_creates_classifier(
+        self, pyramid_config, db_request, metrics, monkeypatch
+    ):
+        pyramid_config.testing_securitypolicy(userid=1)
+
+        user = UserFactory.create()
+        EmailFactory.create(user=user)
+        project = ProjectFactory.create()
+        RoleFactory.create(user=user, project=project)
+
+        monkeypatch.setattr(legacy, "classifiers", {"AA :: BB", "CC :: DD"})
+
+        db_request.db.add(Classifier(classifier="AA :: BB"))
+
+        filename = "{}-{}.tar.gz".format(project.name, "1.0")
+
+        db_request.user = user
+        db_request.remote_addr = "10.10.10.20"
+        db_request.user_agent = "warehouse-tests/6.6.6"
+        db_request.POST = MultiDict(
+            {
+                "metadata_version": "1.2",
+                "name": project.name,
+                "version": "1.0",
+                "summary": "This is my summary!",
+                "filetype": "sdist",
+                "md5_digest": _TAR_GZ_PKG_MD5,
+                "content": pretend.stub(
+                    filename=filename,
+                    file=io.BytesIO(_TAR_GZ_PKG_TESTDATA),
+                    type="application/tar",
+                ),
+            }
+        )
+        db_request.POST.extend(
+            [
+                ("classifiers", "AA :: BB"),
+                ("classifiers", "CC :: DD"),
+                ("requires_dist", "foo"),
+                ("requires_dist", "bar (>1.0)"),
+                ("project_urls", "Test, https://example.com/"),
+                ("requires_external", "Cheese (>1.0)"),
+                ("provides", "testing"),
+            ]
+        )
+
+        storage_service = pretend.stub(store=lambda path, filepath, meta: None)
+        db_request.find_service = lambda svc, name=None, context=None: {
+            IFileStorage: storage_service,
+            IMetricsService: metrics,
+        }.get(svc)
+
+        resp = legacy.file_upload(db_request)
+
+        assert resp.status_code == 200
+
+        # Ensure that a new Classifier has been created
+        classifier = (
+            db_request.db.query(Classifier)
+            .filter(Classifier.classifier == "CC :: DD")
+            .one()
+        )
+        assert classifier.classifier == "CC :: DD"
+
+        # Ensure that the Release has the new classifier
+        release = (
+            db_request.db.query(Release)
+            .filter((Release.project == project) & (Release.version == "1.0"))
+            .one()
+        )
+        assert release.classifiers == ["AA :: BB", "CC :: DD"]
+
     def test_equivalent_version_one_release(self, pyramid_config, db_request, metrics):
         """
         Test that if a release with a version like '1.0' exists, that a future
diff --git a/warehouse/forklift/legacy.py b/warehouse/forklift/legacy.py
index a3f5a4669cd7..2159762e8307 100644
--- a/warehouse/forklift/legacy.py
+++ b/warehouse/forklift/legacy.py
@@ -1057,11 +1057,29 @@ def file_upload(request):
             .one()
         )
     except NoResultFound:
+        # Look up all of the valid classifiers
+        all_classifiers = request.db.query(Classifier).all()
+
+        # Get all the classifiers for this release
+        release_classifiers = [
+            c for c in all_classifiers if c.classifier in form.classifiers.data
+        ]
+
+        # Determine if we need to add any new classifiers to the database
+        missing_classifiers = set(form.classifiers.data or []) - set(
+            c.classifier for c in release_classifiers
+        )
+
+        # Add any new classifiers to the database
+        if missing_classifiers:
+            for missing_classifier_name in missing_classifiers:
+                missing_classifier = Classifier(classifier=missing_classifier_name)
+                request.db.add(missing_classifier)
+                release_classifiers.append(missing_classifier)
+
         release = Release(
             project=project,
-            _classifiers=[
-                c for c in all_classifiers if c.classifier in form.classifiers.data
-            ],
+            _classifiers=release_classifiers,
             dependencies=list(
                 _construct_dependencies(
                     form,

From a52c5dfb8840ae480ba2beff6691a4fa87cf4085 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:28:19 -0500
Subject: [PATCH 08/14] Clean up Classifier model

---
 tests/common/db/classifiers.py                |  8 ---
 warehouse/classifiers/models.py               |  7 +--
 .../d15f020ee3df_simplify_classifier_model.py | 62 +++++++++++++++++++
 3 files changed, 63 insertions(+), 14 deletions(-)
 create mode 100644 warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py

diff --git a/tests/common/db/classifiers.py b/tests/common/db/classifiers.py
index 2656d78860ae..01118c8bde67 100644
--- a/tests/common/db/classifiers.py
+++ b/tests/common/db/classifiers.py
@@ -10,9 +10,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import factory
-import factory.fuzzy
-
 from warehouse.classifiers.models import Classifier
 
 from .base import WarehouseFactory
@@ -21,8 +18,3 @@
 class ClassifierFactory(WarehouseFactory):
     class Meta:
         model = Classifier
-
-    l2 = factory.fuzzy.FuzzyInteger(0)
-    l3 = factory.fuzzy.FuzzyInteger(0)
-    l4 = factory.fuzzy.FuzzyInteger(0)
-    l5 = factory.fuzzy.FuzzyInteger(0)
diff --git a/warehouse/classifiers/models.py b/warehouse/classifiers/models.py
index f4eecefce20c..3564a7ac5a30 100644
--- a/warehouse/classifiers/models.py
+++ b/warehouse/classifiers/models.py
@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sqlalchemy import Boolean, CheckConstraint, Column, Integer, Text, sql
+from sqlalchemy import CheckConstraint, Column, Integer, Text
 
 from warehouse import db
 from warehouse.utils.attrs import make_repr
@@ -28,8 +28,3 @@ class Classifier(db.ModelBase):
 
     id = Column(Integer, primary_key=True, nullable=False)
     classifier = Column(Text, unique=True)
-    deprecated = Column(Boolean, nullable=False, server_default=sql.false())
-    l2 = Column(Integer)
-    l3 = Column(Integer)
-    l4 = Column(Integer)
-    l5 = Column(Integer)
diff --git a/warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py b/warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py
new file mode 100644
index 000000000000..77b63ea6b3e4
--- /dev/null
+++ b/warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py
@@ -0,0 +1,62 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""
+Simplify classifier model
+
+Revision ID: d15f020ee3df
+Revises: 5c029d9ef925
+Create Date: 2020-02-03 03:28:22.838779
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision = "d15f020ee3df"
+down_revision = "5c029d9ef925"
+
+
+def upgrade():
+    op.drop_column("trove_classifiers", "l4")
+    op.drop_column("trove_classifiers", "l5")
+    op.drop_column("trove_classifiers", "l3")
+    op.drop_column("trove_classifiers", "deprecated")
+    op.drop_column("trove_classifiers", "l2")
+
+
+def downgrade():
+    op.add_column(
+        "trove_classifiers",
+        sa.Column("l2", sa.INTEGER(), autoincrement=False, nullable=True),
+    )
+    op.add_column(
+        "trove_classifiers",
+        sa.Column(
+            "deprecated",
+            sa.BOOLEAN(),
+            server_default=sa.text("false"),
+            autoincrement=False,
+            nullable=False,
+        ),
+    )
+    op.add_column(
+        "trove_classifiers",
+        sa.Column("l3", sa.INTEGER(), autoincrement=False, nullable=True),
+    )
+    op.add_column(
+        "trove_classifiers",
+        sa.Column("l5", sa.INTEGER(), autoincrement=False, nullable=True),
+    )
+    op.add_column(
+        "trove_classifiers",
+        sa.Column("l4", sa.INTEGER(), autoincrement=False, nullable=True),
+    )

From f6772afd795d0e49749b4eed4ab69f2171378a01 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 16:00:12 -0500
Subject: [PATCH 09/14] Remove classifier pages from admin UI

---
 tests/unit/admin/test_routes.py               |   9 --
 tests/unit/admin/views/test_classifiers.py    | 134 ------------------
 warehouse/admin/routes.py                     |   9 --
 .../child_classifier_controller.js            |  36 -----
 .../parent_classifier_controller.js           |  42 ------
 warehouse/admin/static/js/warehouse.js        |   8 --
 warehouse/admin/templates/admin/base.html     |   5 -
 .../templates/admin/classifiers/index.html    | 107 --------------
 warehouse/admin/views/classifiers.py          | 106 --------------
 9 files changed, 456 deletions(-)
 delete mode 100644 tests/unit/admin/views/test_classifiers.py
 delete mode 100644 warehouse/admin/static/js/controllers/child_classifier_controller.js
 delete mode 100644 warehouse/admin/static/js/controllers/parent_classifier_controller.js
 delete mode 100644 warehouse/admin/templates/admin/classifiers/index.html
 delete mode 100644 warehouse/admin/views/classifiers.py

diff --git a/tests/unit/admin/test_routes.py b/tests/unit/admin/test_routes.py
index 18ea9a3738e2..f3739ef18b8c 100644
--- a/tests/unit/admin/test_routes.py
+++ b/tests/unit/admin/test_routes.py
@@ -101,15 +101,6 @@ def test_includeme():
             domain=warehouse,
         ),
         pretend.call("admin.journals.list", "/admin/journals/", domain=warehouse),
-        pretend.call("admin.classifiers", "/admin/classifiers/", domain=warehouse),
-        pretend.call(
-            "admin.classifiers.add", "/admin/classifiers/add/", domain=warehouse
-        ),
-        pretend.call(
-            "admin.classifiers.deprecate",
-            "/admin/classifiers/deprecate/",
-            domain=warehouse,
-        ),
         pretend.call("admin.blacklist.list", "/admin/blacklist/", domain=warehouse),
         pretend.call("admin.blacklist.add", "/admin/blacklist/add/", domain=warehouse),
         pretend.call(
diff --git a/tests/unit/admin/views/test_classifiers.py b/tests/unit/admin/views/test_classifiers.py
deleted file mode 100644
index b3be0dad91ed..000000000000
--- a/tests/unit/admin/views/test_classifiers.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import pretend
-import pytest
-import sqlalchemy
-
-from warehouse.admin.views import classifiers as views
-from warehouse.classifiers.models import Classifier
-
-from ....common.db.classifiers import ClassifierFactory
-
-
-class TestGetClassifiers:
-    def test_get_classifiers(self, db_request):
-        classifier_a = ClassifierFactory(classifier="I am first")
-        classifier_b = ClassifierFactory(classifier="I am last")
-
-        assert views.get_classifiers(db_request) == {
-            "classifiers": [classifier_a, classifier_b]
-        }
-
-
-class TestAddClassifier:
-    @pytest.mark.parametrize(
-        "parent_levels, expected_levels",
-        [
-            ((2, 0, 0, 0), (2, None, 0, 0)),
-            ((2, 3, 0, 0), (2, 3, None, 0)),
-            ((2, 3, 4, 0), (2, 3, 4, None)),
-            # This won't actually happen but it's needed for coverage
-            ((2, 3, 4, 5), (2, 3, 4, 5)),
-        ],
-    )
-    def test_add_child_classifier(self, db_request, parent_levels, expected_levels):
-        l2, l3, l4, l5 = parent_levels
-        parent = ClassifierFactory(l2=l2, l3=l3, l4=l4, l5=l5, classifier="Parent")
-
-        db_request.params = {"parent_id": parent.id, "child": "Foobar"}
-        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
-        db_request.route_path = lambda *a: "/the/path"
-
-        views.AddClassifier(db_request).add_child_classifier()
-
-        new = (
-            db_request.db.query(Classifier)
-            .filter(Classifier.classifier == "Parent :: Foobar")
-            .one()
-        )
-
-        new_l2, new_l3, new_l4, new_l5 = expected_levels
-        assert new.l2 == new_l2 if new_l2 is not None else new.id
-        assert new.l3 == new_l3 if new_l3 is not None else new.id
-        assert new.l4 == new_l4 if new_l4 is not None else new.id
-        assert new.l5 == new_l5 if new_l5 is not None else new.id
-
-    def test_add_parent_classifier(self, db_request):
-        db_request.params = {"parent": "Foo :: Bar"}
-        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
-        db_request.route_path = lambda *a: "/the/path"
-
-        views.AddClassifier(db_request).add_parent_classifier()
-
-        new = (
-            db_request.db.query(Classifier)
-            .filter(Classifier.classifier == "Foo :: Bar")
-            .one()
-        )
-
-        assert new.l2 == new.id
-        assert new.l3 == 0
-        assert new.l4 == 0
-        assert new.l5 == 0
-
-    @pytest.mark.parametrize(
-        "parent_classifier, parent_levels, expected_levels",
-        [
-            ("private", (2, 0, 0, 0), (2, None, 0, 0)),
-            ("private", (2, 3, 0, 0), (2, 3, None, 0)),
-            ("private", (2, 3, 4, 0), (2, 3, 4, None)),
-            ("Private", (2, 0, 0, 0), (2, None, 0, 0)),
-            ("Private", (2, 3, 0, 0), (2, 3, None, 0)),
-            ("Private", (2, 3, 4, 0), (2, 3, 4, None)),
-            ("PrIvAtE", (2, 0, 0, 0), (2, None, 0, 0)),
-            ("PrIvAtE", (2, 3, 0, 0), (2, 3, None, 0)),
-            ("PrIvAtE", (2, 3, 4, 0), (2, 3, 4, None)),
-        ],
-    )
-    def test_add_private_child_classifier(
-        self, db_request, parent_classifier, parent_levels, expected_levels
-    ):
-        l2, l3, l4, l5 = parent_levels
-        parent = ClassifierFactory(
-            l2=l2, l3=l3, l4=l4, l5=l5, classifier=parent_classifier
-        )
-
-        db_request.params = {"parent_id": parent.id, "child": "Foobar"}
-        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
-        db_request.route_path = lambda *a: "/the/path"
-
-        with pytest.raises(sqlalchemy.exc.IntegrityError):
-            views.AddClassifier(db_request).add_child_classifier()
-
-    @pytest.mark.parametrize("parent_classifier", ["private", "Private", "PrIvAtE"])
-    def test_add_private_parent_classifier(self, db_request, parent_classifier):
-        db_request.params = {"parent": f"{parent_classifier} :: Do Not Upload"}
-        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
-        db_request.route_path = lambda *a: "/the/path"
-
-        with pytest.raises(sqlalchemy.exc.IntegrityError):
-            views.AddClassifier(db_request).add_parent_classifier()
-
-
-class TestDeprecateClassifier:
-    def test_deprecate_classifier(self, db_request):
-        classifier = ClassifierFactory(deprecated=False)
-
-        db_request.params = {"classifier_id": classifier.id}
-        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
-        db_request.route_path = lambda *a: "/the/path"
-
-        views.deprecate_classifier(db_request)
-        db_request.db.flush()
-
-        assert classifier.deprecated
diff --git a/warehouse/admin/routes.py b/warehouse/admin/routes.py
index 67e6ee495325..f9ed9d7fb1e3 100644
--- a/warehouse/admin/routes.py
+++ b/warehouse/admin/routes.py
@@ -99,15 +99,6 @@ def includeme(config):
     # Journal related Admin pages
     config.add_route("admin.journals.list", "/admin/journals/", domain=warehouse)
 
-    # Classifier related Admin pages
-    config.add_route("admin.classifiers", "/admin/classifiers/", domain=warehouse)
-    config.add_route(
-        "admin.classifiers.add", "/admin/classifiers/add/", domain=warehouse
-    )
-    config.add_route(
-        "admin.classifiers.deprecate", "/admin/classifiers/deprecate/", domain=warehouse
-    )
-
     # Blacklist related Admin pages
     config.add_route("admin.blacklist.list", "/admin/blacklist/", domain=warehouse)
     config.add_route("admin.blacklist.add", "/admin/blacklist/add/", domain=warehouse)
diff --git a/warehouse/admin/static/js/controllers/child_classifier_controller.js b/warehouse/admin/static/js/controllers/child_classifier_controller.js
deleted file mode 100644
index 7cc8a07f881b..000000000000
--- a/warehouse/admin/static/js/controllers/child_classifier_controller.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import { Controller } from "stimulus";
-
-export default class extends Controller {
-  static targets = [
-    "parent", "input", "preview", "submit",
-  ]
-
-  update() {
-    // Set the preview
-    this.previewTarget.innerHTML = [
-      this.parentTarget.options[this.parentTarget.selectedIndex].text,
-      this.inputTarget.value,
-    ].join(" :: ");
-
-    // Enable the input target
-    this.inputTarget.disabled = !this.parentTarget.value;
-
-    // Enable the submit button
-    this.submitTarget.disabled = !(this.parentTarget.value && this.inputTarget.value);
-  }
-}
diff --git a/warehouse/admin/static/js/controllers/parent_classifier_controller.js b/warehouse/admin/static/js/controllers/parent_classifier_controller.js
deleted file mode 100644
index dfd3cad456bd..000000000000
--- a/warehouse/admin/static/js/controllers/parent_classifier_controller.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import { Controller } from "stimulus";
-
-export default class extends Controller {
-  static targets = ["input", "preview", "submit"]
-
-  update() {
-    // Set the preview
-    this.previewTarget.innerHTML = this.inputTarget.value;
-
-    // Classifier is made up of words which can contain a-z, A-Z, 0-9,
-    // underscore, hyphen, period, octothorp, plus, or parentheses
-    var word_sub = "[\\w.\\(\\)\\+#-]";
-
-    // Words can be repeated one or more times, separated by a space
-    var words_sub = `${word_sub}+(\\s${word_sub}*)*`;
-
-    // Classifer must have two parts, separated by a ' :: '
-    var classifier_re = new RegExp(`^${words_sub} :: ${words_sub}$`);
-
-    if (classifier_re.test(this.inputTarget.value)) {
-      // Enable the submit button
-      this.submitTarget.disabled = false;
-    } else {
-      this.submitTarget.disabled = true;
-    }
-  }
-}
diff --git a/warehouse/admin/static/js/warehouse.js b/warehouse/admin/static/js/warehouse.js
index acd0c11943e3..1374a3e98450 100644
--- a/warehouse/admin/static/js/warehouse.js
+++ b/warehouse/admin/static/js/warehouse.js
@@ -11,10 +11,6 @@
  * limitations under the License.
  */
 
-// Import stimulus
-import { Application } from "stimulus";
-import { definitionsFromContext } from "stimulus/webpack-helpers";
-
 document.querySelectorAll("a[data-form-submit]").forEach(function (element) {
   element.addEventListener("click", function(event) {
     // We're turning this element into a form submission, so instead of the
@@ -25,7 +21,3 @@ document.querySelectorAll("a[data-form-submit]").forEach(function (element) {
     document.querySelector("form#" + element.dataset.formSubmit).submit();
   });
 });
-
-const application = Application.start();
-const context = require.context("./controllers", true, /\.js$/);
-application.load(definitionsFromContext(context));
diff --git a/warehouse/admin/templates/admin/base.html b/warehouse/admin/templates/admin/base.html
index 18be097d6576..3049334de164 100644
--- a/warehouse/admin/templates/admin/base.html
+++ b/warehouse/admin/templates/admin/base.html
@@ -100,11 +100,6 @@
             <i class="fa fa-book"></i> <span>Journals</span>
           </a>
         </li>
-        <li>
-          <a href="{{ request.route_path('admin.classifiers') }}">
-            <i class="fa fa-tags"></i> <span>Classifiers</span>
-          </a>
-        </li>
         <li>
           <a href="{{ request.route_path('admin.blacklist.list') }}">
             <i class="fa fa-ban"></i> <span>Blacklist</span>
diff --git a/warehouse/admin/templates/admin/classifiers/index.html b/warehouse/admin/templates/admin/classifiers/index.html
deleted file mode 100644
index 08b30e100357..000000000000
--- a/warehouse/admin/templates/admin/classifiers/index.html
+++ /dev/null
@@ -1,107 +0,0 @@
-{#
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
--#}
-{% extends "admin/base.html" %}
-
-{% import "admin/utils/pagination.html" as pagination %}
-
-{% block title %}Classifiers{% endblock %}
-
-{% block breadcrumb %}
-  <li class="active">Classifiers</li>
-{% endblock %}
-
-{% block content %}
-<div class="box box-primary" data-controller="parent-classifier">
-  <div class="box-header with-border">
-    <h3 class="box-title">Add New Top-Level Classifier</h3>
-  </div>
-  <form method="POST" action="{{ request.route_path('admin.classifiers.add') }}">
-    <input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">
-    <div class="box-body">
-      <div class="form-group col-sm-4">
-        <label for="parent">Classifier:</label>
-        <input name="parent" id="parent" data-action="input->parent-classifier#update" data-target="parent-classifier.input" class="form-control" autocomplete="off" autocorrect="off" autocapitalize="off">
-      </div>
-    </div>
-    <div class="box-footer">
-      Add new classifier
-      <code data-target="parent-classifier.preview"></code>?
-      <div class="pull-right">
-        <button type="submit" class="btn btn-primary" data-target="parent-classifier.submit" disabled>Add</button>
-      </div>
-    </div>
-  </form>
-</div>
-
-<div class="box box-primary" data-controller="child-classifier">
-  <div class="box-header with-border">
-    <h3 class="box-title">Add Sub-Classifier</h3>
-  </div>
-  <form method="POST" action="{{ request.route_path('admin.classifiers.add') }}">
-    <input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">
-    <div class="box-body">
-      <div class="form-group col-sm-4">
-        <label for="parent_id">Parent:</label>
-        <select name="parent_id" id="parent_id" data-target="child-classifier.parent" data-action="child-classifier#update">
-          <option disabled selected>Select one</option>
-          {% for classifier in classifiers %}
-          {% if classifier.l5 == 0 %}
-          {# Only show classifiers that can be parent classifiers #}
-          <option value="{{ classifier.id }}" {{'disabled' if classifier.deprecated else ''}}>
-            {{ classifier.classifier }}{{ ' (Deprecated)' if classifier.deprecated else ''}}
-          </option>
-          {% endif %}
-          {% endfor %}
-        </select>
-        <label for="child">Child:</label>
-        <input name="child" data-action="input->child-classifier#update" data-target="child-classifier.input" class="form-control" autocomplete="off" autocorrect="off" autocapitalize="off" disabled>
-      </div>
-    </div>
-    <div class="box-footer">
-      Add new classifier
-      <code data-target="child-classifier.preview"></code>?
-      <div class="pull-right">
-        <button type="submit" class="btn btn-primary" data-target="child-classifier.submit" disabled>Add</button>
-      </div>
-    </div>
-  </form>
-</div>
-
-<div class="box box-primary">
-  <div class="box-header with-border">
-    <h3 class="box-title">Deprecate Classifier</h3>
-  </div>
-  <form method="POST" action="{{ request.route_path('admin.classifiers.deprecate') }}">
-    <input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">
-    <div class="box-body">
-      <div class="form-group col-sm-4">
-        <label for="classifier_id">Classifier:</label>
-        <select name="classifier_id" id="classifier_id">
-          <option disabled selected>Select one</option>
-          {% for classifier in classifiers %}
-          <option value="{{ classifier.id }}" {{'disabled' if classifier.deprecated else ''}}>
-            {{ classifier.classifier }}{{ ' (Deprecated)' if classifier.deprecated else ''}}
-          </option>
-          {% endfor %}
-        </select>
-      </div>
-    </div>
-    <div class="box-footer">
-      <div class="pull-right">
-        <button type="submit" class="btn btn-primary">Deprecate</button>
-      </div>
-    </div>
-  </form>
-</div>
-{% endblock content %}
diff --git a/warehouse/admin/views/classifiers.py b/warehouse/admin/views/classifiers.py
deleted file mode 100644
index dc16910b0fad..000000000000
--- a/warehouse/admin/views/classifiers.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from pyramid.httpexceptions import HTTPSeeOther
-from pyramid.view import view_config, view_defaults
-
-from warehouse.packaging.models import Classifier
-
-
-@view_config(
-    route_name="admin.classifiers",
-    renderer="admin/classifiers/index.html",
-    permission="moderator",
-    request_method="GET",
-    uses_session=True,
-)
-def get_classifiers(request):
-    classifiers = request.db.query(Classifier).order_by(Classifier.classifier).all()
-
-    return {"classifiers": classifiers}
-
-
-@view_defaults(
-    route_name="admin.classifiers.add",
-    permission="moderator",
-    request_method="POST",
-    uses_session=True,
-    require_methods=False,
-    require_csrf=True,
-)
-class AddClassifier:
-    def __init__(self, request):
-        self.request = request
-
-    @view_config(request_param=["parent"])
-    def add_parent_classifier(self):
-        classifier = Classifier(
-            classifier=self.request.params.get("parent"), l3=0, l4=0, l5=0
-        )
-
-        self.request.db.add(classifier)
-        self.request.db.flush()  # To get the ID
-
-        classifier.l2 = classifier.id
-
-        self.request.session.flash(
-            f"Added classifier {classifier.classifier!r}", queue="success"
-        )
-
-        return HTTPSeeOther(self.request.route_path("admin.classifiers"))
-
-    @view_config(request_param=["parent_id", "child"])
-    def add_child_classifier(self):
-        parent = self.request.db.query(Classifier).get(
-            self.request.params.get("parent_id")
-        )
-
-        classifier = Classifier(
-            l2=parent.l2,
-            l3=parent.l3,
-            l4=parent.l4,
-            l5=parent.l5,
-            classifier=(parent.classifier + " :: " + self.request.params.get("child")),
-        )
-        self.request.db.add(classifier)
-        self.request.db.flush()  # To get the ID
-
-        for level in ["l3", "l4", "l5"]:
-            if getattr(classifier, level) == 0:
-                setattr(classifier, level, classifier.id)
-                break
-
-        self.request.session.flash(
-            f"Added classifier {classifier.classifier!r}", queue="success"
-        )
-
-        return HTTPSeeOther(self.request.route_path("admin.classifiers"))
-
-
-@view_config(
-    route_name="admin.classifiers.deprecate",
-    permission="moderator",
-    request_method="POST",
-    uses_session=True,
-    require_methods=False,
-    require_csrf=True,
-)
-def deprecate_classifier(request):
-    classifier = request.db.query(Classifier).get(request.params.get("classifier_id"))
-
-    classifier.deprecated = True
-
-    request.session.flash(
-        f"Deprecated classifier {classifier.classifier!r}", queue="success"
-    )
-
-    return HTTPSeeOther(request.route_path("admin.classifiers"))

From 186a7fc4f105075c9fc4ec5ef55b21d028c767d1 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 23 Mar 2020 18:33:57 -0500
Subject: [PATCH 10/14] Update translations

---
 warehouse/locale/messages.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot
index 6550778ef937..66c1209398f2 100644
--- a/warehouse/locale/messages.pot
+++ b/warehouse/locale/messages.pot
@@ -1,4 +1,4 @@
-#: warehouse/views.py:255
+#: warehouse/views.py:254
 msgid "Locale updated"
 msgstr ""
 

From 6c98aaa8699c313c44f168e24b490495912124f6 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Tue, 24 Mar 2020 12:18:35 -0500
Subject: [PATCH 11/14] Test that all trove_classifiers can be created

---
 tests/unit/forklift/test_legacy.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/unit/forklift/test_legacy.py b/tests/unit/forklift/test_legacy.py
index 55ecdd451bab..a18fd5379c85 100644
--- a/tests/unit/forklift/test_legacy.py
+++ b/tests/unit/forklift/test_legacy.py
@@ -27,6 +27,7 @@
 
 from pyramid.httpexceptions import HTTPBadRequest, HTTPForbidden
 from sqlalchemy.orm import joinedload
+from trove_classifiers import classifiers
 from webob.multidict import MultiDict
 from wtforms.form import Form
 from wtforms.validators import ValidationError
@@ -2890,6 +2891,11 @@ def test_upload_succeeds_creates_classifier(
         )
         assert release.classifiers == ["AA :: BB", "CC :: DD"]
 
+    def test_all_valid_classifiers_can_be_created(self, db_request):
+        for classifier in classifiers:
+            db_request.db.add(Classifier(classifier=classifier))
+        db_request.db.commit()
+
     def test_equivalent_version_one_release(self, pyramid_config, db_request, metrics):
         """
         Test that if a release with a version like '1.0' exists, that a future

From f4ff386926422b7e9deef6615a30ad4f342d8472 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Tue, 24 Mar 2020 12:19:57 -0500
Subject: [PATCH 12/14] Test that private classifiers can't be created

---
 tests/unit/forklift/test_legacy.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/unit/forklift/test_legacy.py b/tests/unit/forklift/test_legacy.py
index a18fd5379c85..abe3dfa0d370 100644
--- a/tests/unit/forklift/test_legacy.py
+++ b/tests/unit/forklift/test_legacy.py
@@ -26,6 +26,7 @@
 import requests
 
 from pyramid.httpexceptions import HTTPBadRequest, HTTPForbidden
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import joinedload
 from trove_classifiers import classifiers
 from webob.multidict import MultiDict
@@ -2896,6 +2897,14 @@ def test_all_valid_classifiers_can_be_created(self, db_request):
             db_request.db.add(Classifier(classifier=classifier))
         db_request.db.commit()
 
+    @pytest.mark.parametrize(
+        "parent_classifier", ["private", "Private", "PrIvAtE"],
+    )
+    def test_private_classifiers_cannot_be_created(self, db_request, parent_classifier):
+        with pytest.raises(IntegrityError):
+            db_request.db.add(Classifier(classifier=f"{parent_classifier} :: Foo"))
+            db_request.db.commit()
+
     def test_equivalent_version_one_release(self, pyramid_config, db_request, metrics):
         """
         Test that if a release with a version like '1.0' exists, that a future

From 0bc3197dc84257dfc553afe41b90a741fcc1f49b Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Thu, 2 Apr 2020 21:07:20 -0500
Subject: [PATCH 13/14] Update w/ CalVer release

---
 requirements/main.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/main.txt b/requirements/main.txt
index 4497017698b9..66fbe01c5ea2 100644
--- a/requirements/main.txt
+++ b/requirements/main.txt
@@ -569,9 +569,9 @@ transaction==3.0.0 \
 translationstring==1.3 \
     --hash=sha256:4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d \
     --hash=sha256:e26c7bf383413234ed442e0980a2ebe192b95e3745288a8fd2805156d27515b4
-trove-classifiers==1.0.0 \
-    --hash=sha256:22a935078ca8e81ad19cfdb16c70ed6a0138799ff19ff889ed8f93f62d507716 \
-    --hash=sha256:930e50d6eb0766a56780d3c991e4b4ace95f47b060c68c9b78dea034f84ffc4d
+trove-classifiers==2020.4.1 \
+    --hash=sha256:9e1dcd47920817eaeb4cc67004b3fee430f3fc692e926f6ab1e337035b7a590d \
+    --hash=sha256:d8adb5d687ee15fe83c4c23404a8fbc0ff267ca997c6870419cc625fdea449e0
 typeguard==2.7.1 \
     --hash=sha256:1d3710251d3d3d6c64e0c49f45edec2e88ddc386a51e89c3ec0703efeb8b3b81 \
     --hash=sha256:2d545c71e9439c21bcd7c28f5f55b3606e6106f7031ab58375656a1aed483ef2

From 672ad9ab5de0288c07ccf077f6c3845f397d6b48 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Thu, 2 Apr 2020 21:10:12 -0500
Subject: [PATCH 14/14] Updates from #7689

---
 .../versions/d15f020ee3df_simplify_classifier_model.py        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py b/warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py
index 77b63ea6b3e4..58051f21e3c3 100644
--- a/warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py
+++ b/warehouse/migrations/versions/d15f020ee3df_simplify_classifier_model.py
@@ -13,7 +13,7 @@
 Simplify classifier model
 
 Revision ID: d15f020ee3df
-Revises: 5c029d9ef925
+Revises: 6af76ffb9612
 Create Date: 2020-02-03 03:28:22.838779
 """
 
@@ -22,7 +22,7 @@
 from alembic import op
 
 revision = "d15f020ee3df"
-down_revision = "5c029d9ef925"
+down_revision = "6af76ffb9612"
 
 
 def upgrade():