Merge branch 'main' into verify-and-change-email

jagadeesh545 · web-flow · commit e85d7b506249 · 2026-05-19T19:45:39.000-05:00
diff --git a/requirements.txt b/requirements.txt
@@ -12,5 +12,5 @@ google-api-core[grpc] >= 2.25.1, < 3.0.0dev; platform.python_implementation != '
 google-cloud-firestore >= 2.21.0; platform.python_implementation != 'PyPy'
 google-cloud-storage >= 3.1.1
 pyjwt[crypto] >= 2.10.1
-cryptography < 44.0.0; platform_python_implementation == 'PyPy' and python_version < '3.11'
+cryptography < 44.0.0; platform.python_implementation == 'PyPy' and python_version < '3.11'
 httpx[http2] == 0.28.1
diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
     'google-cloud-firestore>=2.21.0; platform.python_implementation != "PyPy"',
     'google-cloud-storage>=3.1.1',
     'pyjwt[crypto] >= 2.10.1',
-    'cryptography < 44.0.0; platform_python_implementation == "PyPy" and python_version < "3.11"',
+    'cryptography < 44.0.0; platform.python_implementation == "PyPy" and python_version < "3.11"',
     'httpx[http2] == 0.28.1',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`'google-cloud-firestore>=2.21.0; platform.python_implementation != "PyPy"',`
`43`	`43`	`'google-cloud-storage>=3.1.1',`
`44`	`44`	`'pyjwt[crypto] >= 2.10.1',`
`45`		`- 'cryptography < 44.0.0; platform_python_implementation == "PyPy" and python_version < "3.11"',`
	`45`	`+ 'cryptography < 44.0.0; platform.python_implementation == "PyPy" and python_version < "3.11"',`
`46`	`46`	`'httpx[http2] == 0.28.1',`
`47`	`47`	`]`
`48`	`48`