From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael J Gruber <git@grubix.eu>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [filter-repo PATCH] filter-repo: help with local install
Date: Fri, 9 Jul 2021 10:51:59 -0700 [thread overview]
Message-ID: <CABPp-BH3-0oE8_VsXgwOky8vAv=gZvP96ym=mc4hjHDKanRmQQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqk0lz764u.fsf@gitster.g>
On Fri, Jul 9, 2021 at 10:24 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Michael J Gruber <git@grubix.eu> writes:
>
> > The Makefile suggests a local install and works almost as is, except for
> > the python path. Make it work automatically for this typical use case,
> > and give a corresponding hint in INSTALL.md.
> >
> > Signed-off-by: Michael J Gruber <git@grubix.eu>
> > ---
> > INSTALL.md | 5 +++--
> > Makefile | 2 +-
> > 2 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/INSTALL.md b/INSTALL.md
> > index 00aabb7..d479681 100644
> > --- a/INSTALL.md
> > +++ b/INSTALL.md
> > @@ -75,8 +75,9 @@ filter-repo only consists of a few files that need to be installed:
> > You can create this symlink to (or copy of) git-filter-repo named
> > git_filter-repo.py and place it in your python site packages; `python
> > -c "import site; print(site.getsitepackages())"` may help you find the
> > - appropriate location for your system. Alternatively, you can place
> > - this file anywhere within $PYTHONPATH.
> > + appropriate location for your system, `python -c "import site;
> > + print(site.getusersitepackages())"` for a local install. Alternatively,
> > + you can place this file anywhere within $PYTHONPATH.
> >
> > * git-filter-repo.1
> >
> > diff --git a/Makefile b/Makefile
> > index 31f5e3a..c97d1f6 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -4,7 +4,7 @@ bindir = $(prefix)/libexec/git-core
> > localedir = $(prefix)/share/locale
> > mandir = $(prefix)/share/man
> > htmldir = $(prefix)/share/doc/git-doc
> > -pythondir = $(prefix)/lib64/python3.6/site-packages
> > +pythondir = $(shell python -c "import site; print(site.getusersitepackages())")
>
> There may be no "python" on $PATH, yet the user may have told the
> make via PYTHON_PATH that /usr/bin/python3 is to be used.
This was a patch for git-filter-repo.git rather than git.git; there is
no PYTHON_PATH variable in the Makefile.
That said, thanks for calling out python3. As the git-filter-repo
script uses that, all these references to 'python' should be replaced
with 'python3' (including the two in INSTALL.md from before this
patch).
prev parent reply other threads:[~2021-07-09 17:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-09 15:25 [filter-repo PATCH] filter-repo: help with local install Michael J Gruber
2021-07-09 15:41 ` Elijah Newren
2021-07-09 17:24 ` Junio C Hamano
2021-07-09 17:51 ` Elijah Newren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BH3-0oE8_VsXgwOky8vAv=gZvP96ym=mc4hjHDKanRmQQ@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).