File tree Expand file tree Collapse file tree 4 files changed +8
-3
lines changed Expand file tree Collapse file tree 4 files changed +8
-3
lines changed Original file line number Diff line number Diff line change 8
8
9
9
* Jinja templates can now be loaded in StrictUndefined mode.
10
10
* Remove an implicit dependency on `packaging `
11
+ * Remove `sqlalchemy-citext1 from the optional dependencies. CITEXT supported by SQLAlchemy since 2.0.19.
11
12
12
13
2.0.0a2
13
14
-------
Original file line number Diff line number Diff line change 1
- from citext import CIText
1
+ try :
2
+ from citext import CIText as CITEXT
3
+ except ImportError :
4
+ # SQLAlchemy >= 2.0.7, although there is an issue until 2.0.19
5
+ from sqlalchemy .dialects .postgresql import CITEXT # type: ignore[attr-defined]
2
6
from sqlalchemy import text
3
7
from sqlalchemy .dialects .postgresql import HSTORE
4
8
from sqlalchemy .dialects .postgresql import JSON
@@ -94,7 +98,7 @@ class CITextModel(postgres_db.Model):
94
98
id = postgres_db .Column (
95
99
postgres_db .Integer , primary_key = True , autoincrement = True
96
100
)
97
- citext_test = postgres_db .Column (CIText )
101
+ citext_test = postgres_db .Column (CITEXT )
98
102
99
103
with postgres_db .engine .begin () as connection :
100
104
connection .execute (text ("CREATE EXTENSION IF NOT EXISTS citext" ))
Original file line number Diff line number Diff line change @@ -36,7 +36,6 @@ sqlalchemy = [
36
36
sqlalchemy-with-utils = [
37
37
" Flask-Admin[sqlalchemy]" ,
38
38
" sqlalchemy_utils>=0.38.0" ,
39
- " sqlalchemy-citext>=1.8.0" ,
40
39
" colour>=0.1.5" ,
41
40
" email_validator>=2" ,
42
41
" arrow>=0.13.0" ,
Original file line number Diff line number Diff line change @@ -22,6 +22,7 @@ setenv =
22
22
AZURE_STORAGE_CONNECTION_STRING = DefaultEndpointsProtocol =http; AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;
23
23
deps =
24
24
sqlalchemy1: sqlalchemy<2
25
+ sqlalchemy1: sqlalchemy-citext
25
26
-r requirements/tests.txt
26
27
commands_pre =
27
28
noflaskbabel: pip uninstall -y flask-babel
You can’t perform that action at this time.
0 commit comments