From e826b124f78927a91321fd6baa72447efdf3c299 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Wed, 16 Oct 2024 10:19:05 +0530 Subject: [PATCH 1/8] fix: dependency downgrade for phonenumbers and twilio --- CHANGELOG.md | 4 ++++ setup.py | 6 +++--- supertokens_python/constants.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0761116e7..ad6d989c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] +## [0.24.4] - 2024-10-16 + +- Fixes dependency downgrade for `phonenumbers` and `twilio` + ## [0.24.3] - 2024-09-24 - Adds support for form field related improvements by making fields accept any type of values diff --git a/setup.py b/setup.py index b8c913000..a7136b4bd 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,7 @@ setup( name="supertokens_python", - version="0.24.3", + version="0.24.4", author="SuperTokens", license="Apache 2.0", author_email="team@supertokens.com", @@ -121,8 +121,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.12.48", + "twilio>=7.9.1", "aiosmtplib>=1.1.6,<4.0.0", "pkce==1.0.3", ], diff --git a/supertokens_python/constants.py b/supertokens_python/constants.py index b921e29af..067c74e31 100644 --- a/supertokens_python/constants.py +++ b/supertokens_python/constants.py @@ -14,7 +14,7 @@ from __future__ import annotations SUPPORTED_CDI_VERSIONS = ["3.0"] -VERSION = "0.24.3" +VERSION = "0.24.4" TELEMETRY = "/telemetry" USER_COUNT = "/users/count" USER_DELETE = "/user/remove" From ecb46857e72bb4b5a4c08a41b70eaec459cd02a8 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Wed, 16 Oct 2024 10:46:02 +0530 Subject: [PATCH 2/8] fix: pre-commit hook --- .github/workflows/pre-commit-hook-run.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pre-commit-hook-run.yml b/.github/workflows/pre-commit-hook-run.yml index c0065b50c..e0426b92f 100644 --- a/.github/workflows/pre-commit-hook-run.yml +++ b/.github/workflows/pre-commit-hook-run.yml @@ -20,6 +20,7 @@ jobs: node-version: '12' - name: Create virtual environment and install dependencies run: | + sudo apt-get install -y python3-setuptools python3 -m venv venv source venv/bin/activate pip install "cython<3.0.0" wheel From 6eadd0e1a1b22675522b023b12598609e00c48dd Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Wed, 16 Oct 2024 10:55:39 +0530 Subject: [PATCH 3/8] fix: pre commit hook --- test-pre-commit.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 test-pre-commit.sh diff --git a/test-pre-commit.sh b/test-pre-commit.sh new file mode 100644 index 000000000..a4236b052 --- /dev/null +++ b/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 From 07277ec9ae351db9cbff3b94623564445aa221c7 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Wed, 16 Oct 2024 10:58:31 +0530 Subject: [PATCH 4/8] fix: pre commit hook --- .github/workflows/pre-commit-hook-run.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-commit-hook-run.yml b/.github/workflows/pre-commit-hook-run.yml index e0426b92f..a93db8cad 100644 --- a/.github/workflows/pre-commit-hook-run.yml +++ b/.github/workflows/pre-commit-hook-run.yml @@ -20,11 +20,11 @@ jobs: node-version: '12' - name: Create virtual environment and install dependencies run: | - sudo apt-get install -y python3-setuptools 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: | From d95fed79b2b6492e9c98de66299ab7aae03ed3b5 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Wed, 16 Oct 2024 11:12:06 +0530 Subject: [PATCH 5/8] fix: updates phonenumber and twilio --- CHANGELOG.md | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad6d989c2..6cfe8551d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.24.4] - 2024-10-16 -- Fixes dependency downgrade for `phonenumbers` and `twilio` +- Updates `phonenumbers` and `twilio` to latest versions ## [0.24.3] - 2024-09-24 diff --git a/setup.py b/setup.py index a7136b4bd..201d5235b 100644 --- a/setup.py +++ b/setup.py @@ -121,8 +121,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", ], From 3d960362baf2c492e4df62f001a0508b04e23368 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Wed, 16 Oct 2024 11:20:50 +0530 Subject: [PATCH 6/8] fix: dev requirements --- dev-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 4291ad283..f959daf22 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -41,7 +41,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 @@ -75,7 +75,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 From 934f8cd983cd229df1e7ea624dd03c3bd6091210 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Thu, 17 Oct 2024 17:43:14 +0530 Subject: [PATCH 7/8] fix: pre-commit --- Makefile | 4 ++-- dev-requirements.txt | 3 +-- tests/utils.py | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8031e4650..b6efe24e2 100644 --- a/Makefile +++ b/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 @@ -20,7 +20,7 @@ test: pytest -vv --reruns 3 --reruns-delay 5 ./tests/ dev-install: - pip install -r dev-requirements.txt + python -m pip install -r dev-requirements.txt freeze-dev-requirements: pip freeze > dev-requirements.txt diff --git a/dev-requirements.txt b/dev-requirements.txt index f959daf22..c1cd3098a 100644 --- a/dev-requirements.txt +++ b/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 @@ -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 diff --git a/tests/utils.py b/tests/utils.py index cd1b2b2fa..76115c27c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -157,6 +157,7 @@ def setup_multitenancy_feature(host: str = "localhost", port: str = "3567"): json={ "licenseKey": OPAQUE_KEY_WITH_MULTITENANCY_FEATURE, }, + timeout=10, ) From 7dd1aaa08b5202094d788b8184bcc780a8648b9d Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Thu, 17 Oct 2024 18:24:55 +0530 Subject: [PATCH 8/8] fix: makefile revert --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b6efe24e2..100335466 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ test: pytest -vv --reruns 3 --reruns-delay 5 ./tests/ dev-install: - python -m pip install -r dev-requirements.txt + pip install -r dev-requirements.txt freeze-dev-requirements: pip freeze > dev-requirements.txt