Merge branch 'release/0.17.0-beta1'

conan-io · Apr 24, 2018 · 244b3f5 · 244b3f5
2 parents 9e32883 + 1cc083f
commit 244b3f5
Show file tree

Hide file tree

Showing 39 changed files with 2,216 additions and 1,268 deletions.
diff --git a/.ci/appveyor/install.bat b/.ci/appveyor/install.bat
@@ -1,5 +1,5 @@
 SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%
 SET PYTHONPATH=%PYTHONPATH%;%CD%
 SET CONAN_TEST_SUITE=1
-%PYTHON%/Scripts/pip.exe install -r conan/requirements_test.txt
-%PYTHON%/Scripts/pip.exe install -r conan/requirements.txt
+%PYTHON%/Scripts/pip.exe install -r cpt/requirements_test.txt
+%PYTHON%/Scripts/pip.exe install -r cpt/requirements.txt
diff --git a/.ci/appveyor/test.bat b/.ci/appveyor/test.bat
@@ -1,3 +1,3 @@
 conan user
 mkdir %HOMEPATH%/.conan/data
-nosetests conan.test
+nosetests cpt.test --nocapture
diff --git a/.ci/travis/install.sh b/.ci/travis/install.sh
@@ -45,5 +45,5 @@ else
     sudo apt-get install gcc-multilib g++-multilib
 fi
 
-pip install -r conan/requirements.txt
-pip install -r conan/requirements_test.txt
+pip install -r cpt/requirements.txt
+pip install -r cpt/requirements_test.txt
diff --git a/.ci/travis/run.sh b/.ci/travis/run.sh
@@ -12,4 +12,4 @@ fi
 
 conan user
 mkdir ~/.conan/data
-nosetests conan.test
+nosetests cpt.test --nocapture
diff --git a/README.md b/README.md
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,10 @@
 environment:
   matrix:
     - PYTHON: "C:\\Python27"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PYTHON: "C:\\Python35"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+
 build: false
 install:
   - .ci/appveyor/install.bat

diff --git a/conan/__init__.py b/conan/__init__.py
@@ -1,2 +0,0 @@
-
-__version__ = '0.16.5'

diff --git a/conan/create_runner.py b/conan/create_runner.py