Merge branch 'release/1.5.1'

CHANGELOG.rst

@@ -1,4 +1,10 @@
-Version 1.5.0 ()
+Version 1.5.1 (08-03-2015)
+===========================================================
+
+*   Bugfix: Readme was not updated properly
+*   Bugfix: Some Python 2.6 tests failed
+
+Version 1.5.0 (08-03-2015)
 ===========================================================
 
 *   Feature: Added a new mode called "exact" where items

README.rst

@@ -12,7 +12,7 @@ Requirements
 ------------
 
 - Linux, BSD, OSX - Something not windows
-- rTorrent and Deluge
+- rTorrent, Deluge and Transmission
 - Python 2.6, 2.7, 3.3, 3.4
 - Shell / SSH / Putty
 
@@ -59,7 +59,7 @@ NFOs and other small files that makes a difference in the torrents.
 client
 ~~~~~~
 
--  client - torrent client to use, choices are: rtorrent and deluge
+-  client - torrent client to use, choices are: rtorrent, deluge and transmission
 
 rtorrent settings
 *****************
@@ -76,6 +76,10 @@ deluge settings
 - username - deluge rpc username
 - password - deluge rpc password
 
+transmission settings
+*********************
+- url - an url where transmission can be reached, e.g. http://username:password@127.0.0.1:9091
+
 disks
 ~~~~~
 

autotorrent/clients/tests/test_transmission.py

@@ -61,6 +61,6 @@ def _add_torrent_with_links(self, letters):
 
     def test_add_torrent_complete(self):
         self.assertTrue(self._add_torrent_with_links(['a', 'b', 'c']))
-        self.assertIn(2, self.client._torrents)
+        self.assertTrue((2 in self.client._torrents))
         self.assertEqual(self.client._torrents[2]['paused'], False)
 

setup.py

@@ -13,7 +13,7 @@ def read_description():
 
 setup(
     name='autotorrent',
-    version='1.5.0',
+    version='1.5.1',
     description='AutoTorrent allows easy cross-seeding',
     long_description=read_description(),
     author='Anders Jensen',