From cbcf2cef8de55ce8ee4635df01d513ba3ec41c47 Mon Sep 17 00:00:00 2001 From: Carlos Zoido Date: Mon, 28 Oct 2019 14:08:00 +0100 Subject: [PATCH] Fix requests library proxies link and incorrect remove section message (#5972) * Added required = True to subparsers in order to print error message in Py2 and Py3. * sync * basic concurrent upload at reference level with futures * revert changes * add line * Lock buggy urllib3 (#5808) * app simplifying (#5806) * Apply lockfile before updating downstream requires (#5771) * apply graph_lock before looking for overrides * first step: get rid of the warning * cleaner if graph_lock is passed to the function * only update requires upstream if no lockfile is applied * fix tests * Deprecation of CONAN_USERNAME and CONAN_CHANNEL: fix error message (#5756) * if CONAN_USERNAME and CONAN_CHANNEL are deprecated, the error cannot recommend them * update tests accordingly * test client load() file method (#5815) * no user/channel repr without _ (#5817) * no user/channel repr without _ * minor fixes * fix tests * Remove py34 (#5820) * fix upload package id (#5824) * - update macOS, watchOS, tvOS, iOS version numbers (#5823) * Refresh token client support. (#5662) * Refresh token client support. Missing tests. Missing migration * public method * WIP * Refresh almost there * Removed prints * Try migrate * Migration * Add comment * Refresh token flow following RFC recommentations * Refresh ok * review * Remove traces * Refactor capabilities * Removed tmp file * Review * #5819 Show warning message for Python 3.4 (#5829) * #5819 Show warning message for Python 3.4 - Add new warning message for python 3.4 which is no longer supported - Added funcional tests to validate both python 3.4 and 2.x Signed-off-by: Uilian Ries * #5819 Fix broken tests Signed-off-by: Uilian Ries * Add cpp_info.name to cmake and pkg_config generators (#5598) * Add cpp_info.name to cmake generators * Fix unit tests to mimic real behavior * cmake_paths test * add test for cmake generator * Add cmake_find_package test * fix test in py3 * Applied cpp_info.name to pkg_config generator * check different name in pkg_config * sync with develop * fix link * remove https * remove https * fix links * remove proxies message * clarify missing section --- conans/client/conf/__init__.py | 5 ++--- conans/test/functional/command/config_install_test.py | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conans/client/conf/__init__.py b/conans/client/conf/__init__.py index 7a24c52dbce..4280a4f80b5 100644 --- a/conans/client/conf/__init__.py +++ b/conans/client/conf/__init__.py @@ -157,9 +157,8 @@ path = ./data [proxies] -# Empty section will try to use system proxies. -# If don't want proxy at all, remove section [proxies] -# As documented in http://docs.python-requests.org/en/latest/user/advanced/#proxies - but see below +# Empty (or missing) section will try to use system proxies. +# As documented in https://requests.kennethreitz.org/en/latest/user/advanced/#proxies - but see below # for proxies to specific hosts # http = http://user:pass@10.10.1.10:3128/ # http = http://10.10.1.10:3128 diff --git a/conans/test/functional/command/config_install_test.py b/conans/test/functional/command/config_install_test.py index 4957440c8bf..bf429235018 100644 --- a/conans/test/functional/command/config_install_test.py +++ b/conans/test/functional/command/config_install_test.py @@ -52,9 +52,8 @@ default_package_id_mode = full_package_mode # environment CONAN_DEFAULT_PACKAGE_ID_MODE [proxies] -# Empty section will try to use system proxies. -# If don't want proxy at all, remove section [proxies] -# As documented in http://docs.python-requests.org/en/latest/user/advanced/#proxies +# Empty (or missing) section will try to use system proxies. +# As documented in https://requests.kennethreitz.org/en/latest/user/advanced/#proxies http = http://user:pass@10.10.1.10:3128/ https = None # http = http://10.10.1.10:3128