From 5c9bc5823dea29ba365a464c2742f3a9b313ed72 Mon Sep 17 00:00:00 2001 From: Gord Thompson Date: Thu, 10 Apr 2025 07:25:09 -0600 Subject: [PATCH 1/2] Apply updates for CRDB v25.2 --- .github/workflows/ci.yml | 3 ++- dev-requirements.txt | 24 ++++++++++++------------ sqlalchemy_cockroachdb/base.py | 1 + test-requirements.txt | 22 ++++++++++++---------- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 015d4b5..0914379 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,8 @@ jobs: "cockroach:latest-v24.1", "cockroach:latest-v24.2", "cockroach:latest-v24.3", - "cockroach:latest-v25.1" + "cockroach:latest-v25.1", + "cockroach:latest-v25.2" ] db-alias: [ "psycopg2", diff --git a/dev-requirements.txt b/dev-requirements.txt index c681278..7ef2022 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,12 +1,12 @@ backports-tarfile==1.2.0 # via jaraco-context -certifi==2025.1.31 +certifi==2025.4.26 # via requests cffi==1.17.1 # via cryptography -charset-normalizer==3.4.1 +charset-normalizer==3.4.2 # via requests -cryptography==44.0.2 +cryptography==45.0.3 # via secretstorage distlib==0.3.9 # via virtualenv @@ -20,7 +20,7 @@ id==1.5.0 # via twine idna==3.10 # via requests -importlib-metadata==8.6.1 +importlib-metadata==8.7.0 # via # keyring # twine @@ -40,19 +40,19 @@ markdown-it-py==3.0.0 # via rich mdurl==0.1.2 # via markdown-it-py -more-itertools==10.6.0 +more-itertools==10.7.0 # via # jaraco-classes # jaraco-functools nh3==0.2.21 # via readme-renderer -packaging==24.2 +packaging==25.0 # via # tox # twine -platformdirs==4.3.7 +platformdirs==4.3.8 # via virtualenv -pluggy==1.5.0 +pluggy==1.6.0 # via tox py==1.11.0 # via tox @@ -85,13 +85,13 @@ tox==3.23.1 # via -r dev-requirements.in twine==6.1.0 # via -r dev-requirements.in -typing-extensions==4.13.1 +typing-extensions==4.13.2 # via rich -urllib3==2.3.0 +urllib3==2.4.0 # via # requests # twine -virtualenv==20.30.0 +virtualenv==20.31.2 # via tox -zipp==3.21.0 +zipp==3.22.0 # via importlib-metadata diff --git a/sqlalchemy_cockroachdb/base.py b/sqlalchemy_cockroachdb/base.py index b9eeaa1..7f8df40 100644 --- a/sqlalchemy_cockroachdb/base.py +++ b/sqlalchemy_cockroachdb/base.py @@ -138,6 +138,7 @@ def initialize(self, connection): self._is_v242plus = self._is_v241plus and (" v24.1." not in sversion) self._is_v243plus = self._is_v242plus and (" v24.2." not in sversion) self._is_v251plus = self._is_v243plus and (" v24.3." not in sversion) + self._is_v252plus = self._is_v251plus and (" v25.1." not in sversion) self._has_native_json = self._is_v2plus self._has_native_jsonb = self._is_v2plus self._supports_savepoints = self._is_v201plus diff --git a/test-requirements.txt b/test-requirements.txt index 4e15c9b..e15cca8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,4 @@ -alembic==1.15.2 +alembic==1.16.1 # via -r test-requirements.in async-timeout==5.0.1 # via asyncpg @@ -8,23 +8,23 @@ attrs==25.3.0 # via pytest futures==3.0.5 # via -r test-requirements.in -greenlet==3.1.1 +greenlet==3.2.2 # via sqlalchemy iniconfig==2.1.0 # via pytest -mako==1.3.9 +mako==1.3.10 # via alembic markupsafe==3.0.2 # via mako mock==5.2.0 # via -r test-requirements.in -more-itertools==10.6.0 +more-itertools==10.7.0 # via -r test-requirements.in -packaging==24.2 +packaging==25.0 # via pytest -pluggy==1.5.0 +pluggy==1.6.0 # via pytest -psycopg==3.2.6 +psycopg==3.2.9 # via -r test-requirements.in psycopg2==2.9.10 # via -r test-requirements.in @@ -32,13 +32,15 @@ py==1.11.0 # via pytest pytest==7.1.3 # via -r test-requirements.in -sqlalchemy==2.0.40 +sqlalchemy==2.0.41 # via # -r test-requirements.in # alembic tomli==2.2.1 - # via pytest -typing-extensions==4.13.1 + # via + # alembic + # pytest +typing-extensions==4.13.2 # via # alembic # psycopg From 6b24d3ec943ab348b58d86142396cb43cf20f79b Mon Sep 17 00:00:00 2001 From: Gord Thompson Date: Tue, 10 Jun 2025 06:02:49 -0600 Subject: [PATCH 2/2] Update requirements Fixes: #270 --- dev-requirements.txt | 8 ++++---- test-requirements.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 7ef2022..2c88701 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -6,7 +6,7 @@ cffi==1.17.1 # via cryptography charset-normalizer==3.4.2 # via requests -cryptography==45.0.3 +cryptography==45.0.4 # via secretstorage distlib==0.3.9 # via virtualenv @@ -64,7 +64,7 @@ pygments==2.19.1 # rich readme-renderer==44.0 # via twine -requests==2.32.3 +requests==2.32.4 # via # id # requests-toolbelt @@ -85,7 +85,7 @@ tox==3.23.1 # via -r dev-requirements.in twine==6.1.0 # via -r dev-requirements.in -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via rich urllib3==2.4.0 # via @@ -93,5 +93,5 @@ urllib3==2.4.0 # twine virtualenv==20.31.2 # via tox -zipp==3.22.0 +zipp==3.23.0 # via importlib-metadata diff --git a/test-requirements.txt b/test-requirements.txt index e15cca8..e7e608c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,7 @@ attrs==25.3.0 # via pytest futures==3.0.5 # via -r test-requirements.in -greenlet==3.2.2 +greenlet==3.2.3 # via sqlalchemy iniconfig==2.1.0 # via pytest @@ -40,7 +40,7 @@ tomli==2.2.1 # via # alembic # pytest -typing-extensions==4.13.2 +typing-extensions==4.14.0 # via # alembic # psycopg