Merge pull request #19 from madebr/master

Add **kwargs to functions that return a builder + remove shebang

.travis.yml

@@ -2,13 +2,15 @@ matrix:
   fast_finish: true
   include:
   - os: linux
+    dist: xenial
     sudo: false
     language: python
     python: '2.7'
   - os: linux
+    dist: xenial
     sudo: false
     language: python
-    python: '3.6'
+    python: '3.7'
   - os: osx
     language: generic
     osx_image: xcode9

bincrafters/__init__.py

@@ -1 +1,3 @@
+# -*- coding: utf-8 -*-
+
 __version__ = '0.17.9'

bincrafters/build_paths.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-BINCRAFTERS_REPO_URL = "https://api.bintray.com/conan/bincrafters/public-conan"
+BINCRAFTERS_REPO_URL = "https://api.bintray.com/conan/bincrafters/public-conan"

bincrafters/build_shared.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import os

bincrafters/build_template_boost_default.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import os
@@ -20,7 +19,8 @@ def add_boost_shared(build):
 def get_builder(shared_option_name=None,
                 pure_c=False,
                 dll_with_static_runtime=False,
-                build_policy=None):
+                build_policy=None,
+                **kwargs):
 
     # Bincrafters default is to upload only when stable, but boost is an exception
     # Empty string allows boost packages upload for testing branch
@@ -31,7 +31,8 @@ def get_builder(shared_option_name=None,
             shared_option_name=shared_option_name,
             pure_c=pure_c,
             dll_with_static_runtime=dll_with_static_runtime,
-            build_policy=build_policy)
+            build_policy=build_policy,
+            **kwargs)
         builder.builds = map(add_boost_shared, builder.items)
 
         return builder

bincrafters/build_template_boost_header_only.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import os

bincrafters/build_template_default.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from bincrafters import build_shared
@@ -7,7 +6,8 @@
 def get_builder(shared_option_name=None,
                 pure_c=True,
                 dll_with_static_runtime=False,
-                build_policy=None):
+                build_policy=None,
+                **kwargs):
 
     builder = build_shared.get_builder(build_policy)
     if shared_option_name is None and build_shared.is_shared():
@@ -16,6 +16,7 @@ def get_builder(shared_option_name=None,
     builder.add_common_builds(
         shared_option_name=shared_option_name,
         pure_c=pure_c,
-        dll_with_static_runtime=dll_with_static_runtime)
+        dll_with_static_runtime=dll_with_static_runtime,
+        **kwargs)
 
     return builder

bincrafters/build_template_header_only.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from bincrafters import build_shared

bincrafters/build_template_installer.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from bincrafters import build_shared

examples/build_header_only.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from bincrafters import build_template_header_only

examples/build_shared_library.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 from bincrafters import build_template_default

tests/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

tests/conanfile.py

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 from conans import ConanFile
 from conans import tools
 

tests/test_package_tools.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import os

tests/test_shared_option.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 import tempfile