diff --git a/README.rst b/README.rst index b54f79b1bed..5661ab8bc2b 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ Conan is a package manager for C and C++ developers: - 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 + 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 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). @@ -59,7 +59,7 @@ You can run **Conan** client and server in Windows, MacOS, and Linux. .. code-block:: bash $ git clone https://github.com/conan-io/conan.git conan-io - + NOTE: repository directory name matters, some directories are known to be problematic to run tests (e.g. `conan`). `conan-io` directory name was tested and guaranteed to be working. - **Install in editable mode** @@ -250,4 +250,3 @@ License .. _`pip docs`: https://pip.pypa.io/en/stable/installation/ - diff --git a/conans/requirements.txt b/conans/requirements.txt index aa9bc09b2f6..a51226cc434 100644 --- a/conans/requirements.txt +++ b/conans/requirements.txt @@ -1,6 +1,6 @@ PyJWT>=1.4.0, <2.0.0 requests>=2.8.1, <3.0.0 -urllib3>=1.25.8, <1.26 +urllib3>=1.26.6, <1.27 colorama>=0.3.3, <0.5.0 PyYAML>=3.11, <6.0 patch-ng>=1.17.4, <1.18 @@ -14,4 +14,3 @@ deprecation>=2.0, <2.1 tqdm>=4.28.1, <5 Jinja2>=2.9, <3 python-dateutil>=2.7.0, <3 -