Merge branch 'release/0.30.1'

.gitignore

@@ -1,3 +1,5 @@
+cover
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

.travis.yml

@@ -13,17 +13,7 @@ jobs:
       env: TOXENV=py37-conan-latest
       dist: xenial
 
-    - stage: Conan Development - Linux
-      if: branch != master
-      python: 2.7
-      env: TOXENV=py27-conan-dev
-    - python: 3.7
-      if: branch != master
-      env: TOXENV=py37-conan-dev
-      dist: xenial
-
-    # Macos is slow, only if everything has passed
-    - stage: Macos - all Conan versions
+    - stage: Conan Latest - Macos
       language: generic
       os: osx
       osx_image: xcode8.3
@@ -33,6 +23,17 @@ jobs:
       osx_image: xcode8.3
       env: PYVER=py37 TOXENV=py37-conan-latest
 
+    - stage: Conan Development - Linux
+      if: branch != master AND branch !~ /release*/
+      python: 2.7
+      env: TOXENV=py27-conan-dev
+    - python: 3.7
+      if: branch != master AND branch !~ /release*/
+      env: TOXENV=py37-conan-dev
+      dist: xenial
+
+
+
 install:
   - .ci/travis/install.sh
 

README.md

@@ -317,7 +317,7 @@ Or you can directly iterate the builds to do any change. EX: Remove the GCC 4.6
         filtered_builds = []
         for settings, options, env_vars, build_requires, reference in builder.items:
             if settings["compiler.version"] != "4.6" and settings["build_type"] != "Debug":
-                 filtered_builds.append([settings, options, env_vars, build_requires])
+                 filtered_builds.append([settings, options, env_vars, build_requires, reference])
         builder.builds = filtered_builds
         builder.run()
 

cpt/__init__.py

@@ -1,6 +1,6 @@
 
-__version__ = '0.30.0'
-NEWEST_CONAN_SUPPORTED = "1.21.0-dev"
+__version__ = '0.30.1'
+NEWEST_CONAN_SUPPORTED = "1.20.100"
 
 
 def get_client_version():

cpt/builds_generator.py

@@ -401,7 +401,7 @@ def get_linux_gcc_builds(gcc_versions, archs, shared_option_name, pure_c, build_
                         else:
                             ret.append(get_build("gcc", arch, build_type_it, gcc_version, None,
                                                  None, options, reference))
-        return ret
+    return ret
 
 
 def get_linux_clang_builds(clang_versions, archs, shared_option_name, pure_c, build_types, cppstds,