Fix requirements for ci, cover deprecation

Author: penguinolog

.travis.yml

@@ -12,8 +12,6 @@ install:
 script: tox
 after_success:
   - coveralls
-before_deploy:
-  - pip install -r CI_REQUIREMENTS.txt
 deploy:
   - provider: pypi
     distributions: sdist bdist_wheel

CI_REQUIREMENTS.txt

@@ -37,7 +37,7 @@
 
 # pylint: disable=ungrouped-imports, no-name-in-module
 if six.PY34:
-    from ._logwrap3 import logwrap, LogWrap, async_logwrap, AsyncLogWrap
+    from ._log_wrap3 import logwrap, LogWrap, async_logwrap, AsyncLogWrap
 
     __all__ += ('async_logwrap', 'AsyncLogWrap')
 else:

logwrap/__init__.py

@@ -706,7 +706,42 @@ def setUpClass(cls):
              )
         cls.loop = namespace['loop']
 
-    def test_coroutine_async(self, logger):
+    @mock.patch('warnings.warn', autospec=True)
+    def test_class_deprecation(self, warn, logger):
+        namespace = {'logwrap': logwrap, 'loop': self.loop}
+
+        exec("""
+import asyncio
+
+@logwrap.AsyncLogWrap
+@asyncio.coroutine
+def func():
+    pass
+
+loop.run_until_complete(func())
+        """,
+             namespace
+             )
+        # While we're not expanding result coroutine object from namespace,
+        # do not check execution result
+        logger.assert_has_calls((
+            mock.call.log(
+                level=logging.DEBUG,
+                msg="Awaiting: \n'func'()"
+            ),
+            mock.call.log(
+                level=logging.DEBUG,
+                msg="Done: 'func' with result:\nNone"
+            )
+        ))
+
+        warn.assert_called_once_with(
+            'AsyncLogWrap is deprecated. Functionality is merged into LogWrap',
+            DeprecationWarning
+        )
+
+    @mock.patch('warnings.warn', autospec=True)
+    def test_func_deprecation(self, warn, logger):
         namespace = {'logwrap': logwrap, 'loop': self.loop}
 
         exec("""
@@ -717,6 +752,40 @@ def test_coroutine_async(self, logger):
 def func():
     pass
 
+loop.run_until_complete(func())
+        """,
+             namespace
+             )
+        # While we're not expanding result coroutine object from namespace,
+        # do not check execution result
+        logger.assert_has_calls((
+            mock.call.log(
+                level=logging.DEBUG,
+                msg="Awaiting: \n'func'()"
+            ),
+            mock.call.log(
+                level=logging.DEBUG,
+                msg="Done: 'func' with result:\nNone"
+            )
+        ))
+
+        warn.assert_called_once_with(
+            'async_logwrap is deprectaed. '
+            'Functionality is merged into logwrap',
+            DeprecationWarning
+        )
+
+    def test_coroutine_async(self, logger):
+        namespace = {'logwrap': logwrap, 'loop': self.loop}
+
+        exec("""
+import asyncio
+
+@logwrap.logwrap
+@asyncio.coroutine
+def func():
+    pass
+
 loop.run_until_complete(func())
         """,
              namespace
@@ -748,7 +817,7 @@ def test_coroutine_async_as_argumented(self, logger):
         exec("""
 import asyncio
 
-@logwrap.async_logwrap(log=new_logger)
+@logwrap.logwrap(log=new_logger)
 @asyncio.coroutine
 def func():
     pass
@@ -776,7 +845,7 @@ def test_coroutine_fail(self, logger):
         exec("""
 import asyncio
 
-@logwrap.async_logwrap
+@logwrap.logwrap
 @asyncio.coroutine
 def func():
     raise Exception('Expected')
@@ -815,7 +884,7 @@ def test_exceptions_blacklist(self, logger):
         exec("""
 import asyncio
 
-@logwrap.async_logwrap(log=new_logger, blacklisted_exceptions=[TypeError])
+@logwrap.logwrap(log=new_logger, blacklisted_exceptions=[TypeError])
 @asyncio.coroutine
 def func():
     raise TypeError('Blacklisted')

logwrap/_logwrap3.py renamed to logwrap/_log_wrap3.py

@@ -18,16 +18,20 @@ deps =
     pytest
     pytest-cov
     pytest-sugar
-    py27: funcsigs>=1.0
-    pypy: funcsigs>=1.0
     py27: mock
     pypy: mock
-    py34: typing
+    {[base_deps]deps}
 
 commands =
     py.test -vv --junitxml=unit_result.xml --cov-config .coveragerc --cov-report html --cov=logwrap {posargs:test}
     coverage report --fail-under 90
 
+[base_deps]
+deps =
+    py27: funcsigs>=1.0
+    pypy: funcsigs>=1.0
+    py34: typing
+
 [testenv:venv]
 commands = {posargs:}
 
@@ -52,15 +56,15 @@ commands = pep257 logwrap
 
 [testenv:install]
 deps =
-    -r{toxinidir}/CI_REQUIREMENTS.txt
+    {[base_deps]deps}
 usedevelop = False
 commands = pip install ./ -vvv -U
 
 [testenv:pylint]
 basepython = python3.5
 deps =
     pylint
-    -r{toxinidir}/CI_REQUIREMENTS.txt
+    funcsigs>=1.0
 commands = pylint logwrap
 
 [flake8]
@@ -84,14 +88,14 @@ count = True
 [testenv:docs]
 deps =
     sphinx
-    -r{toxinidir}/CI_REQUIREMENTS.txt
+    {[base_deps]deps}
 commands = python setup.py build_sphinx
 
 [testenv:upload_docs]
 deps =
     sphinx
     sphinx-pypi-upload
-    -r{toxinidir}/CI_REQUIREMENTS.txt
+    {[base_deps]deps}
 commands = python setup.py build_sphinx upload_sphinx
 
 [testenv:bandit]