merges with latest

.github/workflows/pre-commit-hook-run.yml

@@ -22,8 +22,9 @@ jobs:
               run: |
                 python3 -m venv venv
                 source venv/bin/activate
-                pip install "cython<3.0.0" wheel
-                pip install "PyYAML==5.4.1" --no-build-isolation
+                python3 -m pip install setuptools
+                python3 -m pip install "cython<3.0.0" wheel
+                python3 -m pip install "PyYAML==5.4.1" --no-build-isolation
                 make dev-install && rm -rf src
             - name: Make a dummy change to README.md
               run: |

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-<<<<<<< HEAD
+
 ## [0.25.0] - 2024-09-18
 
 ### Breaking changes
@@ -18,7 +18,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Session recipe's error handlers take an extra param of recipe_user_id as well
 - Session recipe, removes `validate_claims_in_jwt_payload` that is exposed to the user.
 - TODO..
-=======
+
+## [0.24.4] - 2024-10-16
+
+- Updates `phonenumbers` and `twilio` to latest versions
+
+>>>>>>> 0.24
 ## [0.24.3] - 2024-09-24
 
 - Adds support for form field related improvements by making fields accept any type of values

Makefile

@@ -10,7 +10,7 @@ format:
 	black .
 
 check-lint:
-	pyright supertokens_python tests examples && pylint supertokens_python tests examples
+	pyright supertokens_python tests examples && pylint --disable=too-many-positional-arguments --load-plugins=pylint.extensions.no_self_use supertokens_python tests examples 
 
 set-up-hooks:
 	cp hooks/pre-commit.sh .git/hooks/pre-commit

dev-requirements.txt

@@ -1,7 +1,6 @@
 aiosmtplib>=1.1.6,<4.0.0
 anyio==3.5.0
 asgiref==3.5.2
-astroid==2.9.3
 attrs==21.4.0
 black==22.3.0
 certifi==2021.10.8
@@ -41,7 +40,7 @@ nodeenv==1.6.0
 packaging==21.3
 pathspec==0.9.0
 pdoc3==0.10.0
-phonenumbers==8.12.48
+phonenumbers==8.13.47
 pkce==1.0.3
 platformdirs==2.5.1
 pluggy==1.0.0
@@ -51,7 +50,7 @@ pycparser==2.21
 pycryptodome==3.10.4
 pydantic==1.9.0
 PyJWT==2.6.0
-pylint==2.12.2
+pylint==3.3.1
 pyparsing==3.0.7
 pyright==1.1.236
 pyrsistent==0.18.1
@@ -75,7 +74,7 @@ starlette==0.14.2
 tldextract==3.1.0
 toml==0.10.2
 tomli==2.0.1
-twilio==7.9.1
+twilio==9.3.3
 types-pytz==2021.3.6
 types-PyYAML==6.0.5
 typing_extensions==4.1.1

setup.py

@@ -127,8 +127,8 @@
         "asgiref>=3.4.1,<4",
         "typing_extensions>=4.1.1,<5.0.0",
         "Deprecated==1.2.13",
-        "phonenumbers==8.12.48",
-        "twilio==7.9.1",
+        "phonenumbers==8.13.47",
+        "twilio==9.3.3",
         "aiosmtplib>=1.1.6,<4.0.0",
         "pkce==1.0.3",
     ],

test-pre-commit.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+python3 -m venv venv
+source venv/bin/activate
+pip3 install "cython<3.0.0" wheel
+pip3 install "PyYAML==5.4.1" --no-build-isolation
+make dev-install && rm -rf src

tests/emailpassword/test_emaildelivery.py

@@ -392,7 +392,7 @@ async def test_reset_password_smtp_service(driver_config_client: TestClient):
     def smtp_service_override(oi: SMTPServiceInterface[EmailTemplateVars]):
         async def send_raw_email_override(
             content: EmailContent,
-            user_context: Dict[
+            user_context: Dict[  # pylint: disable=unused-argument
                 str, Any
             ],  # pylint: disable=unused-argument,  # pylint: disable=unused-argument
         ):

tests/utils.py

@@ -160,6 +160,7 @@ def setup_multitenancy_feature(host: str = "localhost", port: str = "3567"):
         json={
             "licenseKey": OPAQUE_KEY_WITH_MULTITENANCY_FEATURE,
         },
+        timeout=10,
     )