Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,40 @@ jobs:
if: ${{ always() }}
runs-on: ubuntu-latest
name: Test Results
needs: [test-py39]
needs: [test-py310]
steps:
- run: |
result="${{ needs.test-py39.result }}"
result="${{ needs.test-py310.result }}"
if [[ $result == "success" || $result == "skipped" ]]; then
exit 0
else
exit 1
fi

test-py39:
test-py310:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
crdb-version: [
"cockroach:latest-v24.1",
"cockroach:latest-v24.3",
"cockroach:latest-v25.2",
"cockroach:latest-v25.3",
"cockroach:latest-v25.4"
"cockroach:latest-v25.4",
"cockroach:latest-v26.1"
]
db-alias: [
"psycopg2",
"asyncpg",
"psycopg"
]
env:
TOXENV: py39
TOX_VERSION: 3.23.1
TOXENV: py310
TOX_VERSION: 4.34.1
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.10'
- name: Start CockroachDB
run: |
docker pull cockroachdb/${{ matrix.crdb-version }}
Expand All @@ -75,13 +74,13 @@ jobs:
lint:
runs-on: ubuntu-latest
env:
TOXENV: py39
TOX_VERSION: 3.23.1
TOXENV: py310
TOX_VERSION: 4.34.1
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.10'
- name: Install testrunner
run: pip install --user tox==${TOX_VERSION}
- name: Lint
Expand Down
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Unreleased
- Fix reflection of CHAR columns (#275)
- Fix reflection of TIMESTAMPTZ columns (#276), thanks to @nvachhar
- Fix reflection of JSONB columns (#277)
- Fix compatibility issues with Alembic 1.18 (via SQLA 2.0.47)
- Update minimum Python version to 3.10


# Version 2.0.3
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ Use `pip` to install the latest release of this dialect.
pip install sqlalchemy-cockroachdb
```

NOTE: This version of the dialect requires SQLAlchemy 2.0 or later. To work with
NOTE: This version of the dialect requires SQLAlchemy 2.0.x. To work with
earlier versions of SQLAlchemy you'll need to install an earlier version of this
dialect.

```
pip install sqlalchemy-cockroachdb<2.0.0
pip install "sqlalchemy-cockroachdb<2.0"
```

Use a `cockroachdb` connection string when creating the `Engine`. For example,
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# generated dev-requirements.txt), run make update-requirements,
# then make bootstrap.

tox==3.23.1
tox==4.34.1

# Twine is used in the release process to upload the package.
twine
66 changes: 43 additions & 23 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,87 +1,107 @@
certifi==2025.11.12
backports-tarfile==1.2.0
# via jaraco-context
cachetools==7.0.1
# via tox
certifi==2026.1.4
# via requests
cffi==2.0.0
# via cryptography
chardet==6.0.0.post1
# via tox
charset-normalizer==3.4.4
# via requests
colorama==0.4.6
# via tox
cryptography==46.0.5
# via secretstorage
distlib==0.4.0
# via virtualenv
docutils==0.22.3
docutils==0.22.4
# via readme-renderer
filelock==3.20.3
filelock==3.24.3
# via
# tox
# virtualenv
id==1.5.0
id==1.6.1
# via twine
idna==3.11
# via requests
importlib-metadata==8.7.1
# via keyring
jaraco-classes==3.4.0
# via keyring
jaraco-context==6.0.1
jaraco-context==6.1.0
# via keyring
jaraco-functools==4.3.0
jaraco-functools==4.4.0
# via keyring
jeepney==0.9.0
# via
# keyring
# secretstorage
keyring==25.7.0
# via twine
markdown-it-py==3.0.0
markdown-it-py==4.0.0
# via rich
mdurl==0.1.2
# via markdown-it-py
more-itertools==10.8.0
# via
# jaraco-classes
# jaraco-functools
nh3==0.3.2
nh3==0.3.3
# via readme-renderer
packaging==25.0
packaging==26.0
# via
# pyproject-api
# tox
# twine
platformdirs==4.4.0
# via virtualenv
platformdirs==4.9.2
# via
# tox
# virtualenv
pluggy==1.6.0
# via tox
py==1.11.0
# via tox
pycparser==2.23
pycparser==3.0
# via cffi
pygments==2.19.2
# via
# readme-renderer
# rich
pyproject-api==1.10.0
# via tox
readme-renderer==44.0
# via twine
requests==2.32.5
# via
# id
# requests-toolbelt
# twine
requests-toolbelt==1.0.0
# via twine
rfc3986==2.0.0
# via twine
rich==14.2.0
rich==14.3.3
# via twine
secretstorage==3.3.3
secretstorage==3.5.0
# via keyring
six==1.17.0
# via tox
toml==0.10.2
# via tox
tox==3.23.1
tomli==2.4.0
# via
# pyproject-api
# tox
tox==4.34.1
# via -r dev-requirements.in
twine==6.2.0
# via -r dev-requirements.in
typing-extensions==4.15.0
# via
# cryptography
# tox
# virtualenv
urllib3==2.6.3
# via
# id
# requests
# twine
virtualenv==20.36.1
virtualenv==20.39.0
# via tox
zipp==3.23.0
# via importlib-metadata
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ addopts = "--tb native -v -r sfxX --maxfail=250 -p warnings -p logging --strict-
markers = [
"backend: tests that should run on all backends; typically dialect-sensitive",
"mypy: mypy integration / plugin tests",
"sparse_driver_backend: tests that should run on just one kind of driver for each kind of db",
]
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
],
keywords="SQLAlchemy CockroachDB",
project_urls={
Expand All @@ -36,7 +37,7 @@
},
packages=find_packages(include=["sqlalchemy_cockroachdb"]),
include_package_data=True,
install_requires=["SQLAlchemy"],
install_requires=["SQLAlchemy>=2.0.47,<2.1"],
zip_safe=False,
entry_points={
"sqlalchemy.dialects": [
Expand Down
Loading