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

git-imerge 1.2.0 #61745

Closed
wants to merge 1 commit into from
Closed

git-imerge 1.2.0 #61745

wants to merge 1 commit into from

Conversation

mochadwi
Copy link

@mochadwi mochadwi commented Sep 29, 2020

  • Have you followed the guidelines for contributing?
  • Have you checked that there aren't other open pull requests for the same formula update/change?
  • Have you built your formula locally with brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
  • Is your test running fine brew test <formula>, where <formula> is the name of the formula you're submitting?
  • Does your build pass brew audit --strict <formula> (after doing brew install <formula>)?

@BrewTestBot BrewTestBot added the deprecated license Formula uses a deprecated SPDX license which should be updated label Sep 29, 2020
Formula/git-imerge.rb Outdated Show resolved Hide resolved
Formula/git-imerge.rb Outdated Show resolved Hide resolved
@Rylan12 Rylan12 changed the title bump git-imerge version from 1.1.0 to 1.2.0 git-imerge 1.2.0 Oct 2, 2020
@Rylan12 Rylan12 added the needs response Needs a response from the issue/PR author label Oct 2, 2020
@BrewTestBot BrewTestBot removed the deprecated license Formula uses a deprecated SPDX license which should be updated label Oct 3, 2020
@mochadwi
Copy link
Author

mochadwi commented Oct 3, 2020

I'm opening this PR due to inactivity in: #61471 should I continue on #61471 ?

@Rylan12
Copy link
Member

Rylan12 commented Oct 3, 2020

@chenrui333 any progress on #61471? If not, it's fine to continue here.

Co-authored-by: Rylan Polster <[email protected]>
@mochadwi
Copy link
Author

mochadwi commented Oct 6, 2020

@chenrui333 any progress on #61471? If not, it's fine to continue here.

I've squashed my commit cc @Rylan12

@chenrui333 chenrui333 mentioned this pull request Oct 10, 2020
@chenrui333
Copy link
Member

looks like the build is still failing? cc @mochadwi

==> brew install --verbose --build-bottle git-imerge
==> FAILED
==> Downloading https://github.com/mhagger/git-imerge/archive/v1.2.0.tar.gz
Already downloaded: /Users/brew/Library/Caches/Homebrew/downloads/462d0e1db00104012afc13fc63c1d5d471e20845dddc08a3ea8601c7053444e7--git-imerge-1.2.0.tar.gz
==> Verifying 462d0e1db00104012afc13fc63c1d5d471e20845dddc08a3ea8601c7053444e7--git-imerge-1.2.0.tar.gz checksum
/usr/bin/sandbox-exec -f /private/tmp/homebrew20201006-62995-ybbo21.sb nice ruby -W0 -I $LOAD_PATH -- /usr/local/Homebrew/Library/Homebrew/build.rb /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/git-imerge.rb --build-bottle --verbose
tar xof /Users/brew/Library/Caches/Homebrew/downloads/462d0e1db00104012afc13fc63c1d5d471e20845dddc08a3ea8601c7053444e7--git-imerge-1.2.0.tar.gz -C /private/tmp/d20201006-62996-1ae5gse
cp -pR /private/tmp/d20201006-62996-1ae5gse/git-imerge-1.2.0/. /private/tmp/git-imerge-20201006-62996-kd16kr/git-imerge-1.2.0
chmod -Rf +w /private/tmp/d20201006-62996-1ae5gse
==> make install DESTDIR=/usr/local/Cellar/git-imerge/1.2.0 PREFIX=
make: *** No rule to make target `install'.  Stop.

@mochadwi
Copy link
Author

looks like the build is still failing? cc @mochadwi

==> brew install --verbose --build-bottle git-imerge
==> FAILED
==> Downloading https://github.com/mhagger/git-imerge/archive/v1.2.0.tar.gz
Already downloaded: /Users/brew/Library/Caches/Homebrew/downloads/462d0e1db00104012afc13fc63c1d5d471e20845dddc08a3ea8601c7053444e7--git-imerge-1.2.0.tar.gz
==> Verifying 462d0e1db00104012afc13fc63c1d5d471e20845dddc08a3ea8601c7053444e7--git-imerge-1.2.0.tar.gz checksum
/usr/bin/sandbox-exec -f /private/tmp/homebrew20201006-62995-ybbo21.sb nice ruby -W0 -I $LOAD_PATH -- /usr/local/Homebrew/Library/Homebrew/build.rb /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/git-imerge.rb --build-bottle --verbose
tar xof /Users/brew/Library/Caches/Homebrew/downloads/462d0e1db00104012afc13fc63c1d5d471e20845dddc08a3ea8601c7053444e7--git-imerge-1.2.0.tar.gz -C /private/tmp/d20201006-62996-1ae5gse
cp -pR /private/tmp/d20201006-62996-1ae5gse/git-imerge-1.2.0/. /private/tmp/git-imerge-20201006-62996-kd16kr/git-imerge-1.2.0
chmod -Rf +w /private/tmp/d20201006-62996-1ae5gse
==> make install DESTDIR=/usr/local/Cellar/git-imerge/1.2.0 PREFIX=
make: *** No rule to make target `install'.  Stop.

