Skip to content

gh-108303: Move zip and tar archives to Lib/test/archivetestdata - #111549

Merged
vstinner merged 4 commits into
python:mainfrom
sobolevn:issue-108303-zip
Nov 4, 2023
Merged

gh-108303: Move zip and tar archives to Lib/test/archivetestdata#111549
vstinner merged 4 commits into
python:mainfrom
sobolevn:issue-108303-zip

Conversation

@sobolevn

@sobolevnsobolevn commented Oct 31, 2023•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

All archives now live in the same place.

@bedevere-appbedevere-appBot mentioned this pull request Oct 31, 2023
Closed
vstinner
vstinner reviewed Oct 31, 2023
View reviewed changes

@vstinnervstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's surprising that "ziptestdata" is used by test_tarfile and contains TAR archives. Maybe rename the directory to "archivetestdata"?

@sobolevn
sobolevn requested a review from 1st1 as a code ownerOctober 31, 2023 14:40
@vstinnervstinner changed the title gh-108303: Move zip and tar archives to Lib/test/ziptestdatagh-108303: Move zip and tar archives to Lib/test/archivetestdataOct 31, 2023
vstinner
vstinner reviewed Oct 31, 2023
View reviewed changes

@vstinnervstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lib/test/archivetestdata/README.md says "Test data for test_zipfile". Maybe mention somewhere that now it's also used by test_tarfile, and also test_contextlib?

Also, the README file says "Purpose: These are used to test executable files with an appended zipfile". Is it still the case?

@vstinner

vstinner commented Oct 31, 2023

Copy link
Copy Markdown
Member

If some test files are specific to "test executable files with an appended zipfile", maybe they should live in a separated directory? I'm not sure if it's worth it. Maybe just list files related to these specific tests?

vstinner
vstinner reviewed Nov 3, 2023
View reviewed changes

@vstinnervstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please try to fix the merge conflict?

@sobolevn

sobolevn commented Nov 4, 2023

Copy link
Copy Markdown
MemberAuthor

Done!

@vstinner
vstinner merged commit 890ef1b into python:mainNov 4, 2023
@vstinner

vstinner commented Nov 4, 2023

Copy link
Copy Markdown
Member

Merged, thanks. I don't know how feasible it is to backport the change to 3.11 and 3.12? @sobolevn: try maybe to add the backport labels?

aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
@sobolevn@aisk
pythongh-108303: Movezipandtararchives to `Lib/test/archivete…
bcbabb3
…stdata` (python#111549)
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@sobolevn@Glyphack
pythongh-108303: Movezipandtararchives to `Lib/test/archivete…
4a300a2
…stdata` (python#111549)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinnervstinnervstinner left review comments
@ethanfurmanethanfurmanAwaiting requested review from ethanfurmanethanfurman is a code owner
@1st11st1Awaiting requested review from 1st1

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sobolevn@vstinner