A
andrea crotti
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://[email protected]/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
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://[email protected]/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