From 71fd8d5030267da295ffb170127f9ae568757fe9 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Mon, 31 Dec 2012 16:31:48 -0800 Subject: [PATCH 1/2] version numbers for 1.0rc2 release --- beets/__init__.py | 2 +- docs/changelog.rst | 8 ++++++-- docs/conf.py | 2 +- setup.py | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/beets/__init__.py b/beets/__init__.py index 1e826d660..49870a3e4 100644 --- a/beets/__init__.py +++ b/beets/__init__.py @@ -12,7 +12,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -__version__ = '1.0rc2-dev' +__version__ = '1.0rc2' __author__ = 'Adrian Sampson ' import beets.library diff --git a/docs/changelog.rst b/docs/changelog.rst index 4305f8e35..89a776190 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,8 +1,12 @@ Changelog ========= -1.0rc2 (in development) ------------------------ +1.0rc2 (December 31, 2012) +-------------------------- + +This second release candidate follows quickly after rc1 and fixes a few small +bugs found since that release. There were a couple of regressions and some bugs +in a newly added plugin. * :doc:`/plugins/echonest_tempo`: If the Echo Nest API limit is exceeded or a communication error occurs, the plugin now waits and tries again instead of diff --git a/docs/conf.py b/docs/conf.py index 19e4a7336..578011eac 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,7 +13,7 @@ project = u'beets' copyright = u'2012, Adrian Sampson' version = '1.0' -release = '1.0rc2-dev' +release = '1.0rc2' pygments_style = 'sphinx' diff --git a/setup.py b/setup.py index eb43b6eb8..b624b559c 100755 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ if 'sdist' in sys.argv: shutil.copytree(os.path.join(docdir, '_build', 'man'), mandir) setup(name='beets', - version='1.0rc2-dev', + version='1.0rc2', description='music tagger and library organizer', author='Adrian Sampson', author_email='adrian@radbox.org', From 46508fec48fedd80ca1e4e50bdc163d01a0d17e2 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Mon, 31 Dec 2012 16:34:51 -0800 Subject: [PATCH 2/2] Added tag 1.0rc2 for changeset f3cd4c138c6f --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index e69bb6762..d68499b99 100644 --- a/.hgtags +++ b/.hgtags @@ -14,3 +14,4 @@ b6c10981014a5b3a963460fca3b31cc62bf7ed2c 1.0b13 d3dbc6df2b96f8ba5704305a893e3e63b7f9cd77 1.0b14 618201431990382474829cf96ea58e3669159f9a 1.0b15 c84744f4519be7416dc1653142f1763f406d6896 1.0rc1 +f3cd4c138c6f40dc324a23bf01c4c7d97766477e 1.0rc2