Skip to content

Add support for SQLAlchemy 2.0, continued #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agronholm merged 21 commits into from
Aug 3, 2023
Merged

Add support for SQLAlchemy 2.0, continued #275

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
aeced78
add support for sqlalchemy2
rbuffat Feb 5, 2023
d6cdc9e
Merge remote-tracking branch 'upstream/master' into sqlalchemy2
rbuffat Mar 1, 2023
7e566af
support sqlalchemy2 dataclasses
rbuffat Mar 2, 2023
962531f
expand test matrix
rbuffat Mar 2, 2023
cb3ae35
require py 3.9 for dataclass
rbuffat Mar 2, 2023
2efec56
fix sqlalchemy 1.4
rbuffat Mar 2, 2023
7154e08
fix test
rbuffat Mar 2, 2023
8f596eb
mark test to require python 3.9
rbuffat Mar 2, 2023
790f98c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 2, 2023
a544669
revert to typing.List for backwards compatibility
rbuffat Mar 3, 2023
f454869
Merge remote-tracking branch 'upstream/master' into sqlalchemy2
rbuffat Mar 4, 2023
a18d600
add py 3.11
rbuffat Mar 4, 2023
5ea20c8
fix precommit issues
rbuffat Mar 4, 2023
892a98c
install sqlmodel
rbuffat Mar 4, 2023
bbfacf7
install sqlmodel for sqlalchemy 1.4
rbuffat Mar 4, 2023
f5b6947
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 4, 2023
25b50b7
Respond to review feedback
mhauru Aug 2, 2023
80f955b
Run tests on Python 3.12
mhauru Aug 3, 2023
fa2c538
CHANGE.rst entry for 3.0.0rc3
mhauru Aug 3, 2023
6b0ac42
Don't run Github Actions tests on Python 3.12
mhauru Aug 3, 2023
7352912
Reenable Python 3.12 tests with greenlet version constraint
mhauru Aug 3, 2023
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
11 changes: 8 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.9", "3.11"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
Comment thread
agronholm marked this conversation as resolved.
Outdated
sqlalchemy-version: ["1.4", "2.0"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand All @@ -20,8 +21,12 @@ jobs:
python-version: ${{ matrix.python-version }}
Comment thread
mhauru marked this conversation as resolved.
cache: pip
cache-dependency-path: pyproject.toml
- name: Install dependencies
run: pip install -e .[test] coveralls
- name: Install dependencies SQLAlchemy 1.4
if: matrix.sqlalchemy-version == 1.4
run: pip install -e .[test,sqlmodel] coveralls SQLAlchemy==1.4.*
- name: Install dependencies SQLAlchemy 2.0
if: matrix.sqlalchemy-version == 2.0
run: pip install -e .[test] coveralls SQLAlchemy==2.0.*
- name: Test with pytest
run: coverage run -m pytest
- name: Upload Coverage
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ latest SQLAlchemy version).
Features
========

* Supports SQLAlchemy 1.4.x
* Supports SQLAlchemy 1.4.x and 2
* Produces declarative code that almost looks like it was hand written
* Produces `PEP 8`_ compliant code
* Accurately determines relationships, including many-to-many, one-to-one
Expand Down
7 changes: 5 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@ classifiers = [
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
requires-python = ">=3.7"
dependencies = [
"SQLAlchemy >= 1.4.36, < 2.0",
"SQLAlchemy >= 1.4.36",
"inflect >= 4.0.0",
"importlib_metadata; python_version < '3.10'",
]
Expand All @@ -44,6 +45,8 @@ test = [
"pytest-cov",
"psycopg2-binary",
"mysql-connector-python",
]
sqlmodel = [
"sqlmodel",
]
citext = ["sqlalchemy-citext >= 1.7.0"]
Expand Down Expand Up @@ -88,7 +91,7 @@ show_missing = true
[tool.tox]
legacy_tox_ini = """
[tox]
envlist = py37, py38, py39, py310
envlist = py37, py38, py39, py310, py311
Comment thread
mhauru marked this conversation as resolved.
Outdated
skip_missing_interpreters = true
isolated_build = true

Expand Down
Loading