Merge pull request #72 from Hwesta/agent-includes-version

Include bagit version in Bag-Software-Agent

Author: johnscancella

bagit.py

@@ -47,6 +47,8 @@
 
 LOGGER = logging.getLogger(__name__)
 
+VERSION = '1.5.4'
+
 # standard bag-info.txt metadata
 STANDARD_BAG_INFO_HEADERS = [
     'Source-Organization',
@@ -141,7 +143,7 @@ def make_bag(bag_dir, bag_info=None, processes=1, checksum=None):
             if 'Bagging-Date' not in bag_info:
                 bag_info['Bagging-Date'] = date.strftime(date.today(), "%Y-%m-%d")
             if 'Bag-Software-Agent' not in bag_info:
-                bag_info['Bag-Software-Agent'] = 'bagit.py <http://github.com/libraryofcongress/bagit-python>'
+                bag_info['Bag-Software-Agent'] = 'bagit.py v' + VERSION + ' <http://github.com/libraryofcongress/bagit-python>'
             bag_info['Payload-Oxum'] = Oxum
             _make_tag_file('bag-info.txt', bag_info)
 

setup.py

@@ -2,6 +2,8 @@
 
 from setuptools import setup
 
+import bagit
+
 if version < '2.6.0':
     print("python 2.6 or higher is required")
     exit(1)
@@ -24,10 +26,11 @@
 except:
     requirements.append("hashlib")
 
+version = bagit.VERSION
 
 setup(
     name = 'bagit',
-    version = '1.5.4',
+    version = version,
     url = 'https://libraryofcongress.github.io/bagit-python/',
     author = 'Ed Summers',
     author_email = '[email protected]',

test.py

@@ -303,7 +303,7 @@ def test_sha1_tagfile(self):
         info = {'Bagging-Date': '1970-01-01', 'Contact-Email': '[email protected]'}
         bag = bagit.make_bag(self.tmpdir, checksum=['sha1'], bag_info=info)
         self.assertTrue(os.path.isfile(j(self.tmpdir, 'tagmanifest-sha1.txt')))
-        self.assertEqual(bag.entries['bag-info.txt']['sha1'], 'd7f086508df433e5d7464b5a3835d5501df14404')
+        self.assertEqual(bag.entries['bag-info.txt']['sha1'], 'ec70407d895d4e550bc0a7ea40a82ad653d136e5')
 
     def test_validate_unreadable_file(self):
         bag = bagit.make_bag(self.tmpdir, checksum=["md5"])
@@ -360,15 +360,15 @@ def test_make_bag(self):
         self.assertTrue('Contact-Email: [email protected]' in bag_info_txt)
         self.assertTrue('Bagging-Date: 1970-01-01' in bag_info_txt)
         self.assertTrue('Payload-Oxum: 991765.5' in bag_info_txt)
-        self.assertTrue('Bag-Software-Agent: bagit.py <http://github.com/libraryofcongress/bagit-python>' in bag_info_txt)
+        self.assertTrue('Bag-Software-Agent: bagit.py v1.5.4 <http://github.com/libraryofcongress/bagit-python>' in bag_info_txt)
 
         # check tagmanifest-md5.txt
         self.assertTrue(os.path.isfile(j(self.tmpdir, 'tagmanifest-md5.txt')))
         with open(j(self.tmpdir, 'tagmanifest-md5.txt')) as tm:
             tagmanifest_txt = tm.read()
         self.assertTrue('9e5ad981e0d29adc278f6a294b8c2aca bagit.txt' in tagmanifest_txt)
         self.assertTrue('a0ce6631a2a6d1a88e6d38453ccc72a5 manifest-md5.txt' in tagmanifest_txt)
-        self.assertTrue('6a5090e27cb29d5dda8a0142fbbdf37e bag-info.txt' in tagmanifest_txt)
+        self.assertTrue('bfe59ad8af1a227d27c191b4178c399f bag-info.txt' in tagmanifest_txt)
 
     def test_make_bag_sha1_manifest(self):
         bagit.make_bag(self.tmpdir, checksum=['sha1'])