Skip to content

Commit 44d8dda

Browse files
didi
authored
Revert verified urls (#15874)
* Revert "Don't output 'None' (#15870)" This reverts commit b70282f. * Revert "Verified hotfixes (#15869)" This reverts commit fe32ed6. * Revert "Verified project links for project details. (#15862)" This reverts commit 36795f2.
1 parent b70282f commit 44d8dda

File tree

4 files changed

+29
-99
lines changed

4 files changed

+29
-99
lines changed

‎tests/unit/packaging/test_models.py

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -758,38 +758,6 @@ def test_trusted_published_all(self, db_session):
758758

759759
assert release.trusted_published
760760

761-
@pytest.mark.parametrize(
762-
"url, publisher_url, expected",
763-
[
764-
("xpto.com", "https://pub/url/", False), # Totally different
765-
("https://pub/", "https://pub/url/", False), # Missing parts
766-
("https://pub/url/", "https://pub/url/", True), # Exactly the same
767-
("https://pub/url/blah.md", "https://pub/url/", True), # Additonal parts
768-
("https://pub/url", "https://pub/url/", True), # Missing trailing slash
769-
("https://pub/url/", "https://pub/url", True), # Extratrailing slash
770-
],
771-
)
772-
def test_is_url_verified(self, db_session, url, publisher_url, expected):
773-
project = DBProjectFactory.create()
774-
release = DBReleaseFactory.create(project=project)
775-
release_file = DBFileFactory.create(
776-
release=release,
777-
filename=f"{release.project.name}-{release.version}.tar.gz",
778-
python_version="source",
779-
)
780-
DBFileEventFactory.create(
781-
source=release_file,
782-
tag="fake:event",
783-
additional={"publisher_url": publisher_url},
784-
)
785-
DBFileEventFactory.create(
786-
source=release_file,
787-
tag="fake:event",
788-
additional={"publisher_url": publisher_url},
789-
)
790-
791-
assert project.is_verified_url(url) is expected
792-
793761
def test_trusted_published_mixed(self, db_session):
794762
release = DBReleaseFactory.create()
795763
rfile_1 = DBFileFactory.create(

‎warehouse/locale/messages.pot

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ msgstr ""
776776
#: warehouse/templates/includes/accounts/profile-actions.html:30
777777
#: warehouse/templates/includes/accounts/profile-callout.html:18
778778
#: warehouse/templates/includes/hash-modal.html:23
779-
#: warehouse/templates/includes/packaging/project-data.html:125
779+
#: warehouse/templates/includes/packaging/project-data.html:106
780780
#: warehouse/templates/index.html:100 warehouse/templates/index.html:104
781781
#: warehouse/templates/manage/account.html:228
782782
#: warehouse/templates/manage/account.html:234
@@ -3077,48 +3077,47 @@ msgstr ""
30773077
msgid "Members"
30783078
msgstr ""
30793079

3080-
#: warehouse/templates/includes/packaging/project-data.html:27
3080+
#: warehouse/templates/includes/packaging/project-data.html:16
30813081
msgid "Verified details"
30823082
msgstr ""
30833083

3084-
#: warehouse/templates/includes/packaging/project-data.html:30
3085-
#: warehouse/templates/includes/packaging/project-data.html:73
3086-
msgid "Project links"
3087-
msgstr ""
3088-
3089-
#: warehouse/templates/includes/packaging/project-data.html:52
3084+
#: warehouse/templates/includes/packaging/project-data.html:31
30903085
msgid "Maintainers"
30913086
msgstr ""
30923087

3093-
#: warehouse/templates/includes/packaging/project-data.html:54
3088+
#: warehouse/templates/includes/packaging/project-data.html:33
30943089
msgid "Avatar for {username} from gravatar.com"
30953090
msgstr ""
30963091

3097-
#: warehouse/templates/includes/packaging/project-data.html:70
3092+
#: warehouse/templates/includes/packaging/project-data.html:49
30983093
msgid "Unverified details"
30993094
msgstr ""
31003095

3101-
#: warehouse/templates/includes/packaging/project-data.html:85
3096+
#: warehouse/templates/includes/packaging/project-data.html:52
3097+
msgid "Project links"
3098+
msgstr ""
3099+
3100+
#: warehouse/templates/includes/packaging/project-data.html:66
31023101
msgid "GitHub Statistics"
31033102
msgstr ""
31043103

3105-
#: warehouse/templates/includes/packaging/project-data.html:93
3104+
#: warehouse/templates/includes/packaging/project-data.html:74
31063105
msgid "Stars:"
31073106
msgstr ""
31083107

3109-
#: warehouse/templates/includes/packaging/project-data.html:101
3108+
#: warehouse/templates/includes/packaging/project-data.html:82
31103109
msgid "Forks:"
31113110
msgstr ""
31123111

3113-
#: warehouse/templates/includes/packaging/project-data.html:109
3112+
#: warehouse/templates/includes/packaging/project-data.html:90
31143113
msgid "Open issues:"
31153114
msgstr ""
31163115

3117-
#: warehouse/templates/includes/packaging/project-data.html:117
3116+
#: warehouse/templates/includes/packaging/project-data.html:98
31183117
msgid "Open PRs:"
31193118
msgstr ""
31203119

3121-
#: warehouse/templates/includes/packaging/project-data.html:125
3120+
#: warehouse/templates/includes/packaging/project-data.html:106
31223121
#, python-format
31233122
msgid ""
31243123
"View statistics for this project via <a href=\"%(libs_io_href)s\" "
@@ -3127,38 +3126,38 @@ msgid ""
31273126
"rel=\"noopener\">our public dataset on Google BigQuery</a>"
31283127
msgstr ""
31293128

3130-
#: warehouse/templates/includes/packaging/project-data.html:132
3129+
#: warehouse/templates/includes/packaging/project-data.html:113
31313130
msgid "Meta"
31323131
msgstr ""
31333132

3134-
#: warehouse/templates/includes/packaging/project-data.html:134
3133+
#: warehouse/templates/includes/packaging/project-data.html:115
31353134
msgid "License:"
31363135
msgstr ""
31373136

3138-
#: warehouse/templates/includes/packaging/project-data.html:137
3139-
#: warehouse/templates/includes/packaging/project-data.html:139
3137+
#: warehouse/templates/includes/packaging/project-data.html:118
3138+
#: warehouse/templates/includes/packaging/project-data.html:120
31403139
msgid "Author:"
31413140
msgstr ""
31423141

3143-
#: warehouse/templates/includes/packaging/project-data.html:142
3144-
#: warehouse/templates/includes/packaging/project-data.html:144
3142+
#: warehouse/templates/includes/packaging/project-data.html:123
3143+
#: warehouse/templates/includes/packaging/project-data.html:125
31453144
#: warehouse/templates/pages/help.html:610
31463145
msgid "Maintainer:"
31473146
msgstr ""
31483147

3149-
#: warehouse/templates/includes/packaging/project-data.html:149
3148+
#: warehouse/templates/includes/packaging/project-data.html:130
31503149
msgid "Tags"
31513150
msgstr ""
31523151

3153-
#: warehouse/templates/includes/packaging/project-data.html:159
3152+
#: warehouse/templates/includes/packaging/project-data.html:140
31543153
msgid "Requires:"
31553154
msgstr ""
31563155

3157-
#: warehouse/templates/includes/packaging/project-data.html:164
3156+
#: warehouse/templates/includes/packaging/project-data.html:145
31583157
msgid "Provides-Extra:"
31593158
msgstr ""
31603159

3161-
#: warehouse/templates/includes/packaging/project-data.html:172
3160+
#: warehouse/templates/includes/packaging/project-data.html:153
31623161
#: warehouse/templates/pages/classifiers.html:16
31633162
#: warehouse/templates/pages/classifiers.html:21
31643163
#: warehouse/templates/pages/sitemap.html:39

‎warehouse/packaging/models.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
Text,
3434
UniqueConstraint,
3535
func,
36-
literal,
3736
or_,
3837
orm,
3938
sql,
@@ -400,23 +399,6 @@ def latest_version(self):
400399
.first()
401400
)
402401

403-
def is_verified_url(self, url):
404-
url = url.rstrip("/") + "/" # Ensure a single trailing slash
405-
return (
406-
orm.object_session(self)
407-
.query(File.Event)
408-
.join(File)
409-
.join(Release)
410-
.join(Project)
411-
.filter(Project.id == self.id)
412-
.filter(
413-
literal(url).ilike(
414-
File.Event.additional.op("->>")("publisher_url") + "%"
415-
)
416-
)
417-
.first()
418-
) is not None
419-
420402

421403
class DependencyKind(enum.IntEnum):
422404
requires = 1

‎warehouse/templates/includes/packaging/project-data.html

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,9 @@
1212
# limitations under the License.
1313
-#}
1414

15-
{% set verified_urls, unverified_urls = [],[] %}
16-
{% for name, url in release.urls.items() %}
17-
{% if is_valid_uri(url) %}
18-
{% if name in ["Source", "Homepage", "Issues"] and project.is_verified_url(url) %}
19-
{{ verified_urls.append((name, url)) or "" }}
20-
{% else %}
21-
{{ unverified_urls.append((name, url)) or "" }}
22-
{% endif %}
23-
{% endif %}
24-
{% endfor %}
25-
2615
<div class="sidebar-section verified">
2716
<h3 class="sidebar-section__title">{% trans %}Verified details{% endtrans %}</h3>
2817
<small><i>These details have been verified by PyPI</i></small>
29-
{% if verified_urls %}
30-
<h6>{% trans %}Project links{% endtrans %}</h6>
31-
{% for name, url in verified_urls %}
32-
<li>
33-
<a class="vertical-tabs__tab vertical-tabs__tab--with-icon vertical-tabs__tab--condensed" href="{{ url }}" rel="nofollow">
34-
{{ url_icon(name, url) }}{{ name }} <i class="fa fa-circle-check check"></i>
35-
</a>
36-
</li>
37-
{% endfor %}
38-
{% endif %}
3918
{% if project.organization %}
4019
<h6>Owner</h6>
4120
<span class="sidebar-section__maintainer">
@@ -69,15 +48,17 @@ <h6>{% trans %}Maintainers{% endtrans %}</h6>
6948
<div class="sidebar-section verified">
7049
<h3 class="sidebar-section__title">{% trans %}Unverified details{% endtrans %}</h3>
7150
<small><i>These details have <b>not</b> been verified by PyPI</i></small>
72-
{% if unverified_urls %}
51+
{% if release.urls.values() | contains_valid_uris %}
7352
<h6>{% trans %}Project links{% endtrans %}</h6>
7453
<ul class="vertical-tabs__list">
75-
{% for name, url in unverified_urls %}
54+
{% for name, url in release.urls.items() %}
55+
{% if is_valid_uri(url) %}
7656
<li>
7757
<a class="vertical-tabs__tab vertical-tabs__tab--with-icon vertical-tabs__tab--condensed" href="{{ url }}" rel="nofollow">
7858
{{ url_icon(name, url) }}{{ name }}
7959
</a>
8060
</li>
61+
{% endif %}
8162
{% endfor %}
8263
</ul>
8364
{% endif %}

0 commit comments

Comments
 (0)