Skip to content

[Reference PR] hotfix/26.2.1 #497

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.

Sign up for GitHub

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

Closed
cslzchen wants to merge 2 commits into from
Closed

[Reference PR] hotfix/26.2.1 #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e1bbb4
[ENG-11729] Add provider/add-on name when DAZ a folder (#496)
cslzchen Jul 22, 2026
59e9df0
Update changelog and bump version
cslzchen Jul 23, 2026
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
5 changes: 5 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
ChangeLog
*********

26.2.1 (2026-07-23)
===================

- Fix zip file name for DAZ

26.2.0 (2026-07-20)
===================

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "waterbutler"
version = "26.2.0" # TODO: get version from waterbutler/version.py
version = "26.2.1" # TODO: get version from waterbutler/version.py
description = "WaterButler Storage Server"
authors = ["Center for Open Science <contact@cos.io>"]
readme = "README.md"
Expand Down
4 changes: 2 additions & 2 deletions tests/server/api/v1/test_metadata_mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,12 @@ async def test_download_folder_as_zip(self, http_request, mock_stream):
handler = mock_handler(http_request)

handler.provider.zip = MockCoroutine(return_value=mock_stream)
handler.path = WaterButlerPath('/test_file')
handler.path = WaterButlerPath('/test_folder')

await handler.download_folder_as_zip()

assert handler._headers['Content-Type'] == 'application/zip'
expected = 'attachment; filename="guid1-test_file.zip"; filename*=UTF-8\'\'guid1-test_file.zip'
expected = 'attachment; filename="guid1-MockProvider-test_folder-archive.zip"; filename*=UTF-8\'\'guid1-MockProvider-test_folder-archive.zip'
assert handler._headers['Content-Disposition'] == expected

handler.write_stream.assert_called_once_with(mock_stream)
Expand Down
2 changes: 1 addition & 1 deletion waterbutler/server/api/v1/provider/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ async def get_file_revisions(self):
return self.write({'data': [r.json_api_serialized() for r in result]})

async def download_folder_as_zip(self):
zipfile_name = f'{self.path_kwargs.get("resource")}-{self.path.name}' if self.path.name else f'{self.path_kwargs.get("resource")}-{self.provider.NAME}-archive'
zipfile_name = f'{self.path_kwargs.get("resource")}-{self.provider.NAME}-{self.path.name}-archive' if self.path.name else f'{self.path_kwargs.get("resource")}-{self.provider.NAME}-archive'
self.set_header('Content-Type', 'application/zip')
self.set_header('Content-Disposition', make_disposition(zipfile_name + '.zip'))

Expand Down
2 changes: 1 addition & 1 deletion waterbutler/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '26.2.0'
__version__ = '26.2.1'
Loading