Figuring out the correct version number

README.rst

@@ -7,34 +7,37 @@ Search all topics on a GroupServer site
 
 :Author: `Michael JasonSmith`_
 :Contact: Michael JasonSmith <mpj17@onlinegroups.net>
-:Date: 2013-03-26
+:Date: 2014-10-28
 :Organization: `GroupServer.org`_
 :Copyright: This document is licensed under a
-  `Creative Commons Attribution-Share Alike 3.0 New Zealand License`_
-  by `OnlineGroups.Net`_.
+  `Creative Commons Attribution-Share Alike 4.0 International License`_
+  by `OnlineGroups.net`_.
 
 Introduction
 ============
 
-This egg provides the core support for searching topics. Actually, that is
-a lie. This egg provides a couple of viewlets that show the topics on the
-site homepage. That is all.
+This product provides the core support for searching
+topics. Actually, that is a lie. This egg provides a couple of
+viewlets that show the topics on the site homepage. That is all.
 
 TODO
 ====
 
-Move the topic-searching code from ``Products.GSSearch`` here.
+Move the topic-searching code from ``Products.GSSearch``
+[#gssearch]_ to here.
 
 Resources
 =========
 
-- Code repository: https://source.iopen.net/groupserver/gs.search.topic/
+- Code repository: https://github.com/groupserver/gs.search.topic/
 - Questions and comments to http://groupserver.org/groups/development/
 - Report bugs at https://redmine.iopen.net/projects/groupserver/
 
+.. [#gssearch] See
+               <https://github.com/groupserver/Products.GSSearch/>
 .. _GroupServer.org: http://groupserver.org/
 .. _Michael JasonSmith: http://groupserver.org/p/mpj17
-.. _Creative Commons Attribution-Share Alike 3.0 New Zealand License:
-   http://creativecommons.org/licenses/by-sa/3.0/nz/
+..  _Creative Commons Attribution-Share Alike 4.0 International License:
+    http://creativecommons.org/licenses/by-sa/4.0/
 .. _GroupServer: http://groupserver.org/
-.. _OnlineGroups.Net: http://onlinegroups.net/
+.. _OnlineGroups.met: http://onlinegroups.net/

docs/HISTORY.rst

@@ -1,3 +1,71 @@
 Changelog
 =========
 
+2.4.0 (2014-10-28)
+------------------
+
+* Adding internationalisation
+* Using GitHub_ as the main code repository, and naming the
+  reStructuredText files as such.
+
+.. _GitHub: https://github.com/groupserver/gs.search.topics/
+
+
+2.3.1 (2014-06-24)
+------------------
+
+* Fixing the WAI-ARIA roles
+
+2.3.0 (2014-03-14)
+------------------
+
+* Switching to strict-mode for the JavaScript
+
+2.2.2 (2013-11-26)
+------------------
+
+* Switching to the new loading-character
+* Updating the JavaScript
+
+2.2.1 (2013-07-12)
+------------------
+
+* Moving the ``Newer`` button and ``Older`` button to the correct
+  place
+
+2.2.0 (2013-06-04)
+------------------
+
+* Adding data-icons
+
+2.1.1 (2013-03-26)
+------------------
+
+* Adding a minified version of the JavaScript
+
+2.1.0 (2013-02-28)
+------------------
+
+* WAI-ARIA, Bootstrap update
+* Refactoring the JavaScript
+
+2.0.1 (2012-12-17)
+------------------
+
+* Fixing the JavaScript
+
+2.0.0 (2012-06-06)
+------------------
+
+* Switching to the generic JavaScript search code, provided by
+  `gs.search.base`_
+* Changing to the new Activities tab on the site homepage
+* Rearrange the page if no topics are shown
+
+.. _gs.search.base: http://github.com/groupserver/gs.search.base
+
+
+1.0.0 (2012-02-16)
+------------------
+
+* Initial version

setup.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-##############################################################################
+############################################################################
 #
-# Copyright © 2013, 2014 OnlineGroups.net and Contributors.
+# Copyright © 2012, 2013, 2014 OnlineGroups.net and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -11,7 +11,7 @@
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
-##############################################################################
+############################################################################
 import codecs
 import os
 from setuptools import setup, find_packages
@@ -21,10 +21,12 @@
 
 with codecs.open('README.rst', encoding='utf-8') as f:
     long_description = f.read()
-with codecs.open(os.path.join("docs", "HISTORY.rst"), encoding='utf-8') as f:
+with codecs.open(os.path.join("docs", "HISTORY.rst"),
+                 encoding='utf-8') as f:
     long_description += '\n' + f.read()
 
-setup(name='gs.search.topic',
+setup(
+    name='gs.search.topic',
     version=version,
     description="Searching topics on GroupServer.",
     long_description=long_description,
@@ -38,7 +40,7 @@
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python",
         "Topic :: Software Development :: Libraries :: Python Modules",
-      ],
+    ],
     keywords='site, groupserver, topic, message, search',
     author='Michael JasonSmith',
     author_email='mpj17@onlinegroups.net',

version.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-version = '2.0.0'
+version = '2.4.0'
 release = False
 
-#-----------------------------------------------------------------------------#
+#--------------------------------------------------------------------------#
 import sys
 if (sys.version_info < (3, )):
     from commands import getstatusoutput
@@ -29,7 +29,7 @@ def execute_command(commandstring):
 def parse_version_from_package():
     try:
         pkginfo = os.path.join(glob.glob('*.egg-info')[0],
-                                         'PKG-INFO')
+                               'PKG-INFO')
     except:
         pkginfo = ''
 
@@ -53,7 +53,8 @@ def get_version():
         commitdate = execute_command(c)
         # convert date to UTC unix timestamp, using the date command because
         # python date libraries do not stabilise till about 2.6
-        timestamp = int(execute_command('date -d"%s" --utc +%%s' % commitdate))
+        dateCommand = 'date -d"%s" --utc +%%s' % commitdate
+        timestamp = int(execute_command(dateCommand))
 
         # finally we have something we can use!
         dt = datetime.datetime.utcfromtimestamp(timestamp)
@@ -64,8 +65,8 @@ def get_version():
             version_string = "%s.dev%s-%s" % (version, datestring, globalid)
 
     except (CommandError, ValueError, TypeError):
-        # --=mpj17=-- Usually because we are building out a source-egg, rather
-        # than from a Hg source-directory.
+        # --=mpj17=-- Usually because we are building out a source-egg,
+        # rather than from a Hg source-directory.
         version_string = parse_version_from_package()
 
     return version_string