Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!news.mixmin.net!de-l.enfer-du-nord.net!feeder2.enfer-du-nord.net!newsfeed.eweka.nl!eweka.nl!feeder3.eweka.nl!newsfeed.xs4all.nl!newsfeed2.news.xs4all.nl!xs4all!post.news.xs4all.nl!not-for-mail
MIME-Version: 1.0
Date: Mon, 20 May 2013 20:00:30 +0200
Subject: pip and different branches?
From: andrea crotti <andrea.crotti.0@gmail.com>
To: python-list <python-list@python.org>
Content-Type: multipart/alternative; boundary=047d7bb70b2cbf335f04dd2a1b5c
Precedence: list
Newsgroups: comp.lang.python
Message-ID: <mailman.1892.1369072834.3114.python-list@python.org>
Lines: 70
NNTP-Posting-Host: 2001:888:2000:d::a6
Xref: csiph.com comp.lang.python:45628

--047d7bb70b2cbf335f04dd2a1b5c
Content-Type: text/plain; charset=ISO-8859-1

We use github and we work on many different branches at the same time.

The problem is that we have >5 repos now, and for each repo we might
have the same branches on all of them.

Now we use pip and install requirements such as:
git+ssh://git@github.com/repo.git@dev

Now the problem is that the requirements file are also under revision
control, and constantly we end up in the situation that when we merge
branches the branch settings get messed up, because we forget to change
them.

I was looking for a solution for this that would allow me to:
- use the branch of the "main" repo for all the dependencies
- fallback on master if that branch doesn't exist

I thought about a few options:
1. create a wrapper for PIP that manipulates the requirement file, that now
   would become templates.
   In this way I would have to know however if a branch exist or not,
   and I didn't find a way to do that without cloning the repo.

2. modify PIP to not fail when checking out a non existing branch, so
   that if it's not found it falls back on master automatically.

3. use some git magic hooks but I'm not sure what exactly

4. stop using virtualenv + pip and use something smarter that handles
   this.

Any suggestions?
Thanks

--047d7bb70b2cbf335f04dd2a1b5c
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>We use github and we work on many different branches =
at the same time.</div><div><br></div><div>The problem is that we have &gt;=
5 repos now, and for each repo we might</div><div>have the same branches on=
 all of them.</div>
<div><br></div><div>Now we use pip and install requirements such as:</div><=
div>git+ssh://<a href=3D"http://git@github.com/repo.git@dev">git@github.com=
/repo.git@dev</a></div><div><br></div><div>Now the problem is that the requ=
irements file are also under revision</div>
<div>control, and constantly we end up in the situation that when we merge<=
/div><div>branches the branch settings get messed up, because we forget to =
change</div><div>them.</div><div><br></div><div>I was looking for a solutio=
n for this that would allow me to:</div>
<div>- use the branch of the &quot;main&quot; repo for all the dependencies=
</div><div>- fallback on master if that branch doesn&#39;t exist</div><div>=
<br></div><div>I thought about a few options:</div><div>1. create a wrapper=
 for PIP that manipulates the requirement file, that now</div>
<div>=A0 =A0would become templates.</div><div>=A0 =A0In this way I would ha=
ve to know however if a branch exist or not,</div><div>=A0 =A0and I didn=
9;t find a way to do that without cloning the repo.</div><div><br></div><di=
v>2. modify PIP to not fail when checking out a non existing branch, so</di=
v>
<div>=A0 =A0that if it&#39;s not found it falls back on master automaticall=
y.</div><div><br></div><div>3. use some git magic hooks but I&#39;m not sur=
e what exactly</div><div><br></div><div>4. stop using virtualenv + pip and =
use something smarter that handles</div>
<div>=A0 =A0this.</div><div><br></div><div>Any suggestions?</div><div>Thank=
s</div><div><br></div></div>

--047d7bb70b2cbf335f04dd2a1b5c--