Skip to content

Exclude projects with no downloadable distributions on search #8111

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.

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

Merged
merged 5 commits into from
Jun 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 62 additions & 1 deletion tests/unit/search/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
unindex_project,
)

from ...common.db.packaging import ProjectFactory, ReleaseFactory
from ...common.db.packaging import FileFactory, ProjectFactory, ReleaseFactory


def test_project_docs(db_session):
Expand All @@ -45,6 +45,16 @@ def test_project_docs(db_session):
for p in projects
}

for p in projects:
for r in releases[p]:
r.files = [
FileFactory.create(
release=r,
filename="{}-{}.tar.gz".format(p.name, r.version),
python_version="source",
)
]

assert list(_project_docs(db_session)) == [
{
"_id": p.normalized_name,
Expand Down Expand Up @@ -75,6 +85,16 @@ def test_single_project_doc(db_session):
for p in projects
}

for p in projects:
for r in releases[p]:
r.files = [
FileFactory.create(
release=r,
filename="{}-{}.tar.gz".format(p.name, r.version),
python_version="source",
)
]

assert list(_project_docs(db_session, project_name=projects[1].name)) == [
{
"_id": p.normalized_name,
Expand All @@ -95,6 +115,47 @@ def test_single_project_doc(db_session):
]


def test_project_docs_empty(db_session):
projects = [ProjectFactory.create() for _ in range(2)]
releases = {
p: sorted(
[ReleaseFactory.create(project=p) for _ in range(3)],
key=lambda r: packaging.version.parse(r.version),
reverse=True,
)
for p in projects
}

project_with_files = projects[0]
for r in releases[project_with_files]:
r.files = [
FileFactory.create(
release=r,
filename="{}-{}.tar.gz".format(project_with_files.name, r.version),
python_version="source",
)
]

assert list(_project_docs(db_session)) == [
{
"_id": p.normalized_name,
"_type": "doc",
"_source": {
"created": p.created,
"name": p.name,
"normalized_name": p.normalized_name,
"version": [r.version for r in prs],
"latest_version": first(prs, key=lambda r: not r.is_prerelease).version,
"description": first(
prs, key=lambda r: not r.is_prerelease
).description.raw,
},
}
for p, prs in sorted(releases.items(), key=lambda x: x[0].id)
if p == project_with_files
]


class FakeESIndices:
def __init__(self):
self.indices = {}
Expand Down
2 changes: 1 addition & 1 deletion warehouse/search/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def _project_docs(db, project_name=None):

releases_list = (
db.query(Release.id)
.filter(Release.yanked.is_(False))
.filter(Release.yanked.is_(False), Release.files)
.order_by(
Release.project_id,
Release.is_prerelease.nullslast(),
Expand Down