Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

External classifiers #7582

Merged
merged 15 commits into from
Apr 3, 2020
Merged

External classifiers #7582

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
db0b347
Add dependency on trove-classifiers=1.0.0
di Mar 23, 2020
b980db9
Remove a random comment
di Mar 23, 2020
48dd4bd
Update list classifiers HTML view
di Mar 23, 2020
35d32aa
Update list classifiers API action
di Mar 23, 2020
99fb89a
Update search filter for deprecated classifiers
di Mar 23, 2020
f2849e4
New validators for classifiers and deprecated classifiers
di Mar 23, 2020
b1ee0ff
Create new classifiers on upload
di Mar 23, 2020
a52c5df
Clean up Classifier model
di Mar 23, 2020
f6772af
Remove classifier pages from admin UI
di Mar 23, 2020
186a7fc
Update translations
di Mar 23, 2020
6c98aaa
Test that all trove_classifiers can be created
di Mar 24, 2020
f4ff386
Test that private classifiers can't be created
di Mar 24, 2020
0bc3197
Update w/ CalVer release
di Apr 3, 2020
672ad9a
Updates from #7689
di Apr 3, 2020
c8d5bb2
Merge branch 'master' into external-classifiers
ewdurbin Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions requirements/main.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ sqlalchemy-citext
stdlib-list
structlog
transaction
trove-classifiers
typeguard
webauthn
whitenoise
Expand Down
3 changes: 3 additions & 0 deletions requirements/main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions tests/common/db/classifiers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
9 changes: 0 additions & 9 deletions tests/unit/admin/test_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
134 changes: 0 additions & 134 deletions tests/unit/admin/views/test_classifiers.py
View file
Open in desktop

This file was deleted.

Loading