Merge pull request #5 from cfhamlet/develop

compat os-config 0.2.2

Author: cfhamlet

.coveragerc

@@ -7,3 +7,4 @@ source = os_m3_engine
 source =
     src/os_m3_engine
     .tox/*/lib/python*/site-packages/os_m3_engine
+    .tox/*/site-packages/os_m3_engine

.travis.yml

@@ -3,25 +3,22 @@ sudo: false
 matrix:
   include:
   - python: 2.7
-    env: TOXENV=py27
+    env: TOXENV=py27,codecov
   - python: 3.6
-    env: TOXENV=py36
+    env: TOXENV=py36,codecov
   - python: pypy
     env: TOXENV=pypy
   - python: pypy3
     env: TOXENV=pypy3
-  - env: TOXENV=coverage
 install:
-- pip install -U pip tox codecov
+- pip install -U pip tox
 script:
 - tox
-after_success:
-- codecov
 deploy:
   provider: pypi
   user: cfhamlet
   password:
     secure: UyRk0TWj/RARDioa5+o8VlNTojY3hvYT9ILHi7Twnxl3f9EX/9gAuxNr7A5hGfklwQD3TrAd/mS8NyvulJj1xAWEPG4XDfeqlqAjQO8ziZEn6Ozqd/aSyCjVu6WPDluxj4kjxsXebmmDcdtX206FVgdqsG6DoT3ZZ54SeRIsuBCS2A+IlXqj4vpkKwOWhI3CGeygV4GFtOjQIRQbfejPMht1hMv/eFIXdp1fNgXpzA38JwBa40Z3vyHX5QLNLT0ShL3c0D9KRkRbrBG29kcjyUdcOwp1Hb+WUCSw1oar3fEqLabbQtw8zxPD2IDl/teygCmUGC0ldqHM6y6FeF38UPsdcXiOwyh6BjQ6ezba8vw68Moe5sacoROBkApn0JqSKsFKSqKAatQEyfgHEvjWpJklQZXC7ikq4yd5TsGoZq0DHbPFot35zFYWFKDaq92k+I/rEPoly87gfQVa6OXI7IsCzo/WvTNwA9H9xd/guu3re/yOCLoc/5NTJZZotPdRuJaMwWNNY8Y9h03vvG0uxEMw1Sp4drmclkJvFZ41F8iGzrY1Yh2lZ4kSiQ5Zuy4Iij7fLkb7es44lcUIbnNPakn0tgDYw3utGeKi08fmvuvsK91SD8d8jIdZjPnS3W3CdZ0Bi1yTnblK6Z4GQOT4mSx9vzYH05X2rGXM6TkFHV8=
   true:
     tags: true
-    condition: ${TOXENV} == py27
+    condition: ${TRAVIS_PYTHON_VERSION} == 2.7

requirements.txt

@@ -1,2 +1,2 @@
 six
-os-config>0.1
+os-config>=0.2.2

src/os_m3_engine/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

src/os_m3_engine/launcher.py

@@ -21,7 +21,7 @@
 )
 
 ENGINE_TRANSPORT_BRIDGE_CONFIG = Config.create()
-ENGINE_TRANSPORT_BRIDGE_CONFIG.update(ENGINE_TRANSPORT_CONFIG)
+Config.update(ENGINE_TRANSPORT_BRIDGE_CONFIG, ENGINE_TRANSPORT_CONFIG)
 ENGINE_TRANSPORT_BRIDGE_CONFIG.driver_cls = 'os_m3_engine.core.transport.BridgeDriver'
 
 ENGINE_BACKEND_CONFIG = Config.create(
@@ -48,7 +48,7 @@ def _queue_size(custorm_config, default_config, thread_num):
 
 def combine_with_default_config(default_config, custom_config):
     c = Config.create()
-    c.update(default_config)
+    Config.update(c, default_config)
     if custom_config is not None:
         for k, _ in default_config:
             if hasattr(custom_config, k):

tox.ini

@@ -4,21 +4,33 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py36, pypy, pypy3, coverage
+envlist = py{27,36,py,py3}, coverage-report
 
-[testenv]
-commands =
-    pytest {posargs}
+[base]
 deps = 
-    pytest >= 2.10
+    pytest > 2.10
+    coverage
+    pytest-env
 
-[testenv:coverage]
+[testenv]
 commands = 
-    coverage erase
-    coverage run -m pytest {posargs}
+    coverage run -m pytest {posargs:}
+deps = 
+    {[base]deps}
+
+[testenv:coverage-report]
+deps = coverage
+skip_install = true
+commands =
     coverage combine
     coverage report
-deps = 
-    coverage
-    pytest >= 2.10
-    pytest-env
+
+[testenv:codecov]
+passenv = CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_*
+deps = codecov
+skip_install = true
+commands =
+    coverage combine
+    coverage report
+    codecov
+