devpi-web 4.2.3__tar.gz → 4.3.0__tar.gz

{devpi-web-4.2.3 → devpi-web-4.3.0}/CHANGELOG

@@ -2,6 +2,16 @@
 
 .. towncrier release notes start
 
+4.3.0 (2024-10-16)
+==================
+
+Features
+--------
+
+- index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
+
+
+
 4.2.3 (2024-09-19)
 ==================
 

{devpi-web-4.2.3 → devpi-web-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-web
-Version: 4.2.3
+Version: 4.3.0
 Summary: devpi-web: a web view for devpi-server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -77,6 +77,16 @@ Changelog
 
 .. towncrier release notes start
 
+4.3.0 (2024-10-16)
+==================
+
+Features
+--------
+
+- index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
+
+
+
 4.2.3 (2024-09-19)
 ==================
 
@@ -144,13 +154,3 @@ Bug Fixes
 
 - toxresults.pt, version.pt: Fix anchor generation for toxresults URLs.
 
-
-4.1.1 (2022-09-28)
-==================
-
-
-Bug Fixes
----------
-
-- Generalize GET redirect from URLs with trailing slash to ones without for consistency.
-

devpi-web-4.3.0/devpi_web/__init__.py

@@ -0,0 +1 @@
+__version__ = '4.3.0'

{devpi-web-4.2.3 → devpi-web-4.3.0}/devpi_web/templates/index.pt

@@ -40,7 +40,10 @@
                         </tal:file>
                     </tal:files>
                 </td>
-                <td><a tal:condition="package.docs" href="${package.docs.url}">${package.docs.title}</a></td>
+                <td>
+                    <a tal:condition="package.docs" href="${package.docs.url}">${package.docs.title}</a>
+                    <span tal:condition="package.docs">(<a href="${package.docs.zip_url}">Download</a>)</span>
+                </td>
             </tr>
             </tbody>
         </table>

{devpi-web-4.2.3 → devpi-web-4.3.0}/devpi_web/templates/project.pt

@@ -35,7 +35,10 @@
                 <tr tal:repeat="version versions">
                     <td><a href="${version.index_url}">${version.index_title}</a></td>
                     <td><a href="${version.url}">${version.title}</a></td>
-                    <td><a tal:condition="version.docs" href="${version.docs.url}">${version.docs.title}</a></td>
+                    <td>
+                        <a tal:condition="version.docs" href="${version.docs.url}">${version.docs.title}</a>
+                        <span tal:condition="version.docs">(<a href="${version.docs.zip_url}">Download</a>)</span>
+                    </td>
                 </tr>
             </tbody>
         </table>

{devpi-web-4.2.3 → devpi-web-4.3.0}/devpi_web/templates/version.pt

@@ -98,6 +98,10 @@
             </tbody>
         </table>
 
+        <p tal:condition="docs">
+            Download documentation as zip-file: <a href="${docs.zip_url}">${docs.title}</a>
+        </p>
+
         <div id="description" tal:content="structure content" />
         </div>
         <metal:footer use-macro="request.macros['footer']" />

{devpi-web-4.2.3 → devpi-web-4.3.0}/devpi_web/views.py

@@ -474,7 +474,8 @@ def get_docs_info(request, stage, linkstore):
             title="%s-%s" % (name, ver),
             url=request.route_url(
                 "docviewroot", user=stage.user.name, index=stage.index,
-                project=name, version=ver, relpath="index.html"))
+                project=name, version=ver, relpath="index.html"),
+            zip_url=url_for_entrypath(request, links[0].entrypath))
 
 
 def get_user_info(context, request, user):
