External classifiers (#7582)

* Add dependency on trove-classifiers=1.0.0 * Remove a random comment * Update list classifiers HTML view * Update list classifiers API action * Update search filter for deprecated classifiers * New validators for classifiers and deprecated classifiers * Create new classifiers on upload * Clean up Classifier model * Remove classifier pages from admin UI * Update translations * Test that all trove_classifiers can be created * Test that private classifiers can't be created * Update w/ CalVer release * Updates from #7689 Co-authored-by: Ernest W. Durbin III <[email protected]>
pypi · Apr 3, 2020 · 8db5ef0 · 8db5ef0
1 parent 58d6829
commit 8db5ef0
Show file tree

Hide file tree

Showing 22 changed files with 280 additions and 565 deletions.
diff --git 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
@@ -569,6 +569,9 @@ transaction==3.0.0 \
 translationstring==1.3 \
     --hash=sha256:4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d \
     --hash=sha256:e26c7bf383413234ed442e0980a2ebe192b95e3745288a8fd2805156d27515b4
+trove-classifiers==2020.4.1 \
+    --hash=sha256:9e1dcd47920817eaeb4cc67004b3fee430f3fc692e926f6ab1e337035b7a590d \
+    --hash=sha256:d8adb5d687ee15fe83c4c23404a8fbc0ff267ca997c6870419cc625fdea449e0
 typeguard==2.7.1 \
     --hash=sha256:1d3710251d3d3d6c64e0c49f45edec2e88ddc386a51e89c3ec0703efeb8b3b81 \
     --hash=sha256:2d545c71e9439c21bcd7c28f5f55b3606e6106f7031ab58375656a1aed483ef2

diff --git 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/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