summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--combox/_version.py27
-rw-r--r--setup.py6
-rw-r--r--tests/_version_test.py37
4 files changed, 68 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c6f338..d08e3d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2015-12-21 Siddharth Ravikumar <sravik@bgsu.edu>
* MANIFEST.in: Added it.
+ * combox/_version.py: Added it.
2015-12-21 Siddharth Ravikumar <sravik@bgsu.edu>
diff --git a/combox/_version.py b/combox/_version.py
new file mode 100644
index 0000000..00ebf1d
--- /dev/null
+++ b/combox/_version.py
@@ -0,0 +1,27 @@
+# Copyright (C) 2015 Combox author(s). See AUTHORS.
+#
+# This file is part of Combox.
+#
+# Combox is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Combox is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Combox (see COPYING). If not, see
+# <http://www.gnu.org/licenses/>.
+
+__version__ = "0.1"
+__release__ = "3"
+
+
+def get_version():
+ """
+ Returns full version number.
+ """
+ return "%s.%s" % (__version__, __release__)
diff --git a/setup.py b/setup.py
index cd3f0ab..d4387f2 100644
--- a/setup.py
+++ b/setup.py
@@ -19,13 +19,13 @@
from setuptools import setup, find_packages
from combox.file import read_file
-
+from combox._version import get_version
config = {
'name': 'combox',
'description': 'Splits encrypted files between online file storage providers',
'long_description': read_file('README.rst'),
- 'version': '0.1.3',
+ 'version': get_version(),
'platforms': ['GNU/Linux', 'OS X'],
'license': 'GNU General Public License version 3 or later',
'url': 'https://ricketyspace.net/combox/',
@@ -34,7 +34,7 @@ config = {
'author_email': 'sravik@bgsu.edu',
'install_requires': ['watchdog', 'PyYAML', 'pycrypto',
'simplejson', 'pickledb'],
- 'tests_require': ['nose'],
+ 'tests_require': ['nose', 'mock'],
'test_suite': 'nose.collector',
'packages': find_packages(exclude=['tests']),
'entry_points': {
diff --git a/tests/_version_test.py b/tests/_version_test.py
new file mode 100644
index 0000000..92034eb
--- /dev/null
+++ b/tests/_version_test.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2015 Combox author(s). See AUTHORS.
+#
+# This file is part of Combox.
+#
+# Combox is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Combox is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Combox (see COPYING). If not, see
+# <http://www.gnu.org/licenses/>.
+
+import mock
+
+import combox._version
+
+from nose.tools import *
+
+from combox._version import get_version
+
+
+def test_get_version():
+ """
+ Testing combox._version.get_version()
+ """
+ with mock.patch('combox._version.__version__', '0.9'), \
+ mock.patch('combox._version.__release__', '.423'):
+
+ version = "%s.%s" % (combox._version.__version__,
+ combox._version.__release__)
+ assert get_version() == version