From 529368ffeed77b7792f2e9f03e49cf0317a18a93 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 27 Jan 2023 11:19:22 -0800
Subject: [PATCH] Switch to sqlalchemy 2.0

Our test suite no longer complains with RemovedIn20 warnings for
sqlalchemy 2.0 incompatibilities. Check if this works now.

Change-Id: I0ffab3788493dcddf39a1262813293abb6611c19
---
 noxfile.py       | 2 --
 requirements.txt | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index cdba605f06..d70ee35c26 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -32,7 +32,6 @@ def set_standard_env_vars(session):
     set_env(session, 'OS_STDERR_CAPTURE', '1')
     set_env(session, 'OS_STDOUT_CAPTURE', '1')
     set_env(session, 'OS_TEST_TIMEOUT', '360')
-    set_env(session, 'SQLALCHEMY_WARN_20', '1')
     session.env['PYTHONWARNINGS'] = ','.join([
         'always::DeprecationWarning:zuul.driver.sql.sqlconnection',
         'always::DeprecationWarning:tests.base',
@@ -45,7 +44,6 @@ def set_standard_env_vars(session):
 @nox.session(python='3')
 def bindep(session):
     set_standard_env_vars(session)
-    set_env(session, 'SQLALCHEMY_WARN_20', '1')
     session.install('bindep')
     session.run('bindep', 'test')
 
diff --git a/requirements.txt b/requirements.txt
index 082a180439..e12e9cf723 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ PrettyTable>=0.6,<0.8
 babel>=1.0
 netaddr
 kazoo>=2.9.0
-sqlalchemy<2.0.0
+sqlalchemy>=2.0.0
 alembic
 cryptography>=39.0.0
 cachecontrol<0.12.7