From 6dbd980df0d2f4d69db7fe1c13c1d6be17bacd67 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 30 Nov 2025 11:39:04 -0500 Subject: [PATCH] use oracledb as default in setup, update URLs part of :ticket:`13010`, as CI is now oracledb centric move setup.cfg / pyproject installs / URLs to be oracledb first. use 23c URLs now that we are on this platform. Change-Id: I1253c76c382637987e67e36b3d5c82081cd306a8 --- pyproject.toml | 5 +++-- setup.cfg | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 26ac357af1..b29f168e31 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,7 +54,8 @@ mssql-pyodbc = ["pyodbc"] mysql = ["mysqlclient>=1.4.0"] mysql-connector = ["mysql-connector-python"] mariadb-connector = ["mariadb>=1.0.1,!=1.1.2,!=1.1.5,!=1.1.10"] -oracle = ["cx_oracle>=8"] +oracle = ["oracledb>=1.0.1"] +oracle-cxoracle = ["cx_oracle>=8"] oracle-oracledb = ["oracledb>=1.0.1"] postgresql = ["psycopg2>=2.7"] postgresql-pg8000 = ["pg8000>=1.29.3"] @@ -156,7 +157,7 @@ tests-oracle-asyncio = [ ] tests-oracle = [ "sqlalchemy[oracle]", - "sqlalchemy[oracle-oracledb]", + "sqlalchemy[oracle-cxoracle]", ] tests-mssql = [ diff --git a/setup.cfg b/setup.cfg index 4bbe7d0aab..902d381d8a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,8 +47,8 @@ mssql = mssql+pyodbc://scott:tiger^5HHH@mssql2022:1433/test?driver=ODBC+Driver+1 mssql_async = mssql+aioodbc://scott:tiger^5HHH@mssql2022:1433/test?driver=ODBC+Driver+18+for+SQL+Server&TrustServerCertificate=yes&Encrypt=Optional pymssql = mssql+pymssql://scott:tiger^5HHH@mssql2022:1433/test docker_mssql = mssql+pyodbc://scott:tiger^5HHH@127.0.0.1:1433/test?driver=ODBC+Driver+18+for+SQL+Server&TrustServerCertificate=yes&Encrypt=Optional -oracle = oracle+cx_oracle://scott:tiger@oracle18c/xe -cxoracle = oracle+cx_oracle://scott:tiger@oracle18c/xe -oracledb = oracle+oracledb://scott:tiger@oracle18c/xe -oracledb_async = oracle+oracledb_async://scott:tiger@oracle18c/xe +oracle = oracle+oracledb://scott:tiger@oracle23c/freepdb1 +cxoracle = oracle+cx_oracle://scott:tiger@oracle23c/freepdb1 +oracledb = oracle+oracledb://scott:tiger@oracle23c/freepdb1 +oracledb_async = oracle+oracledb_async://scott:tiger@oracle23c/freepdb1 docker_oracle = oracle+cx_oracle://scott:tiger@127.0.0.1:1521/?service_name=FREEPDB1 -- 2.47.3