@@ -830,7 +831,8 @@ def version_get(context, request):
         make_toxresult_url=functools.partial(
             request.route_url, "toxresult",
             user=context.username, index=context.index,
-            project=context.project, version=version))
+            project=context.project, version=version),
+        docs=docs)
 
 
 @view_config(

{devpi-web-4.2.3 → devpi-web-4.3.0}/devpi_web.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-web
-Version: 4.2.3
+Version: 4.3.0
 Summary: devpi-web: a web view for devpi-server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -77,6 +77,16 @@ Changelog
 
 .. towncrier release notes start
 
+4.3.0 (2024-10-16)
+==================
+
+Features
+--------
+
+- index.pt, project.pt, version.pt: Fix #1062: Added a link to download the documentation as zip-file to the index, project and version view.
+
+
+
 4.2.3 (2024-09-19)
 ==================
 
@@ -144,13 +154,3 @@ Bug Fixes
 
 - toxresults.pt, version.pt: Fix anchor generation for toxresults URLs.
 
-
-4.1.1 (2022-09-28)
-==================
-
-
-Bug Fixes
----------
-
-- Generalize GET redirect from URLs with trailing slash to ones without for consistency.
-

{devpi-web-4.2.3 → devpi-web-4.3.0}/setup.py

@@ -34,7 +34,7 @@ setup(
         'Documentation': 'https://doc.devpi.net',
         'Source Code': 'https://github.com/devpi/devpi'
     },
-    version='4.2.3',
+    version='4.3.0',
     maintainer="Florian Schulze",
     maintainer_email="mail@pyfidelity.com",
     license="MIT",

{devpi-web-4.2.3 → devpi-web-4.3.0}/tests/test_views.py

@@ -142,8 +142,10 @@ def test_index_view_project_docs(keep_docs_packed, mapp, testapp):
     api = mapp.create_and_use(indexconfig=dict(bases=["root/pypi"]))
     mapp.set_versiondata({"name": "pkg1", "version": "2.6"})
     content = zip_dict({"index.html": "<html/>"})
-    mapp.upload_doc("pkg1.zip", content, "pkg1", "2.6", code=200,
+    mapp.upload_doc("pkg1-2.6.doc.zip", content, "pkg1", "2.6", code=200,
                     waithooks=True)
+    doc_zip_url = make_file_url("pkg1-2.6.doc.zip", content, stagename=api.stagename)
+    doc_zip_url = doc_zip_url.rsplit("#", 1)[0]
     r = testapp.get(api.index, headers=dict(accept="text/html"))
     assert r.status_code == 200
     links = r.html.select('#content a')
@@ -151,6 +153,7 @@ def test_index_view_project_docs(keep_docs_packed, mapp, testapp):
         ("simple index", "http://localhost/%s/+simple/" % api.stagename),
         ("pkg1-2.6", "http://localhost/%s/pkg1/2.6" % api.stagename),
         ("pkg1-2.6", "http://localhost/%s/pkg1/2.6/+d/index.html" % api.stagename),
+        ('Download', doc_zip_url),
         ("root/pypi", "http://localhost/root/pypi"),
         ("simple", "http://localhost/root/pypi/+simple/")]
 
@@ -251,8 +254,8 @@ def test_project_view_docs_only(keep_docs_packed, mapp, testapp):
         "pkg1.zip", content, "pkg1", "2.6", code=200, waithooks=True)
     r = testapp.xget(200, api.index + '/pkg1', headers=dict(accept="text/html"))
     (content,) = r.html.select('#content')
-    assert [x.text for x in content.select('tr td')] == [
-        "user1/dev", "2.6", "pkg1-2.6"]
+    assert [x.text.strip() for x in content.select('tr td')] == [
+        "user1/dev", "2.6", "pkg1-2.6\n(Download)"]
 
 
 def test_project_view_root_pypi(mapp, testapp, pypistage):
@@ -316,7 +319,9 @@ def test_project_view_root_and_docs(keep_docs_packed, mapp, testapp, pypistage):
     content = zip_dict({"index.html": "<html/>"})
     mapp.set_versiondata({"name": "pkg1", "version": "2.6"})
     mapp.upload_doc(
-        "pkg1.zip", content, "pkg1", "2.6", code=200, waithooks=True)
+        "pkg1-2.6.doc.zip", content, "pkg1", "2.6", code=200, waithooks=True)
+    doc_zip_url = make_file_url("pkg1-2.6.doc.zip", content, stagename=api.stagename)
+    doc_zip_url = doc_zip_url.rsplit("#", 1)[0]
     r = testapp.xget(200, api.index + '/pkg1', headers=dict(accept="text/html"))
     links = r.html.select('#content a')
     assert [(l.text, l.attrs['href']) for l in links] == [
@@ -327,7 +332,8 @@ def test_project_view_root_and_docs(keep_docs_packed, mapp, testapp, pypistage):
         ("2.7", "http://localhost/root/pypi/pkg1/2.7"),
         ("root/pypi", "http://localhost/root/pypi"),
         ("2.6", "http://localhost/root/pypi/pkg1/2.6"),
-        ("pkg1-2.6", "http://localhost/user1/dev/pkg1/2.6/+d/index.html")]
+        ("pkg1-2.6", "http://localhost/user1/dev/pkg1/2.6/+d/index.html"),
+        ("Download", doc_zip_url)]
 
 
 def test_project_view_inherited_no_versions_on_stage(mapp, testapp):
@@ -361,7 +367,9 @@ def test_version_view(mapp, testapp, monkeypatch):
     zip = mapp.upload_file_pypi(
         "pkg1-2.6.zip", b"contentzip", "pkg1", "2.6").file_url
     content = zip_dict({"index.html": "<html/>"})
-    mapp.upload_doc("pkg1.zip", content, "pkg1", "2.6", code=200)
+    mapp.upload_doc("pkg1-2.6.doc.zip", content, "pkg1", "2.6", code=200)
+    doc_zip_url = make_file_url("pkg1-2.6.doc.zip", content, stagename=api.stagename)
+    doc_zip_url = doc_zip_url.rsplit("#", 1)[0]
     classifiers = ["Intended Audience :: Developers",
                    "License :: OSI Approved :: MIT License"]
     mapp.set_versiondata({
@@ -404,7 +412,8 @@ def test_version_view(mapp, testapp, monkeypatch):
         ("pkg1-2.6.tar.gz", tar3),
         ('user1/dev', 'http://localhost/user1/dev'),
         ("pkg1-2.6.zip", zip),
-        ('user1/dev', 'http://localhost/user1/dev')]
+        ('user1/dev', 'http://localhost/user1/dev'),
+        ('pkg1-2.6', doc_zip_url)]
 
 
 @pytest.mark.with_notifier

devpi-web-4.2.3/devpi_web/__init__.py

@@ -1 +0,0 @@
-__version__ = '4.2.3'