Is this a problem with make executable?

@SMillerDev
Copy link
Member

That error looks like there is no make install

@mochadwi
Copy link
Author

make: *** No rule to make target `install'.  Stop.

Looks like the library author has some improvement in installation process, will modify this later

@yous
Copy link
Contributor

yous commented Oct 22, 2020

git-imerge switched to use setup.py instead of Makefile: mhagger/git-imerge#143

@mochadwi
Copy link
Author

git-imerge switched to use setup.py instead of Makefile: mhagger/git-imerge#143

That's right. I've edit it to use pip for def install. Is it okay?

@yous
Copy link
Contributor

yous commented Oct 22, 2020

I think we need to do python3 setup.py install. By looking around other formulae,

def install
  system Formula["[email protected]"].opt_bin/"python3", "setup.py", "install",
         "--prefix=#{prefix}",
         "--single-version-externally-managed",
         "--record=installed.txt"
end

Also depends_on "[email protected]" should be added.

@Rylan12
Copy link
Member

Rylan12 commented Oct 22, 2020

You'll likely want to look into using virtualenv_install_with_resources (there are lots of formulae that use this you can look at for reference)

If that doesn't work you'll probably need to use something like:

system Formula["[email protected]"].opt_bin/"python3", *Language::Python.setup_install_args(libexec)

Off the top of my head, I think you can use the urh formula as reference.

I'd also recommend switching to using the PyPI URL (in this case, https://files.pythonhosted.org/packages/be/f6/ea97fb920d7c3469e4817cfbf9202db98b4a4cdf71d8740e274af57d728c/git-imerge-1.2.0.tar.gz). That way, brew bump-formula-pr will automatically add resource blocks if they become necessary in the future. This is not a deal-breaker though.

@mochadwi
Copy link
Author

It fails when try to installing in my end: mhagger/git-imerge#153

Any ideas to support this bash_completions in macOS?

@Rylan12
Copy link
Member

Rylan12 commented Oct 23, 2020

You can install completions to the bash_completion or zsh_completion path. I don't know an example off the top of my head but if you search for bash_completion you should get lots of results.

@mochadwi
Copy link
Author

You can install completions to the bash_completion or zsh_completion path. I don't know an example off the top of my head but if you search for bash_completion you should get lots of results.


 depends_on "bash-completion"
 def install
  // install git-imerge
 end

also doesn't works, any ideas to configure bash completion inside Formula/git-imerge.rb?

@mochadwi
Copy link
Author

mochadwi commented Oct 24, 2020

came accross this approach: https://discourse.brew.sh/t/conditional-depends-on-on-formulae/1943/4

does it still relevant in the latest homebrew version using bash_completion.install? if yes, where to put bash_completion.install line?

@Rylan12
Copy link
Member

Rylan12 commented Oct 24, 2020

Yes, bash_completion.install is the way to go. You don't need to depend on the bash-completion formula to use it. The bash_completion.install line goes in the install method (usually toward the bottom but I don't think that's a rule).

One example is the velero formula but there are countless more available for reference in Homebrew/core:

# Install bash completion
output = Utils.safe_popen_read("#{bin}/velero", "completion", "bash")
(bash_completion/"velero").write output
# Install zsh completion
output = Utils.safe_popen_read("#{bin}/velero", "completion", "zsh")
(zsh_completion/"_velero").write output

@mochadwi
Copy link
Author

mochadwi commented Nov 3, 2020

mhagger/git-imerge#176 the author now skip the bash_completion on ZSH shell

@BrewTestBot
Copy link
Member

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@chenrui333
Copy link
Member

Close in favor of #66058

@chenrui333 chenrui333 closed this Dec 2, 2020
@chenrui333 chenrui333 added the superseded PR was replaced by another PR label Dec 2, 2020
@BrewTestBot BrewTestBot added the outdated PR was locked due to age label Jan 2, 2021
@Homebrew Homebrew locked as resolved and limited conversation to collaborators Jan 2, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs response Needs a response from the issue/PR author outdated PR was locked due to age stale No recent activity superseded PR was replaced by another PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants