Merge pull request #3 from conan-io/develop

Merge commit from conan-io.

README.rst

@@ -15,17 +15,17 @@ Decentralized, open-source (MIT), C/C++ package manager.
 Conan is a package manager for C and C++ developers:
 
 - It is fully decentralized. Users can host their packages in their servers, privately. Integrates with Artifactory and Bintray.
-- Portable. Works across all platforms, including Linux, OSX, Windows (with native and first class support, WSL, MinGW),
-  Solaris, FreeBSD, embedded and cross compiling, docker, WSL
-- Manage binaries. It is able to create, upload and download binaries for any configuration and platform,
+- Portable. Works across all platforms, including Linux, OSX, Windows (with native and first-class support, WSL, MinGW),
+  Solaris, FreeBSD, embedded and cross-compiling, docker, WSL
+- Manage binaries. It can create, upload and download binaries for any configuration and platform,
   even cross-compiling, saving lots of time in development and continuous integration. The binary compatibility
-  can be configured and customized. Manage all your artifacts in exactly the same way in all platforms.
-- Integrates with any build system, including any propietary and custom one. Provides tested support for major build systems
+  can be configured and customized. Manage all your artifacts in the same way on all platforms.
+- Integrates with any build system, including any proprietary and custom one. Provides tested support for major build systems
   (CMake, MSBuild, Makefiles, Meson, etc).
-- Extensible: Its python based recipes, together with extensions points allows for a great power and flexibility.
-- Large and active community, specially in Github (https://github.com/conan-io/conan) and Slack (https://cpplang.now.sh/ #conan channel).
-  This community also create and maintains packages in Conan-center and Bincrafters repositories in Bintray.
-- Stable. Used in production by many companies, since 1.0 there is a committment not to break package recipes and documented behavior. 
+- Extensible: Its python based recipes, together with extensions points allows for great power and flexibility.
+- Large and active community, especially in Github (https://github.com/conan-io/conan) and Slack (https://cpplang.now.sh/ #conan channel).
+  This community also creates and maintains packages in Conan-center and Bincrafters repositories in Bintray.
+- Stable. Used in production by many companies, since 1.0 there is a commitment not to break package recipes and documented behavior. 
 
 
 
@@ -112,7 +112,7 @@ You can run **conan** client and server in Windows, MacOS, and Linux.
       search     Searches package recipes and binaries in the local cache or in a remote.
     Creator commands
       new        Creates a new package recipe template with a 'conanfile.py'.
-      create     Builds a binary package for recipe (conanfile.py) located in current dir.
+      create     Builds a binary package for a recipe (conanfile.py) located in the current dir.
       upload     Uploads a recipe and binary packages to a remote.
       export     Copies the recipe (conanfile.py & associated files) to your local cache.
       export-pkg Exports a recipe & creates a package with given files calling 'package'.
@@ -123,7 +123,7 @@ You can run **conan** client and server in Windows, MacOS, and Linux.
       package    Calls your local conanfile.py 'package()' method.
     Misc commands
       profile    Lists profiles in the '.conan/profiles' folder, or shows profile details.
-      remote     Manages the remote list and the package recipes associated to a remote.
+      remote     Manages the remote list and the package recipes associated with a remote.
       user       Authenticates against a remote with user/pass, caching the auth token.
       imports    Calls your local conanfile.py or conanfile.txt 'imports' method.
       copy       Copies conan recipes and packages to another user/channel.
@@ -136,7 +136,7 @@ You can run **conan** client and server in Windows, MacOS, and Linux.
 Contributing to the project
 ===========================
 
-Feedback and contribution is always welcome in this project.
+Feedback and contribution are always welcome in this project.
 Please read our `contributing guide <https://github.com/conan-io/conan/blob/develop/.github/CONTRIBUTING.md>`_.
 
 Running the tests
@@ -149,7 +149,7 @@ Using tox
 
     $ tox
 
-It will install the needed requirements and launch `nose` skipping some heavy and slow test.
+It will install the needed requirements and launch `nose` skipping some heavy and slow tests.
 If you want to run the full test suite:
 
 .. code-block:: bash
@@ -214,7 +214,7 @@ These should work for OS X:
     $ export CONAN_COMPILER=clang
     $ export CONAN_COMPILER_VERSION=3.5
 
-Finally, there are some tests that use conan to package Go-lang
+Finally, some tests use conan to package Go-lang
 libraries, so you might **need to install go-lang** in your computer and
 add it to the path.
 
@@ -280,4 +280,4 @@ License
 
 .. _`pip docs`: https://pip.pypa.io/en/stable/installing/
 
-.. _`brew homepage`: http://brew.sh/
+.. _`brew homepage`: http://brew.sh/

conans/__init__.py

@@ -9,6 +9,7 @@
 from conans.model.conan_file import ConanFile
 from conans.model.options import Options
 from conans.model.settings import Settings
+from conans.model.compatible_package import CompatiblePackage
 from conans.util.files import load
 
 # complex_search: With ORs and not filtering by not restricted settings
@@ -20,4 +21,5 @@
 SERVER_CAPABILITIES = [COMPLEX_SEARCH_CAPABILITY, REVISIONS]  # Server is always with revisions
 DEFAULT_REVISION_V1 = "0"
 
-__version__ = '1.20.0-dev'
+__version__ = '1.21.0-dev'
+