Skip to content

Commit

Permalink
Merge branch '1.2'
Browse files Browse the repository at this point in the history
Conflicts:
	fabric/version.py
  • Loading branch information
bitprophet committed Aug 22, 2011
2 parents 2d205c0 + 04e9063 commit aa4551c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions docs/_templates/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
span.changelog-support {color: #4070A0;}
span.changelog-bug {color: #A04040;}
span.changelog-feature {color: #40A056;}
a.changelog-release {font-weight: bold;}
</style>
{% endblock %}
3 changes: 3 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ would have also been included in the 1.2 line.
Changelog
=========

* :release:`1.2.1 <2011-08-21>`
* :release:`1.1.3 <2011-08-21>`
* :release:`1.0.3 <2011-08-21>`
* :bug:`417` :ref:`abort-on-prompts` would incorrectly abort when set to True,
even if both password and host were defined. This has been fixed. Thanks to
Valerie Ishida for the report.
Expand Down
9 changes: 7 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ def release_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
"""
Invoked as :release:`N.N.N <YYYY-MM-DD>`.
Turns into: <b>YYYY-MM-DD</b>: released <b>Fabric N.N.N</b>
Turns into: <b>YYYY-MM-DD</b>: released <b><a>Fabric N.N.N</a></b>, with
the link going to the Github source page for the tag.
"""
# Make sure year has been specified
match = year_arg_re.match(text)
Expand All @@ -70,7 +71,11 @@ def release_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
return [
nodes.strong(text=date),
nodes.inline(text=": released "),
nodes.strong(text="Fabric %s" % number)
nodes.reference(
text="Fabric %s" % number,
refuri="https://github.com/fabric/fabric/tree/%s" % number,
classes=['changelog-release']
)
], []
roles.register_local_role('release', release_role)

Expand Down
5 changes: 3 additions & 2 deletions fabric/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
from os.path import abspath, dirname


VERSION = (1, 3, 0, 'alpha', 0)


def git_sha():
loc = abspath(dirname(__file__))
p = Popen(
Expand All @@ -21,8 +24,6 @@ def git_sha():
return p.communicate()[0]


VERSION = (1, 3, 0, 'alpha', 0)

def get_version(form='short'):
"""
Return a version string for this package, based on `VERSION`.
Expand Down

0 comments on commit aa4551c

Please sign in to comment.