Skip to content
This repository was archived by the owner on Mar 16, 2026. It is now read-only.

Commit a3a4ee6

Browse files
committed
Moved back sqlalchemy constraints to 1.4
1 parent a708987 commit a3a4ee6

4 files changed

Lines changed: 42 additions & 40 deletions

File tree

noxfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ def compliance(session):
369369
session.skip("Compliance tests were not found")
370370

371371
session.install("--pre", "grpcio")
372-
session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy>=2.0.0,<2.1")
372+
session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy>=1.4,<2.1")
373373
session.install(
374374
"mock",
375375
"pytest",
@@ -418,7 +418,7 @@ def cover(session):
418418
session.install("coverage", "pytest-cov")
419419

420420
session.run("python", "-m", "pip", "freeze")
421-
421+
422422
session.run("coverage", "report", "--show-missing", "--fail-under=100")
423423

424424
session.run("coverage", "erase")
@@ -527,7 +527,7 @@ def prerelease_deps(session):
527527

528528
prerel_deps = [
529529
"protobuf",
530-
"sqlalchemy>=2.0.0,<2.1",
530+
"sqlalchemy>=1.4,<2.1",
531531
# dependency of grpc
532532
"six",
533533
"googleapis-common-protos",

owlbot.py

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@
4242
system_test_extras=extras,
4343
system_test_extras_by_python=extras_by_python,
4444
)
45-
s.move(templated_files, excludes=[
46-
# sqlalchemy-bigquery was originally licensed MIT
47-
"LICENSE",
48-
"docs/multiprocessing.rst",
49-
# exclude gh actions as credentials are needed for tests
50-
".github/workflows",
51-
"README.rst",
52-
])
45+
s.move(
46+
templated_files,
47+
excludes=[
48+
# sqlalchemy-bigquery was originally licensed MIT
49+
"LICENSE",
50+
"docs/multiprocessing.rst",
51+
# exclude gh actions as credentials are needed for tests
52+
".github/workflows",
53+
"README.rst",
54+
],
55+
)
5356

5457
# ----------------------------------------------------------------------------
5558
# Fixup files
@@ -59,7 +62,7 @@
5962
[".coveragerc"],
6063
"google/cloud/__init__.py",
6164
"sqlalchemy_bigquery/requirements.py",
62-
)
65+
)
6366

6467
s.replace(
6568
["noxfile.py"],
@@ -75,48 +78,49 @@
7578

7679

7780
s.replace(
78-
["noxfile.py"], "--cov=google", "--cov=sqlalchemy_bigquery",
81+
["noxfile.py"],
82+
"--cov=google",
83+
"--cov=sqlalchemy_bigquery",
7984
)
8085

8186

8287
s.replace(
83-
["noxfile.py"],
88+
["noxfile.py"],
8489
"\+ SYSTEM_TEST_EXTRAS",
8590
"",
8691
)
8792

8893

8994
s.replace(
9095
["noxfile.py"],
91-
'''"protobuf",
92-
# dependency of grpc''',
93-
'''"protobuf",
94-
"sqlalchemy>=2.0.0,<2.1",
95-
# dependency of grpc''',
96+
""""protobuf",
97+
# dependency of grpc""",
98+
""""protobuf",
99+
"sqlalchemy>=1.4,<2.1",
100+
# dependency of grpc""",
96101
)
97102

98103

99104
s.replace(
100105
["noxfile.py"],
101106
r"def default\(session\)",
102-
"def default(session, install_extras=True)",
107+
"def default(session, install_extras=True)",
103108
)
104109

105110

106-
107-
108111
def place_before(path, text, *before_text, escape=None):
109112
replacement = "\n".join(before_text) + "\n" + text
110113
if escape:
111114
for c in escape:
112-
text = text.replace(c, '\\' + c)
115+
text = text.replace(c, "\\" + c)
113116
s.replace([path], text, replacement)
114117

118+
115119
place_before(
116120
"noxfile.py",
117121
"SYSTEM_TEST_PYTHON_VERSIONS=",
118122
"",
119-
"# We're using two Python versions to test with sqlalchemy>=2.0.0",
123+
"# We're using two Python versions to test with sqlalchemy>=1.4",
120124
)
121125

122126
place_before(
@@ -126,15 +130,15 @@ def place_before(path, text, *before_text, escape=None):
126130
)
127131

128132

129-
install_logic = '''
133+
install_logic = """
130134
if install_extras and session.python in ["3.11", "3.12"]:
131135
install_target = ".[geography,alembic,tests,bqstorage]"
132136
elif install_extras:
133137
install_target = ".[all]"
134138
else:
135139
install_target = "."
136140
session.install("-e", install_target, "-c", constraints_path)
137-
'''
141+
"""
138142

139143
place_before(
140144
"noxfile.py",
@@ -163,7 +167,7 @@ def compliance(session):
163167
session.skip("Compliance tests were not found")
164168
165169
session.install("--pre", "grpcio")
166-
session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy>=2.0.0,<2.1")
170+
session.install("--pre", "--no-deps", "--upgrade", "sqlalchemy>=1.4,<2.1")
167171
session.install(
168172
"mock",
169173
"pytest",
@@ -205,12 +209,11 @@ def compliance(session):
205209
'''
206210

207211
place_before(
208-
"noxfile.py",
209-
"@nox.session(python=DEFAULT_PYTHON_VERSION)\n"
210-
"def cover(session):",
211-
compliance,
212-
escape="()",
213-
)
212+
"noxfile.py",
213+
"@nox.session(python=DEFAULT_PYTHON_VERSION)\n" "def cover(session):",
214+
compliance,
215+
escape="()",
216+
)
214217

215218
s.replace(["noxfile.py"], '"alabaster"', '"alabaster", "geoalchemy2", "shapely"')
216219

@@ -266,11 +269,10 @@ def system_noextras(session):
266269

267270
place_before(
268271
"noxfile.py",
269-
"@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS[-1])\n"
270-
"def compliance(session):",
272+
"@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS[-1])\n" "def compliance(session):",
271273
system_noextras,
272274
escape="()[]",
273-
)
275+
)
274276

275277

276278
# Add DB config for SQLAlchemy dialect test suite.
@@ -287,7 +289,7 @@ def system_noextras(session):
287289
[tool:pytest]
288290
addopts= --tb native -v -r fxX -p no:warnings
289291
python_files=tests/*test_*.py
290-
"""
292+
""",
291293
)
292294

293295
# ----------------------------------------------------------------------------
@@ -298,7 +300,7 @@ def system_noextras(session):
298300
python.py_samples(skip_readmes=True)
299301

300302
s.replace(
301-
["./samples/snippets/noxfile.py"],
303+
["./samples/snippets/noxfile.py"],
302304
"""session.install\("-e", _get_repo_root\(\)\)""",
303305
"""session.install("-e", _get_repo_root())
304306
else:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def readme():
101101
"google-auth>=1.25.0,<3.0.0dev", # Work around pip wack.
102102
"google-cloud-bigquery>=3.3.6,<4.0.0dev",
103103
"packaging",
104-
"sqlalchemy>=2.0,<2.0.23",
104+
"sqlalchemy>=1.4,<2.0.23",
105105
],
106106
extras_require=extras,
107107
python_requires=">=3.8, <3.13",

testing/constraints-3.8.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Pin the version to the lower bound.
55
#
66
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
7-
sqlalchemy==2.0.0
7+
sqlalchemy>=1.4.0
88
google-auth==1.25.0
99
google-cloud-bigquery==3.3.6
1010
google-cloud-bigquery-storage==2.0.0

0 commit comments

Comments
 (0)