Merge pull request #109 from ttmc/last-pr-before-v0.7.1

Last commit before releasing v0.7.1
bigchaindb · Aug 28, 2018 · a73526f · a73526f
2 parents 9ef2f12 + 1892cf0
commit a73526f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,8 +1,28 @@
 Changelog
 =========
 
-0.6.0.dev1 (2017-07-06)
------------------------
+0.7.1 (2018-08-28)
+------------------
+
+Changed
+^^^^^^^
+* Update setup.py to use ``cryptography~=2.3.1``
+* Update setup.py to use ``base58~=1.0.0``, also update code using ``base58``
+* Licensing info
+* README.rst content
+
+Fixed
+^^^^^
+* Example code in ``examples/ed25519_example.py``: thanks to @Chuseuiti
+
+0.7.0 (2018-02-28)
+------------------
+
+Note: The above heading used to say "0.6.0.dev1 (2017-07-06)"
+but that was a mistake, because it was added
+in commit 9ca4648ef47cc99305d753a337c8ff9db9d80a5a
+which contained the message "Update changelog for 0.7.0 release".
+
 Changed
 ^^^^^^^
 * Upgrade to ``pyasn1~=0.4``.

diff --git a/cryptoconditions/version.py b/cryptoconditions/version.py
@@ -1,2 +1,2 @@
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 __short_version__ = '0.7'