Merge remote-tracking branch 'upstream/master'

crossbario · Oct 20, 2018 · 1b20fb9 · 1b20fb9
2 parents eea9b54 + 82d8e07
commit 1b20fb9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/autobahn/_version.py b/autobahn/_version.py
@@ -24,4 +24,4 @@
 #
 ###############################################################################
 
-__version__ = u'18.9.2'
+__version__ = u'18.10.1'
diff --git a/autobahn/wamp/component.py b/autobahn/wamp/component.py
@@ -511,8 +511,10 @@ def _start(self, loop=None):
         # that fires when our "real" _done_f is completed.
         if self._done_f is not None:
             d = txaio.create_future()
+
             def _cb(arg):
                 txaio.resolve(d, arg)
+
             txaio.add_callbacks(self._done_f, _cb, _cb)
             return d
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -5,11 +5,15 @@
 Changelog
 =========
 
-master
-------
-
-* ...
+18.10.1
+-------
 
+* Don't eat Component.stop() request when crossbar not connected (#1066)
+* handle async on_progress callbacks properly (#1061)
+* fix attribute error when ConnectionResetError does not contain "reason" attribute (#1059)
+* infer rawsocket host, port from URL (#1056)
+* fix error on connection lost if no reason (reason = None) (#1055)
+* fixed typo on class name (#1054)
 
 18.9.2
 ------

diff --git a/tox.ini b/tox.ini
@@ -94,5 +94,3 @@ commands =
     flake8 --version
     ; These ignores will be removed when they are fixed and we are flake8-clean
     flake8 --ignore=E402,E501,E722,E741,N801,N802,N803,N805,N806 autobahn
-
-basepython = python3.6