Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 9, 2025

See #9110. The HLint "use fewer imports" suggestion was too much trouble to enable before most of the base CPP conditionals, "base 4.13 and older", were removed in #10092.

We're using fourmolu but this doesn't merge multiple imports from the same module.

The removal of MIN_VERSION_base(4,11,0) is permitted by #8998 (comment) and #8998 (comment).

Two files used for our tests taken from other projects are now ignored for linting, in .hlint.yaml:

 - arguments:
+    - --ignore-glob=Cabal-tests/tests/custom-setup/CabalDoctestSetup.hs
+    - --ignore-glob=Cabal-tests/tests/custom-setup/IdrisSetup.hs

The first of these, CabalDoctestSetup.hs, was mentioned by @Kleidukos in #8998 (comment).


Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

This is an automatic backport of pull request #10719 done by [Mergify](https://mergify.com).

- Use fewer imports with CPP in Compat.Time
- Use fewer imports in IntegrationTests2
- Use fewer imports in Distribution.Client.ProjectPlanning
- Use fewer imports in Distribution.Client.Config
- Use fewer imports in Distribution.Client.NixStyleOptions
- Use fewer imports in Internal.TempFile
- Use fewer imports in Distribution.Client.Store
- Use fewer imports in Distribution.Client.SetupWrapper
- Use fewer imports in Disribution.Simple.GHC
- Use fewer imports in NeedleHaystack
- Remove unused -XCPP from Client.ProjectPlanning
- Enable hlint suggestion "Use fewer imports"
- Ignore custom setup test files from Idris and Doctest

(cherry picked from commit 217f08a)

# Conflicts:
#	.hlint.yaml
#	cabal-install/tests/IntegrationTests2.hs
#	cabal-testsuite/src/Test/Cabal/NeedleHaystack.hs
(cherry picked from commit d165dfd)

# Conflicts:
#	.hlint.yaml
@mergify mergify bot added the conflicts label Jan 9, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Jan 9, 2025

Cherry-pick of 217f08a has failed:

On branch mergify/bp/3.14/pr-10719
Your branch is ahead of 'origin/3.14' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 217f08ac5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cabal/src/Distribution/Compat/Internal/TempFile.hs
	modified:   Cabal/src/Distribution/Compat/Time.hs
	modified:   Cabal/src/Distribution/Simple/GHC.hs
	modified:   cabal-install/src/Distribution/Client/CmdTest.hs
	modified:   cabal-install/src/Distribution/Client/Config.hs
	modified:   cabal-install/src/Distribution/Client/ProjectPlanning.hs
	modified:   cabal-install/src/Distribution/Client/SetupWrapper.hs
	modified:   cabal-install/src/Distribution/Client/Store.hs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .hlint.yaml
	both modified:   cabal-install/tests/IntegrationTests2.hs
	deleted by us:   cabal-testsuite/src/Test/Cabal/NeedleHaystack.hs

Cherry-pick of d165dfd has failed:

On branch mergify/bp/3.14/pr-10719
Your branch is ahead of 'origin/3.14' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d165dfda4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .hlint.yaml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the backport label Jan 9, 2025
@Kleidukos Kleidukos added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jan 14, 2025
@Mikolaj
Copy link
Member

Mikolaj commented Mar 13, 2025

@Kleidukos: do we still want to merge this one or is it subsumed by something else?

@Mikolaj Mikolaj removed merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge+no rebase labels Mar 29, 2025
@Mikolaj
Copy link
Member

Mikolaj commented Mar 29, 2025

At this point, just before the 3.14.2 release, I'd rather not backport a big but non-critical PR, so let's wait until after the release or let's drop it.

@ulysses4ever
Copy link
Collaborator

@Mikolaj I don't have a strong opinion, but one argument that was used in the past for PRs with many small changes like this one is that not backporting them will create more conflicts when backporting other PRs...

@Mikolaj
Copy link
Member

Mikolaj commented Mar 31, 2025

That's a valid point and we still have 4 more backports to create, so a conflict can still emerge. On a second look, this PR is very safe, so let me backport it.

@Mikolaj
Copy link
Member

Mikolaj commented Mar 31, 2025

@mergify backport 3.14

@mergify
Copy link
Contributor Author

mergify bot commented Mar 31, 2025

backport 3.14

✅ Backports have been created

  • Backport to branch 3.14 not needed, change already in branch 3.14

@Mikolaj
Copy link
Member

Mikolaj commented Mar 31, 2025

uhoh, thinko

@Mikolaj Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Mar 31, 2025
@mergify mergify bot merged commit cf1e436 into 3.14 Mar 31, 2025
57 checks passed
@mergify mergify bot deleted the mergify/bp/3.14/pr-10719 branch March 31, 2025 11:04
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants