Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump urllib3 version to 1.26.6 #9405

Merged
merged 3 commits into from Aug 16, 2021
Merged

Bump urllib3 version to 1.26.6 #9405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fe9147
Bump urllib3 version to 1.26.6
tapia Jul 30, 2021
c69b6dc
Merge branch 'develop' into update-urllib3
tapia Aug 10, 2021
0d6f4ae
fake commit to relaunch jenkins
tapia Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions README.rst
View file
Open in desktop
Expand Up @@ -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).
Expand Down Expand Up @@ -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**
Expand Down Expand Up @@ -250,4 +250,3 @@ License


.. _`pip docs`: https://pip.pypa.io/en/stable/installation/

3 changes: 1 addition & 2 deletions conans/requirements.txt
View file
Open in desktop
@@ -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
Expand All @@ -14,4 +14,3 @@ deprecation>=2.0, <2.1
tqdm>=4.28.1, <5
Jinja2>=2.9, <3
python-dateutil>=2.7.0, <3