Merge branch 'master' into develop

Author: todofixthis

.travis.yml

@@ -11,7 +11,7 @@ deploy:
     python: '3.6'
     tags: true
   provider: pypi
-  distribution: 'bdist_wheel sdist'
+  distributions: 'bdist_wheel sdist'
   skip_upload_docs: true
   user: phx
   password:

README.rst

@@ -4,10 +4,6 @@
 =====
 PyOTA
 =====
-.. warning::
-   ⚠️ This is pre-release software; it may have performance or stability issues.
-   Please do not use this software on mainnet until v2.0.0 stable is released. ⚠️
-
 This is the official Python library for the IOTA Core.
 
 It implements both the `official API`_, as well as newly-proposed functionality
@@ -32,13 +28,9 @@ PyOTA is compatible with Python 3.6, 3.5 and 2.7.
 ============
 Installation
 ============
-.. warning::
-   ⚠️ This is pre-release software; it may have performance or stability issues.
-   Please do not use this software on mainnet until v2.0.0 stable is released. ⚠️
-
 To install the latest version::
 
-  pip install --pre pyota
+  pip install pyota
 
 Optional C Extension
 ====================
@@ -47,7 +39,7 @@ cryptography features significantly (speedups of **60x** are common!).
 
 To install this extension, use the following command::
 
-   pip install --pre pyota[ccurl]
+   pip install pyota[ccurl]
 
 
 Installing from Source
@@ -75,7 +67,7 @@ For the full documentation of this library, please refer to the
 `official API`_
 
 
-.. _Create virtualenv: https://virtualenvwrapper.readthedocs.io/
+.. _Create virtualenv: https://realpython.com/blog/python/python-virtual-environments-a-primer/
 .. _PyOTA Bug Tracker: https://github.com/iotaledger/iota.lib.py/issues
 .. _Slack: https://slack.iota.org/
 .. _dedicated forum: https://forum.iota.org/

iota/commands/extended/replay_bundle.py

@@ -47,7 +47,7 @@ def _execute(self, request):
       minWeightMagnitude  = min_weight_magnitude,
 
 
-      trytes = bundle.as_tryte_strings(head_to_tail=True),
+      trytes = bundle.as_tryte_strings(),
     )
 
 

iota/json.py

@@ -4,7 +4,7 @@
 
 from abc import ABCMeta, abstractmethod as abstract_method
 from json.encoder import JSONEncoder as BaseJsonEncoder
-from typing import Mapping, Iterable
+from typing import Iterable, Mapping, Text
 
 from six import with_metaclass
 

setup.py

@@ -21,7 +21,7 @@
   name        = 'PyOTA',
   description = 'IOTA API library for Python',
   url         = 'https://github.com/iotaledger/iota.lib.py',
-  version     = '2.0.0b2',
+  version     = '2.0.0',
 
   long_description = long_description,
 
@@ -66,7 +66,7 @@
   license = 'MIT',
 
   classifiers = [
-    'Development Status :: 4 - Beta',
+    'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
     'License :: OSI Approved :: MIT License',
     'Programming Language :: Python :: 2',

test/commands/extended/replay_bundle_test.py

@@ -593,10 +593,19 @@ def test_happy_path(self):
       })
 
     send_trytes_response = {
-      'trytes': bundle.as_tryte_strings(head_to_tail=True),
+      'trytes': bundle.as_tryte_strings(),
     }
 
-    mock_send_trytes = mock.Mock(return_value=send_trytes_response)
+    def mock_send_trytes(_,request):
+      """
+      Ensures that the correct trytes are sent to the ``sendTrytes`` command
+      to replay the bundle.
+
+      References:
+        - https://github.com/iotaledger/iota.lib.py/issues/74
+      """
+      self.assertEqual(request['trytes'], send_trytes_response['trytes'])
+      return send_trytes_response
 
     with mock.patch(
         'iota.commands.extended.get_bundles.GetBundlesCommand._execute',