devpi-web 5.0.0__tar.gz → 5.0.1__tar.gz

{devpi_web-5.0.0 → devpi_web-5.0.1}/CHANGELOG

@@ -2,6 +2,16 @@
 
 .. towncrier release notes start
 
+5.0.1 (2025-06-15)
+==================
+
+Bug Fixes
+---------
+
+- Fix traceback during unpacking of documentation in some cases.
+
+
+
 5.0.0 (2025-06-12)
 ==================
 

{devpi_web-5.0.0 → devpi_web-5.0.1}/CHANGELOG.short.rst

@@ -9,6 +9,16 @@ Changelog
 
 .. towncrier release notes start
 
+5.0.1 (2025-06-15)
+==================
+
+Bug Fixes
+---------
+
+- Fix traceback during unpacking of documentation in some cases.
+
+
+
 5.0.0 (2025-06-12)
 ==================
 
@@ -106,14 +116,3 @@ Bug Fixes
 - Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
 
 
-
-4.2.1 (2023-07-02)
-==================
-
-Bug Fixes
----------
-
-- Fix #953: Exception when browsers send ETag for documentation pages.
-
-- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
-

{devpi_web-5.0.0 → devpi_web-5.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-web
-Version: 5.0.0
+Version: 5.0.1
 Summary: devpi-web: a web view for devpi-server
 Maintainer-email: Florian Schulze <mail@pyfidelity.com>
 License-Expression: MIT
@@ -87,6 +87,16 @@ Changelog
 
 .. towncrier release notes start
 
+5.0.1 (2025-06-15)
+==================
+
+Bug Fixes
+---------
+
+- Fix traceback during unpacking of documentation in some cases.
+
+
+
 5.0.0 (2025-06-12)
 ==================
 
@@ -184,14 +194,3 @@ Bug Fixes
 - Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
 
 
-
-4.2.1 (2023-07-02)
-==================
-
-Bug Fixes
----------
-
-- Fix #953: Exception when browsers send ETag for documentation pages.
-
-- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
-

devpi_web-5.0.1/devpi_web/__init__.py

@@ -0,0 +1 @@
+__version__ = "5.0.1"

{devpi_web-5.0.0 → devpi_web-5.0.1}/devpi_web/doczip.py

@@ -33,7 +33,9 @@ def locked_unpack_path(stage, name, version, *, remove_lock_file=False):
     hash_path = unpack_path.with_suffix(".hash")
     try:
         hash_path.parent.mkdir(parents=True, exist_ok=True)
-        with hash_path.open("a+") as hash_file:
+        with suppress(FileExistsError), hash_path.open("x"):
+            pass
+        with hash_path.open("r+") as hash_file:
             if fcntl:
                 fcntl.flock(hash_file, fcntl.LOCK_EX)
             try:
@@ -90,12 +92,13 @@ def unpack_docs(stage, name, version, entry):
     # we are not losing the original zip file anyway
     with locked_unpack_path(stage, name, version) as (hash_file, unpack_path):
         hash_file.seek(0)
-        if hash_file.read().strip() == entry.best_available_hash_spec:
+        hash_spec = hash_file.read().strip()
+        if hash_spec == entry.best_available_hash_spec:
             return unpack_path
         if unpack_path.exists():
             with suppress(FileNotFoundError):
                 # there is a rare possibility of a race condition here
-                unpack_path.unlink()
+                shutil.rmtree(unpack_path)
         if not entry.file_exists():
             return unpack_path
         with entry.file_open_read() as f, Archive(f) as archive:

{devpi_web-5.0.0 → devpi_web-5.0.1}/devpi_web.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devpi-web
-Version: 5.0.0
+Version: 5.0.1
 Summary: devpi-web: a web view for devpi-server
 Maintainer-email: Florian Schulze <mail@pyfidelity.com>
 License-Expression: MIT
@@ -87,6 +87,16 @@ Changelog
 
 .. towncrier release notes start
 
+5.0.1 (2025-06-15)
+==================
+
+Bug Fixes
+---------
+
+- Fix traceback during unpacking of documentation in some cases.
+
+
+
 5.0.0 (2025-06-12)
 ==================
 
@@ -184,14 +194,3 @@ Bug Fixes
 - Fix #970: overwrite fixed html/body heights like ``100%`` in documentation iframe content.
 
 
-
-4.2.1 (2023-07-02)
-==================
-
-Bug Fixes
----------
-
-- Fix #953: Exception when browsers send ETag for documentation pages.
-
-- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
-

{devpi_web-5.0.0 → devpi_web-5.0.1}/tests/test_indexing.py

@@ -65,6 +65,57 @@ def test_doc_unpack_cleanup(mapp, testapp):
     assert not path.joinpath("foo.html").exists()
 
 
+@pytest.mark.with_notifier
+def test_doc_unpack_hash_mismatch(caplog, mapp):
+    from devpi_web.doczip import get_unpack_path
+    from devpi_web.doczip import locked_unpack_path
+    from devpi_web.doczip import unpack_docs
+    api = mapp.create_and_use()
+    content = zip_dict({
+        "index.html": "<html><body>2.6</body></html>"})
+    mapp.set_versiondata({"name": "pkg1", "version": "2.6"})
+    mapp.upload_doc("pkg1.zip", content, "pkg1", "2.6", code=200,
+                    waithooks=True)
+    with mapp.xom.keyfs.read_transaction():
+        stage = mapp.xom.model.getstage(api.stagename)
+        linkstore = stage.get_linkstore_perstage("pkg1", "2.6")
+        (link,) = linkstore.get_links(rel='doczip')
+        path = unpack_docs(stage, 'pkg1', '2.6', link.entry)
+    assert path.exists()
+    # make sure there is a path that is not existing in the zip,
+    # so we can test for its removal
+    foo_path = path.joinpath("foo.html")
+    assert not foo_path.exists()
+    foo_path.touch()
+    assert foo_path.exists()
+    with mapp.xom.keyfs.read_transaction():
+        # now mess with the hash file and make it bigger than the hash_spec,
+        # as there was a problem with writing the file correctly before
+        bad_hash = "foo" * 300
+        with locked_unpack_path(stage, "pkg1", "2.6") as (hash_file, _unpack_path):
+            hash_file.seek(0)
+            hash_file.write(bad_hash)
+        hash_path = get_unpack_path(stage, "pkg1", "2.6").with_suffix(".hash")
+        # make sure it is set correctly to the bad value
+        assert hash_path.read_text() == bad_hash
+        stage = mapp.xom.model.getstage(api.stagename)
+        linkstore = stage.get_linkstore_perstage("pkg1", "2.6")
+        (link,) = linkstore.get_links(rel='doczip')
+        caplog.clear()
+        unpack_docs(stage, 'pkg1', '2.6', link.entry)
+        assert len(caplog.getrecords("unpacked")) == 1
+        assert hash_path.read_text() == link.entry.best_available_hash_spec
+        # unpack again
+        new_path = unpack_docs(stage, 'pkg1', '2.6', link.entry)
+        assert len(caplog.getrecords("unpacked")) == 1
+        assert new_path == path
+        assert new_path.exists()
+        assert "2.6" in new_path.joinpath("index.html").read_text()
+        # the hash was written more than once
+        assert new_path.with_suffix(".hash").read_text() == link.entry.best_available_hash_spec
+    assert not foo_path.exists()
+
+
 @pytest.mark.with_notifier
 def test_empty_doczip(mapp):
     from devpi_server.filestore import get_hashes

devpi_web-5.0.0/devpi_web/__init__.py

@@ -1 +0,0 @@
-__version__ = "5.0.0"