Merge branch 'release/0.18.0'

.ci/travis/install.sh

@@ -32,6 +32,10 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             pyenv install 3.5.0
             pyenv virtualenv 3.5.0 conan
             ;;
+        py36)
+            pyenv install 3.6.0
+            pyenv virtualenv 3.6.0 conan
+            ;;
 
     esac
     pyenv rehash

.ci/travis/run.sh

@@ -10,4 +10,4 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
     pyenv activate conan
 fi
 
-nosetests
+nosetests --with-coverage

.codecov.yml

@@ -0,0 +1,33 @@
+codecov:
+  notify:
+    require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "85...100"
+
+  status:
+    project: yes
+    patch: yes
+    changes: no
+
+  notify:
+    slack:
+      default:
+        url: "https://hooks.slack.com/services/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"
+        threshold: 1% # allow coverage to drop by 1% without posting
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "header, diff"
+  behavior: default
+  require_changes: no
+

.coveragerc

@@ -0,0 +1,6 @@
+[run]
+omit =
+    *conanfile.py*
+
+include = 
+    *conans*

.travis.yml

@@ -1,9 +1,9 @@
 language: python
 python:
     - 2.7
-    - 3.3
     - 3.4
     - 3.5
+    - 3.6
 os: linux
 sudo: required
 dist: trusty
@@ -16,10 +16,6 @@ matrix:
         - language: generic
           os: osx
           env: PYVER=py27 CONAN_COMPILER=apple-clang CONAN_COMPILER_VERSION=6.0
-
-        - language: generic
-          os: osx
-          env: PYVER=py33 CONAN_COMPILER=apple-clang CONAN_COMPILER_VERSION=6.0
 
         - language: generic
           os: osx
@@ -29,6 +25,10 @@ matrix:
           os: osx
           env: PYVER=py35 CONAN_COMPILER=apple-clang CONAN_COMPILER_VERSION=6.0
 
+        - language: generic
+          os: osx
+          env: PYVER=py36 CONAN_COMPILER=apple-clang CONAN_COMPILER_VERSION=6.0
+
 # command to install dependencies
 install:
   - ./.ci/travis/install.sh
@@ -37,4 +37,8 @@ before_script:
   - export CONAN_LOGGING_LEVEL=10
 # command to run tests
 script: 
+  - ulimit -n 2048 # Error with py3 and OSX, max file descriptors
   - ./.ci/travis/run.sh
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

README.rst

@@ -9,8 +9,17 @@ A distributed, open source, package manager.
 | |Build Status1|        | |Build Status2|         | |Build status3|      | |Build status4|       |
 +------------------------+-------------------------+----------------------+-----------------------+
 
++------------------------+---------------------------+--------------------------------------------------+
+| **Coverage develop**   | **Coverage master**       | **Coverage graph**                               |
++========================+===========================+==================================================+
+| |Develop coverage|     | |Master coverage|         |      |Coverage graph|                            |
++------------------------+---------------------------+--------------------------------------------------+
+
+
+
+
 Setup
-=====
+======
 
 From binaries
 -------------
@@ -82,8 +91,8 @@ Development:
 
     $ sudo pip install -r conans/requirements_dev.txt
 
-Running the tests on Ubuntu
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Running the tests
+~~~~~~~~~~~~~~~~~~
 
 Make sure that the Python requirements have been installed.
 
@@ -94,6 +103,13 @@ variables first.
 
     $ export PYTHONPATH=$PYTHONPATH:$(pwd)
 
+
+On Windows it would be (while being in the conan root directory):
+
+::
+
+    $ export PYTHONPATH=.
+
 Ensure that your ``cmake`` has version 2.8 or later. You can see the
 version with the following command:
 
@@ -120,7 +136,7 @@ These should work for OS X:
     $ export CONAN_COMPILER_VERSION=3.5
 
 Finally, there are some tests that use conan to package Go-lang
-libraries, so you would **need to install go-lang** in your computer and
+libraries, so you might **need to install go-lang** in your computer and
 add it to the path.
 
 You can run the actual tests like this:
@@ -129,7 +145,15 @@ You can run the actual tests like this:
 
     $ nosetests .
 
-About one minute later it should print ``OK``:
+
+There are a couple of test attributes defined, as ``slow``, or ``golang`` that you can use
+to filter the tests, and do not execute them:
+
+::
+
+    $ nosetests . -a !golang
+
+A few minutes later it should print ``OK``:
 
 ::
 
@@ -192,4 +216,12 @@ License
    :target: https://ci.appveyor.com/project/ConanCIintegration/conan/branch/develop
 .. _`pip docs`: https://pip.pypa.io/en/stable/installing/
 .. _`brew homepage`: http://brew.sh/
+.. |Develop coverage| image:: https://codecov.io/gh/conan-io/conan/branch/develop/graph/badge.svg
+   :target: https://codecov.io/gh/conan-io/conan/branch/develop
+.. |Master coverage| image:: https://codecov.io/gh/conan-io/conan/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/conan-io/conan/branch/master
+.. |Coverage graph| image:: https://codecov.io/gh/conan-io/conan/branch/develop/graphs/tree.svg
+   :height: 50px
+   :width: 50 px
+   :alt: Conan develop coverage
 

appveyor.yml

@@ -3,14 +3,14 @@ build: false
 environment:
   matrix:
     - PYTHON: "C:\\Python27"
-    - PYTHON: "C:\\Python33"
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python35"
 
 init:
   - "ECHO %PYTHON%"
 
 install:
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "set PYTHONPATH=%PYTHONPATH%;%CD%"
   - "set CONAN_LOGGING_LEVEL=10"
   - "set CONAN_COMPILER=Visual Studio"
@@ -20,4 +20,8 @@ install:
   - "%PYTHON%/Scripts/pip.exe install -r conans/requirements_server.txt"
 
 test_script:
-  - "%PYTHON%/Scripts/nosetests"
+  - "nosetests --with-coverage"
+
+after_test:
+  - "codecov"
+

conans/__init__.py

@@ -13,5 +13,5 @@
 COMPLEX_SEARCH_CAPABILITY = "complex_search"
 SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, ]
 
-__version__ = '0.17.2'
+__version__ = '0.18.0'
 

conans/client/cmake.py

@@ -40,7 +40,8 @@ def _generator(self):
                         '10': '10 2010',
                         '11': '11 2012',
                         '12': '12 2013',
-                        '14': '14 2015'}
+                        '14': '14 2015',
+                        '15': '15 2017'}
             str_ver = str(self._settings.compiler.version)
             base = "Visual Studio %s" % _visuals.get(str_ver, "UnknownVersion %s" % str_ver)
             if arch == "x86_64":