Merge branch 'release/1.31' into develop

madebr · Nov 11, 2020 · 2014801 · 2014801
2 parents 315f355 + b7e147a
commit 2014801
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/conans/client/migrations_settings.py b/conans/client/migrations_settings.py
@@ -1813,5 +1813,6 @@
 
 settings_1_31_0 = settings_1_30_2
 settings_1_31_1 = settings_1_31_0
+settings_1_31_2 = settings_1_31_1
 
-settings_1_32_0 = settings_1_31_1
+settings_1_32_0 = settings_1_31_2
diff --git 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.4,!=1.25.5
+urllib3<1.26, !=1.25.4, !=1.25.5
 colorama>=0.3.3, <0.5.0
 PyYAML>=3.11, <6.0
 patch-ng>=1.17.4, <1.18