Skip to content

Commit 43e97ef

Browse files
committed
remove _project_docs empty release option
1 parent 7395302 commit 43e97ef

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

tests/unit/search/test_tasks.py

+14-12
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@ def test_project_docs(db_session):
4747

4848
for p in projects:
4949
for r in releases[p]:
50-
f = FileFactory.create(
51-
release=r,
52-
filename="{}-{}.tar.gz".format(p.name, r.version),
53-
python_version="source",
54-
)
55-
r.files.append(f)
50+
r.files = [
51+
FileFactory.create(
52+
release=r,
53+
filename="{}-{}.tar.gz".format(p.name, r.version),
54+
python_version="source",
55+
)
56+
]
5657

5758
assert list(_project_docs(db_session)) == [
5859
{
@@ -86,12 +87,13 @@ def test_single_project_doc(db_session):
8687

8788
for p in projects:
8889
for r in releases[p]:
89-
f = FileFactory.create(
90-
release=r,
91-
filename="{}-{}.tar.gz".format(p.name, r.version),
92-
python_version="source",
93-
)
94-
r.files.append(f)
90+
r.files = [
91+
FileFactory.create(
92+
release=r,
93+
filename="{}-{}.tar.gz".format(p.name, r.version),
94+
python_version="source",
95+
)
96+
]
9597

9698
assert list(_project_docs(db_session, project_name=projects[1].name)) == [
9799
{

warehouse/accounts/services.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import hashlib
1616
import hmac
1717
import logging
18-
import posixpath
1918
import secrets
2019
import urllib.parse
2120
import uuid
2221

22+
import posixpath
2323
import requests
2424

2525
from passlib.context import CryptContext

warehouse/search/tasks.py

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737
from warehouse.utils.db import windowed_query
3838

3939

40-
def _project_docs(db, project_name=None, show_empty_releases=False):
41-
42-
queries = [Release.yanked.is_(False)]
43-
if not show_empty_releases:
44-
queries.append(Release.files)
40+
def _project_docs(db, project_name=None):
4541

4642
releases_list = (
4743
db.query(Release.id)
48-
.filter(*queries)
44+
.filter(Release.yanked.is_(False), Release.files)
4945
.order_by(
5046
Release.project_id,
5147
Release.is_prerelease.nullslast(),

0 commit comments

Comments
 (0)