Update Conan conventions [build=outdated]

Automatically created by bincrafters-conventions 0.13.0
bincrafters · Oct 31, 2019 · a0533b2 · a0533b2
1 parent e399726
commit a0533b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,15 +34,15 @@ matrix:
         env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7
       - <<: *linux
         env: CONAN_CLANG_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/clang8
-      - <<: *osx
-        osx_image: xcode9
-        env: CONAN_APPLE_CLANG_VERSIONS=9.0
       - <<: *osx
         osx_image: xcode9.4
         env: CONAN_APPLE_CLANG_VERSIONS=9.1
       - <<: *osx
         osx_image: xcode10.3
         env: CONAN_APPLE_CLANG_VERSIONS=10.0
+      - <<: *osx
+        osx_image: xcode11
+        env: CONAN_APPLE_CLANG_VERSIONS=11.0
 
 install:
   - chmod +x .ci/install.sh

diff --git a/conanfile.py b/conanfile.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from conans import ConanFile, AutoToolsBuildEnvironment, tools
 import os
 
@@ -25,6 +22,7 @@ class PixmanConan(ConanFile):
 
     def config_options(self):
         del self.settings.compiler.libcxx
+        del self.settings.compiler.cppstd
         if self.settings.compiler == "Visual Studio":
             del self.options.shared
         if self.settings.os == 'Windows':

diff --git a/test_package/conanfile.py b/test_package/conanfile.py
@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
 from conans import ConanFile, CMake, tools, RunEnvironment
 import os