Merge branch 'feature/bleadvertismentwatcher' into develop

# Conflicts: # bleak/backends/bluezdbus/client.py # bleak/backends/client.py # bleak/backends/dotnet/client.py
hbldh · Apr 12, 2019 · b658f52 · b658f52
2 parents 894b5fa + c4ccf91
commit b658f52
Show file tree

Hide file tree

Showing 6 changed files with 1,993 additions and 95 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -102,9 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
-   https://travis-ci.org/hbldh/bleak/pull_requests
-   and make sure that the tests pass for all supported Python versions.
+3. The pull request should work for Python 3.5+.
 
 Tips
 ----

diff --git a/bleak/__version__.py b/bleak/__version__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "0.4.1a1"
+__version__ = "0.4.1a2"