Fixes AttributeError: module 'urllib3.connectionpool' has no attribute 'VerifiedHTTPSConnection' (#1994)

pablomarin · tracyboehrer · web-flow · commit 80b35727f35b · 2023-05-23T07:14:04.000-05:00
* Update requirements.txt

* Update requirements.txt

* Update setup.py

* Update setup.py

* Update requirements.txt

* Update setup.py

* Update setup.py

* Fixing security dependencies with cryptography, django and flask packages

* edit gitignore

* remove unnecesary files

---------

Co-authored-by: tracyboehrer &lt;tracyboehrer@users.noreply.github.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # Python cache
 __pycache__/
 *.pyc
+.ipynb_checkpoints/
 
 # Virtual environment
 env*/
@@ -67,4 +68,4 @@ src/build
 *.pubxml
 
 # [begoldsm] ignore virtual env if it exists.
-adlEnv/
+adlEnv/
diff --git a/libraries/botbuilder-adapters-slack/requirements.txt b/libraries/botbuilder-adapters-slack/requirements.txt
@@ -1,4 +1,4 @@
-aiohttp==3.7.4
+aiohttp==3.8.4
 pyslack
 botbuilder-core==4.15.0
-slackclient
+slackclient
diff --git a/libraries/botbuilder-ai/setup.py b/libraries/botbuilder-ai/setup.py
@@ -8,7 +8,7 @@
     "azure-cognitiveservices-language-luis==0.2.0",
     "botbuilder-schema==4.15.0",
     "botbuilder-core==4.15.0",
-    "aiohttp>=3.6.2,<3.8.0",
+    "aiohttp==3.8.4",
 ]
 
 TESTS_REQUIRES = ["aiounittest>=1.1.0"]
diff --git a/libraries/botbuilder-applicationinsights/setup.py b/libraries/botbuilder-applicationinsights/setup.py
@@ -12,9 +12,9 @@
 ]
 TESTS_REQUIRES = [
     "aiounittest==1.3.0",
-    "django==3.2.16",  # For samples
+    "django==3.2.17",  # For samples
     "djangorestframework==3.10.3",  # For samples
-    "flask==1.1.1",  # For samples
+    "flask==2.2.5",  # For samples
 ]
 
 root = os.path.abspath(os.path.dirname(__file__))
diff --git a/libraries/botbuilder-core/requirements.txt b/libraries/botbuilder-core/requirements.txt
@@ -4,5 +4,5 @@ botbuilder-schema==4.15.0
 botframework-streaming==4.15.0
 requests==2.27.1
 PyJWT==2.4.0
-cryptography==3.3.2
+cryptography==39.0.1
 aiounittest==1.3.0
diff --git a/libraries/botbuilder-dialogs/requirements.txt b/libraries/botbuilder-dialogs/requirements.txt
@@ -4,5 +4,5 @@ botbuilder-schema==4.15.0
 botbuilder-core==4.15.0
 requests==2.27.1
 PyJWT==2.4.0
-cryptography==3.3.2
+cryptography==39.0.1
 aiounittest==1.3.0
diff --git a/libraries/botbuilder-integration-aiohttp/requirements.txt b/libraries/botbuilder-integration-aiohttp/requirements.txt
@@ -1,4 +1,4 @@
 msrest==0.6.*
 botframework-connector==4.15.0
 botbuilder-schema==4.15.0
-aiohttp==3.8.3
+aiohttp==3.8.4
diff --git a/libraries/botbuilder-integration-aiohttp/setup.py b/libraries/botbuilder-integration-aiohttp/setup.py
@@ -10,7 +10,7 @@
     "botframework-connector==4.15.0",
     "botbuilder-core==4.15.0",
     "yarl<=1.4.2",
-    "aiohttp>=3.6.2,<3.8.0",
+    "aiohttp==3.8.4",
 ]
 
 root = os.path.abspath(os.path.dirname(__file__))
diff --git a/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py b/libraries/botbuilder-integration-applicationinsights-aiohttp/setup.py
@@ -6,7 +6,7 @@
 
 REQUIRES = [
     "applicationinsights>=0.11.9",
-    "aiohttp>=3.6.2,<3.8.0",
+    "aiohttp==3.8.4",
     "botbuilder-schema==4.15.0",
     "botframework-connector==4.15.0",
     "botbuilder-core==4.15.0",
diff --git a/libraries/botbuilder-schema/setup.py b/libraries/botbuilder-schema/setup.py
@@ -6,7 +6,8 @@
 
 NAME = "botbuilder-schema"
 VERSION = os.environ["packageVersion"] if "packageVersion" in os.environ else "4.15.0"
-REQUIRES = ["msrest==0.6.*"]
+REQUIRES = ["msrest==0.6.*",
+            "urllib3<2.0.0"]
 
 root = os.path.abspath(os.path.dirname(__file__))
 
diff --git a/libraries/botframework-connector/requirements.txt b/libraries/botframework-connector/requirements.txt
@@ -2,5 +2,5 @@ msrest==0.6.*
 botbuilder-schema==4.15.0
 requests==2.27.1
 PyJWT==2.4.0
-cryptography==3.3.2
+cryptography==39.0.1
 msal==1.*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"azure-cognitiveservices-language-luis==0.2.0",`
`9`	`9`	`"botbuilder-schema==4.15.0",`
`10`	`10`	`"botbuilder-core==4.15.0",`
`11`		`- "aiohttp>=3.6.2,<3.8.0",`
	`11`	`+ "aiohttp==3.8.4",`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`TESTS_REQUIRES = ["aiounittest>=1.1.0"]`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`]`
`13`	`13`	`TESTS_REQUIRES = [`
`14`	`14`	`"aiounittest==1.3.0",`
`15`		`- "django==3.2.16", # For samples`
	`15`	`+ "django==3.2.17", # For samples`
`16`	`16`	`"djangorestframework==3.10.3", # For samples`
`17`		`- "flask==1.1.1", # For samples`
	`17`	`+ "flask==2.2.5", # For samples`
`18`	`18`	`]`
`19`	`19`
`20`	`20`	`root = os.path.abspath(os.path.dirname(__file__))`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"botframework-connector==4.15.0",`
`11`	`11`	`"botbuilder-core==4.15.0",`
`12`	`12`	`"yarl<=1.4.2",`
`13`		`- "aiohttp>=3.6.2,<3.8.0",`
	`13`	`+ "aiohttp==3.8.4",`
`14`	`14`	`]`
`15`	`15`
`16`	`16`	`root = os.path.abspath(os.path.dirname(__file__))`