Skip to content
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.

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

Remove support for .zip format source distributions #5755

Merged
merged 9 commits into from
Dec 1, 2018

Conversation

emilypi
Copy link
Member

@emilypi emilypi commented Dec 1, 2018

This PR addresses #5735, including the removal of the zip-archive dependency per the comments

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • If the change is docs-only, [ci skip] is used to avoid triggering the build bots.

Extra:

  • Remove archive format + related code (per the comments)

Copy link
Collaborator

@typedrat typedrat left a comment

Choose a reason for hiding this comment

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

Other than that + the changelog entry, LGTM.

@@ -333,7 +333,6 @@ executable cabal
zlib >= 0.5.3 && < 0.7,
hackage-security >= 0.5.2.2 && < 0.6,
text >= 1.2.3 && < 1.3,
zip-archive >= 0.3.2.5 && < 0.4,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Modify .pp instead!

Copy link
Member Author

Choose a reason for hiding this comment

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

That was fast! Will do @ both your comments

@emilypi emilypi changed the title [WIP] Remove support for .zip format source distributions Remove support for .zip format source distributions Dec 1, 2018
@emilypi
Copy link
Member Author

emilypi commented Dec 1, 2018

@typedrat all fixed up!

cabal-install/cabal-install.cabal Outdated Show resolved Hide resolved
cabal-install/Distribution/Client/CmdSdist.hs Outdated Show resolved Hide resolved
cabal-install/Distribution/Client/Setup.hs Outdated Show resolved Hide resolved
cabal-install/Distribution/Client/Setup.hs Outdated Show resolved Hide resolved
cabal-install/Distribution/Client/Setup.hs Outdated Show resolved Hide resolved
@23Skidoo
Copy link
Member

23Skidoo commented Dec 1, 2018

Sure, let's drop the flag altogether.

@emilypi
Copy link
Member Author

emilypi commented Dec 1, 2018

@hvr Excavation complete 😄

Copy link
Member

@23Skidoo 23Skidoo left a comment

Choose a reason for hiding this comment

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

LGTM.

@23Skidoo
Copy link
Member

23Skidoo commented Dec 1, 2018

@emilypi Feel free to merge.

@emilypi
Copy link
Member Author

emilypi commented Dec 1, 2018

Thanks @23Skidoo!

@emilypi emilypi merged commit 1f56603 into haskell:master Dec 1, 2018
@phadej
Copy link
Collaborator

phadej commented Dec 2, 2018

Does merge broke appveyor CI? I see same error in my branch, as this failed.

@23Skidoo
Copy link
Member

23Skidoo commented Dec 2, 2018

Looks like it did:

Wrote source list to C:\projects\cabal\cabal-testsuite\PackageTests\NewSdist\MultiTarget\list-sources-output-dir.dist\source\lists\a-0.1.tar.gz

where the test is expecting a-0.1.list.

@emilypi
Copy link
Member Author

emilypi commented Dec 2, 2018

That ain't good. I think I see where, and I'll post a fix

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants