Skip to content

Commit

Permalink
Merge pull request #1 from gregorynicholas/3.0.0-updates
Browse files Browse the repository at this point in the history
3.0.0 updates
  • Loading branch information
gregorynicholas committed May 23, 2013
2 parents b364068 + 89be6d1 commit 058262b
Show file tree
Hide file tree
Showing 6 changed files with 575 additions and 338 deletions.
39 changes: 39 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@

Version 3.0.0
----------------------

Released on 2013-05-23

* removed: keybump-git-changelog
* added more options
* git tag + commit + push is not done optionally by specifying:
skip_tag, skip_commit, skip_push respectively
* script fails when there is uncommitted junk in the repo
* refactored quite a bit of the code to make it a bit more OOP


Version 2.0.2
----------------------

Released on 2013-05-23

* CHANGES.md added to repo
* added changelog summary for 2.0.1
* minor updates to project README.md
* renamed: keybump.py -> keybump. updated setup script
* renamed: git-changelog -> keybump-git-changelog
* git tag list fix
* changed git tag list command to sort by authordate
* added some parsing of the git summaries
* remove merge commits and commits with potentially bad messages


Version 2.0.1
----------------------

Released on 2013-03-15

* git tag list fix
* changed `git tag list` sub-command to sort by authordate
* pypi script added to repo
* updated gitignore to match distribute generated files
20 changes: 12 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Requirements

keybump requires the following in order to run properly:

* `Python >= 2.5 <http://www.python.org/download>`_
* `python >= 2.5 <http://www.python.org/download>`_
* `git >= 1.8 <http://www.python.org/download>`_

Preparation
-----------
Expand Down Expand Up @@ -42,6 +43,7 @@ Usage

keybump [options] <dir>


Examples
^^^^^^^^

Expand All @@ -61,15 +63,17 @@ Examples

keybump -s 1.0.2 /path/to/git/repo


Options
^^^^^^^

-h, --help show this help message and exit
-t {m,n,p}, --type {m,n,p}
version bump type:
m = major - x.0.0
n = minor - 1.y.0
p = patch - 1.0.z
-h, --help show this help message and exit
--b --bump {major ,minor, patch}
version bump type:
major: [x].x.x
minor: x.[x].x
patch: x.x.[x]

-s SET, --set SET set arbitrary version number
-p PATTERN, --pattern PATTERN
search pattern when setting arbitrary version number
Expand All @@ -94,4 +98,4 @@ LIMITATIONS
LICENSE
-------

bump is distributed under the `MIT License <http://opensource.org/licenses/mit-license.php>`_.
keybump is distributed under the `MIT License <http://opensource.org/licenses/mit-license.php>`_.
37 changes: 0 additions & 37 deletions git-changelog

This file was deleted.

Loading

0 comments on commit 058262b

Please sign in to comment.