From 71a7f0ad73c248b44ae337a1c325bbd19ef1cc1e Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas.motl@crate.io>
Date: Mon, 2 Jan 2023 14:52:11 +0100
Subject: [PATCH] SA20: Update to SQLAlchemy 2.0.0

---
 .github/workflows/codeql.yml              | 2 +-
 .github/workflows/tests.yml               | 2 +-
 CHANGES.txt                               | 4 +++-
 bootstrap.sh                              | 2 +-
 src/crate/client/sqlalchemy/sa_version.py | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 99431542..e63d12bb 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         language: [ python ]
-        sqla-version: ['1.3.24', '1.4.46', '2.0.0b4']
+        sqla-version: ['1.3.24', '1.4.46', '2.0.0']
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e33b707c..d406d61e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ jobs:
         os: ['ubuntu-latest', 'macos-latest']
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         cratedb-version: ['5.2.0']
-        sqla-version: ['1.3.24', '1.4.46', '2.0.0b4']
+        sqla-version: ['1.3.24', '1.4.46', '2.0.0']
         # To save resources, only use the most recent Python version on macOS.
         exclude:
           - os: 'macos-latest'
diff --git a/CHANGES.txt b/CHANGES.txt
index 7d58509a..5a68b70a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,9 +5,11 @@ Changes for crate
 Unreleased
 ==========
 
-- Add deprecation warning about dropping support for SQLAlchemy 1.3 soon, it is
+- Added deprecation warning about dropping support for SQLAlchemy 1.3 soon, it is
   effectively EOL.
 
+- Added support for SQLAlchemy 2.0.
+
 
 2022/12/08 0.29.0
 =================
diff --git a/bootstrap.sh b/bootstrap.sh
index e0a7ab65..ae2d3c69 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -70,7 +70,7 @@ function setup_package() {
       if [ "${SQLALCHEMY_VERSION}" = "latest" ]; then
         pip install "sqlalchemy" --upgrade
       else
-        pip install "sqlalchemy==${SQLALCHEMY_VERSION}" --pre
+        pip install "sqlalchemy==${SQLALCHEMY_VERSION}"
       fi
     fi
 
diff --git a/src/crate/client/sqlalchemy/sa_version.py b/src/crate/client/sqlalchemy/sa_version.py
index de30d3eb..35517e27 100644
--- a/src/crate/client/sqlalchemy/sa_version.py
+++ b/src/crate/client/sqlalchemy/sa_version.py
@@ -25,4 +25,4 @@
 SA_VERSION = V(sa.__version__)
 
 SA_1_4 = V('1.4.0b1')
-SA_2_0 = V('2.0.0b1')
+SA_2_0 = V('2.0.0')