Merge branch 'develop' into issue-3130

conan-io · Sep 1, 2018 · 0f7d968 · 0f7d968
2 parents ac2129d + 860fb81
commit 0f7d968
Show file tree

Hide file tree

Showing 179 changed files with 5,537 additions and 2,786 deletions.
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
@@ -4,10 +4,10 @@ def slaves = ['Linux', 'Windows', 'Macos']
 
 def pyvers 
 if (env.BRANCH_NAME =~ /(^release.*)|(^master)/) {
-    pyvers = ['py36', 'py34', 'py27']
+    pyvers = ['py37', 'py36', 'py34', 'py27']
 }
 else{
-	pyvers = ['py36', 'py27']
+	pyvers = ['py37', 'py36', 'py27']
 }
 
 def module = "\"conans.test\""
@@ -28,6 +28,10 @@ try{
         def slave = x
         for (y in pyvers) {
             def pyver = y
+            if(slave != "Linux" && pyver=="py37"){
+                continue;
+            }
+
             builders["${slave} - ${pyver}"] = {
                 node(slave) {
                     stage("${slave} - ${pyver}"){
@@ -66,13 +70,13 @@ try{
                         }
 
                         if(slave == "Linux"){
+                            sh "docker pull lasote/conantests"
                             docker.image('lasote/conantests').inside("-e CONAN_USER_HOME=${sourcedir} -v${sourcedir}:${sourcedir}") {
                                 sh(script: "python ${runner} ${module} ${pyver} ${sourcedir} ${workdir} -e rest_api ${numcores}")
                             }
                         }
                         else if(slave == "Windows"){
                             try{
-
                               withEnv(["CONAN_TEST_FOLDER=${workdir}"]){
                                 bat(script: "python ${runner} ${module} ${pyver} ${sourcedir} \"${workdir}\" -e rest_api -e windows_ci_excluded ${numcores}")
                               }

diff --git a/.ci/jenkins/conf.py b/.ci/jenkins/conf.py
@@ -9,11 +9,12 @@
 
 macpylocation = {"py27": "/usr/bin/python",  # /Users/jenkins_ci/.pyenv/versions/2.7.11/bin/python",
                  "py34": "/Users/jenkins_ci/.pyenv/versions/3.4.7/bin/python",
-                 "py36": "/Users/jenkins_ci/.pyenv/versions/3.6.3/bin/python"}
+                 "py36": "/Users/jenkins_ci/.pyenv/versions/3.6.5/bin/python"}
 
 linuxpylocation = {"py27": "/usr/bin/python2.7",
                    "py34": "/usr/bin/python3.4",
-                   "py36": "/usr/bin/python3.6"}
+                   "py36": "/usr/bin/python3.6",
+                   "py37": "/usr/bin/python3.7"}
 
 
 def get_environ(tmp_path):

diff --git a/.ci/jenkins/runner.py b/.ci/jenkins/runner.py
@@ -29,7 +29,7 @@ def run_tests(module_path, pyver, source_folder, tmp_folder,
     debug_traces = ""  # "--debug=nose,nose.result" if platform.system() == "Darwin" and pyver != "py27" else ""
     # pyenv = "/usr/local/bin/python2"
     multiprocess = ("--processes=%s --process-timeout=1000 "
-                    "--process-restartworker --with-coverage" % num_cores) if platform.system() != "Darwin" or pyver == "py27" else ""
+                    "--process-restartworker --with-coverage" % num_cores)
 
     if num_cores <= 1:
         multiprocess = ""
@@ -65,7 +65,7 @@ def run_tests(module_path, pyver, source_folder, tmp_folder,
 
     env = get_environ(tmp_folder)
     env["PYTHONPATH"] = source_folder
-    env["CONAN_RECIPE_LINTER"] = "False"
+    # env["CONAN_RECIPE_LINTER"] = "False"
     env["CONAN_LOGGING_LEVEL"] = "50" if platform.system() == "Darwin" else "50"
     env["CHANGE_AUTHOR_DISPLAY_NAME"] = ""
     with chdir(source_folder):

diff --git a/.gitignore b/.gitignore
@@ -99,6 +99,7 @@ cacert.pem
 .bash_history
 .conan_server/
 .sudo_as_admin_successful
+.noseids
 
 # add excluded
 !conans/client/build
diff --git a/conans/__init__.py b/conans/__init__.py
@@ -13,7 +13,10 @@
 
 # complex_search: With ORs and not filtering by not restricted settings
 COMPLEX_SEARCH_CAPABILITY = "complex_search"
-SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]
+API_V2 = "api_v2"
+CHECKSUM_DEPLOY = "checksum_deploy"  # Only when v2
+REVISIONS = "revisions"  # Only when enabled in config, not by default look at server_launcher.py
+SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, API_V2]
 
-__version__ = '1.6.0-dev'
+__version__ = '1.7.1'
 
diff --git a/conans/client/build/autotools_environment.py b/conans/client/build/autotools_environment.py
@@ -133,12 +133,12 @@ def configure(self, configure_dir=None, args=None, build=None, host=None, target
 
         if pkg_config_paths:
             pkg_env = {"PKG_CONFIG_PATH":
-                       os.pathsep.join(get_abs_path(f, self._conanfile.install_folder)
-                                       for f in pkg_config_paths)}
+                       [os.pathsep.join(get_abs_path(f, self._conanfile.install_folder)
+                                       for f in pkg_config_paths)]}
         else:
             # If we are using pkg_config generator automate the pcs location, otherwise it could
             # read wrong files
-            pkg_env = {"PKG_CONFIG_PATH": self._conanfile.install_folder} \
+            pkg_env = {"PKG_CONFIG_PATH": [self._conanfile.install_folder]} \
                 if "pkg_config" in self._conanfile.generators else {}
 
         if self._conanfile.package_folder is not None:
@@ -174,6 +174,8 @@ def make(self, args="", make_program=None, target=None, vars=None):
                                 win_bash=self._win_bash, subsystem=self.subsystem)
 
     def install(self, args="", make_program=None, vars=None):
+        if not self._conanfile.should_install:
+            return
         self.make(args=args, make_program=make_program, target="install", vars=vars)
 
     def _configure_link_flags(self):