[openstack-dev] [requirements] changing the order of values in upper-constraints.txt
tony at bakeyournoodle.com
Wed Feb 1 10:18:54 UTC 2017
On Wed, Jan 18, 2017 at 04:34:56PM -0500, Doug Hellmann wrote:
> When I tried to merge the upper-constraints updates for the library
> releases we did today, I ran into quite a lot of merge conflicts
> with the Oslo libraries. I'm exploring options for reducing the
> likelihood that those sorts of conflicts will occur with a few
> patches that change how we generate the constraints list.
Dirk's been doing a great job of dealing with that and there are scripts to
take the ones generated from the bot and make single series from them n deep.
That's not very sustainable though.
> The final option uses a SHA1 hash of the name as the sort key. It
> wouldn't be easy for a human to update the file by hand, but we
> could make a tool that does. I don't know how often that case comes
> up, so I don't know how important it is. See
> https://review.openstack.org/422245 and https://review.openstack.org/422246
> for the sample output.
Thanks Doug. I like this option.
We don't need to add a tool as the docs describe how to do this already, which
basically boils down to run the tool you're patching.
If that doesn't happen (which is common) the next daily update will just move
it to the new right place.
I think we should do this early after we branch requirements
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 473 bytes
Desc: not available
More information about the OpenStack-dev