Pleased to announce the 0.12.0 release of git-upstream.
With source available at: http://git.openstack.org/cgit/openstack/git-upstream Please report any issues through launchpad: https://bugs.launchpad.net/git-upstream git-upstream is an open source Python application that can be used to keep in sync with upstream open source projects, mainly OpenStack. For more info on what git-upstream is for: https://pypi.python.org/pypi/git-upstream Full changelog available from: _https://git.openstack.org/cgit/openstack/git-upstream/tree/ChangeLog_ For more details see below. Changes in git-upstream 0.11.0..0.12.0 -------------------------------------- d50f0a3 Changelog for 0.12.0 Release 7dd634a Fix help subcommand 5c0a4a7 Remove compatibility hacks causing issues with newer GitPython 691ae78 Check valid import branch argument value 0e30d38 Report import branch name used by default f243bd6 Use tag for import branch naming when given be781cc Support tags for input args 5f4038e Allow SHA1 as reference for inputs 7897e35 Use python for pre/post scripts 47092a9 Fix finish merge to ensure correct contents 54d4876 Always have rebase perform finish a24debc Ensure correct mode of git-rebase executed d8bb479 Ensure parent options retained for exec'ed finish 9e077c5 Support old GitPython transform_kwargs signature 79b31d9 Refactor test to allow additional 3b5e241 Fix access for pre-script dict member b7dc443 Update .gitignore with .eggs path for setuptools 7a135a1 Enable default GIT_PYTHON_TRACE for tests 26c4274 Consolidate to a single separator character 10e8f92 Example in USAGE.md should reference .gitreview c195b69 Fix broken interactive mode to be usable 307637d Record upstream branch in import merge commit e231483 Handle all local changes landed upstream 8ab6ccc Detect cherry-picked changes without Change-Id a05425f Use a recent pbr f37890b Add tool to recreate git repo from test scenarios 90bf42d Detect when nothing to import 343c3e7 Merge multiple unrelated additional branches 62def85 Support for python 3 0037786 Show rebase help during interactive import 45a617a Simplify USAGE.md example by using a local remote eaaeae8 Fix / simplify the example patch in USAGE.md 54c40a7 Minor change to the USAGE.md 69ed25e Handle missing merge during initial import 1810d1e Include parent commits in git graph 5687a7b Match name and result of is_detached() method 81ad238 Install coverage and fix command line to call 246439b Refactor import command tests to use scenarios af6f690 Fix a tiny typo in USAGE 30f6bf2 Update package author/maintainer details 754db13 Consolidate note reference and header constants 4a55a31 Consolidate BadName exception compatibility 9640363 Keep modifications to GitPython objects in single module fb05151 Support test specific scripts to modify test areas 677c17a Ensure end of arguments marked clearly Diffstat (except docs and test files) ------------------------------------- .gitignore | 2 + ChangeLog | 50 +++++++ USAGE.md | 49 +++---- git_upstream/__init__.py | 3 + git_upstream/commands/__init__.py | 2 +- git_upstream/commands/help.py | 12 +- git_upstream/commands/import.py | 98 +++++++------ git_upstream/lib/__init__.py | 18 +++ git_upstream/lib/drop.py | 20 +-- git_upstream/lib/importupstream.py | 173 ++++++++++++++++------ git_upstream/lib/note.py | 5 - git_upstream/lib/pygitcompat.py | 100 ++----------- git_upstream/lib/rebaseeditor.py | 194 +++++++++++++++++-------- git_upstream/lib/searchers.py | 142 ++++++++++-------- git_upstream/lib/strategies.py | 26 +++- git_upstream/lib/supersede.py | 22 +-- git_upstream/lib/utils.py | 5 +- git_upstream/log.py | 9 +- git_upstream/main.py | 22 ++- git_upstream/rebase_editor.py | 44 +++--- git_upstream/resources/todo_epilogue_1_7_5.txt | 18 +++ git_upstream/resources/todo_epilogue_2_6_0.txt | 19 +++ requirements.txt | 11 +- setup.cfg | 9 +- test-requirements.txt | 3 +- tox.ini | 9 +- 26 files changed, 660 insertions(+), 405 deletions(-) Requirements updates -------------------- diff --git a/requirements.txt b/requirements.txt index 9401cff..e93d264 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,9 @@ -pbr>=0.5.21,<1.0 - argcomplete -GitPython>=0.3.2.RC1,!=0.3.2 +# GitPython 1.0.1 required by openstack global-requirements +# python>=3 should work with >=0.3.4 +# python<3 should work with >=0.3.2.RC1,!=0.3.2 +GitPython>=1.0.1 # BSD License (3 clause) +# pbr 1.6 or newer required by openstack global-requirements +# >= 1.0.0 should be sufficient for compatibility +pbr>=1.6 # Apache-2.0 +six>=1.9.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 6db383b..63c4a34 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,8 +1,9 @@ -hacking>=0.9,<=0.10.0 +hacking>=0.11.0,<0.12 # Apache-2.0 loremipsum mock!=1.1.1,<=1.3.0 Sphinx>=1.1.2,<1.2 discover +coverage>=3.6 # Apache-2.0 fixtures>=0.3.14 python-subunit testrepository>=0.0.17 -- Regards, Darragh Bailey IRC: electrofelix "Nothing is foolproof to a sufficiently talented fool" - Unknown (probably Douglas Adams)
0xCDD2EB9C.asc
Description: application/pgp-keys
signature.asc
Description: OpenPGP digital signature
__________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev