From 8c7cc39c18a514a3285b1034771ce5ad7f6e6d83 Mon Sep 17 00:00:00 2001 From: "shweta.korulkar@oracle.com" Date: Tue, 17 Dec 2024 19:06:16 +0000 Subject: [PATCH 1/4] testing build dbt-oarcle from source --- Makefile | 2 +- dbt-test.env | 14 ++++++++++++++ setup.py | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 dbt-test.env diff --git a/Makefile b/Makefile index 4cd83df..752dc10 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PROJ_DIR?=$(shell pwd) VENV_DIR?=${PROJ_DIR}/.bldenv BUILD_DIR=${PROJ_DIR}/build DIST_DIR=${PROJ_DIR}/dist -PYTHON_3=python3.9 +PYTHON_3=python3.12 clean_venv: diff --git a/dbt-test.env b/dbt-test.env new file mode 100644 index 0000000..6e34dfd --- /dev/null +++ b/dbt-test.env @@ -0,0 +1,14 @@ +export DBT_ORACLE_USER=dbt_test +export DBT_ORACLE_HOST=localhost +export DBT_ORACLE_PROTOCOL=tcps +export DBT_ORACLE_PORT=1522 +export DBT_ORACLE_SERVICE=myadw_medium.adb.oraclecloud.com +export DBT_ORACLE_PASSWORD=Auto_MY_DBT_1234 +export DBT_ORACLE_DATABASE=MYADW +export DBT_ORACLE_SCHEMA=dbt_test +export DBT_ORACLE_CUSTOM_SCHEMA=dbt_test +export DBT_MACRO_DEBUGGING=1 +export WALLET_LOCATION=/scratch/tls_wallet +export WALLET_PASSWORD=Auto_MY_ADB_Wallet +export TNS_ADMIN=/scratch/tls_wallet +export SSL_SERVER_CERT_DN="CN=3746b756d92b" diff --git a/setup.py b/setup.py index 332cc03..b9a3044 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,7 @@ url = 'https://github.com/oracle/dbt-oracle' -VERSION = '1.8.3' +VERSION = '1.8.4b1' setup( author="Oracle", python_requires='>=3.8', From 861ad181aaca2383574bb9cc5b85768a8086b428 Mon Sep 17 00:00:00 2001 From: "shweta.korulkar@oracle.com" Date: Fri, 3 Jan 2025 19:36:07 +0000 Subject: [PATCH 2/4] Initial changes for 1.9.0 --- .github/workflows/oracle-xe-adapter-tests.yml | 2 +- dbt/adapters/oracle/__version__.py | 2 +- requirements.txt | 2 +- requirements_dev.txt | 2 +- setup.cfg | 6 +++--- setup.py | 6 +++--- tox.ini | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/oracle-xe-adapter-tests.yml b/.github/workflows/oracle-xe-adapter-tests.yml index e6544ab..47e15d4 100644 --- a/.github/workflows/oracle-xe-adapter-tests.yml +++ b/.github/workflows/oracle-xe-adapter-tests.yml @@ -48,7 +48,7 @@ jobs: - name: Install dbt-oracle with core dependencies run: | python -m pip install --upgrade pip - pip install pytest 'dbt-tests-adapter~=1.8,<1.9' + pip install pytest 'dbt-tests-adapter~=1.10,<1.11' pip install -r requirements.txt pip install -e . diff --git a/dbt/adapters/oracle/__version__.py b/dbt/adapters/oracle/__version__.py index 6f8ca09..fa0d09a 100644 --- a/dbt/adapters/oracle/__version__.py +++ b/dbt/adapters/oracle/__version__.py @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. """ -version = "1.8.3" +version = "1.9.0" diff --git a/requirements.txt b/requirements.txt index c176417..6c73f88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ dbt-common>=1.1.0,<2.0 dbt-adapters>=1.2.1,<2.0 -dbt-core>=1.8.1,<2.0 +dbt-core>=1.9.1,<2.0 oracledb==2.4.1 diff --git a/requirements_dev.txt b/requirements_dev.txt index eb14ecc..8208904 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -6,4 +6,4 @@ tox coverage twine pytest -dbt-tests-adapter~=1.8,<1.9 +dbt-tests-adapter~=1.10,<1.11 diff --git a/setup.cfg b/setup.cfg index 422b8cc..36d1f74 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = dbt-oracle -version = 1.8.3 +version = 1.9.0 description = dbt (data build tool) adapter for Oracle Autonomous Database long_description = file: README.md long_description_content_type = text/markdown @@ -35,11 +35,11 @@ include_package_data = True install_requires = dbt-common>=1.1.0,<2.0 dbt-adapters>=1.2.1,<2.0 - dbt-core~=1.8,<1.9 + dbt-core~=1.9,<1.10 oracledb==2.4.1 test_suite=tests test_requires = - dbt-tests-adapter~=1.8,<1.9 + dbt-tests-adapter~=1.10,<1.11 pytest scripts = bin/create-pem-from-p12 diff --git a/setup.py b/setup.py index b9a3044..019ecaf 100644 --- a/setup.py +++ b/setup.py @@ -42,12 +42,12 @@ requirements = [ "dbt-common>=1.1.0,<2.0", "dbt-adapters>=1.2.1,<2.0", - "dbt-core~=1.8,<1.9", + "dbt-core~=1.9,<1.10", "oracledb==2.4.1" ] test_requirements = [ - "dbt-tests-adapter~=1.8,<1.9", + "dbt-tests-adapter~=1.10,<1.11", "pytest" ] @@ -61,7 +61,7 @@ url = 'https://github.com/oracle/dbt-oracle' -VERSION = '1.8.4b1' +VERSION = '1.9.0' setup( author="Oracle", python_requires='>=3.8', diff --git a/tox.ini b/tox.ini index 8379c06..c9cbfd9 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ passenv = deps = -rrequirements.txt - dbt-tests-adapter~=1.7,<1.8 + dbt-tests-adapter~=1.10,<1.11 pytest commands = pytest From fb64d9dc3356c4c17d7a2b85265da473d9489daa Mon Sep 17 00:00:00 2001 From: "shweta.korulkar@oracle.com" Date: Fri, 3 Jan 2025 19:47:09 +0000 Subject: [PATCH 3/4] Version change for Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab55c77..6ac8918 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Configuration variables -VERSION=1.8.4 +VERSION=1.9.0 PROJ_DIR?=$(shell pwd) VENV_DIR?=${PROJ_DIR}/.bldenv BUILD_DIR=${PROJ_DIR}/build From cea260586232343081baa4675a6f5b32fc3c25a6 Mon Sep 17 00:00:00 2001 From: skorulka Date: Mon, 6 Jan 2025 20:19:10 +0000 Subject: [PATCH 4/4] deleted env file --- dbt-test.env | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 dbt-test.env diff --git a/dbt-test.env b/dbt-test.env deleted file mode 100644 index 6e34dfd..0000000 --- a/dbt-test.env +++ /dev/null @@ -1,14 +0,0 @@ -export DBT_ORACLE_USER=dbt_test -export DBT_ORACLE_HOST=localhost -export DBT_ORACLE_PROTOCOL=tcps -export DBT_ORACLE_PORT=1522 -export DBT_ORACLE_SERVICE=myadw_medium.adb.oraclecloud.com -export DBT_ORACLE_PASSWORD=Auto_MY_DBT_1234 -export DBT_ORACLE_DATABASE=MYADW -export DBT_ORACLE_SCHEMA=dbt_test -export DBT_ORACLE_CUSTOM_SCHEMA=dbt_test -export DBT_MACRO_DEBUGGING=1 -export WALLET_LOCATION=/scratch/tls_wallet -export WALLET_PASSWORD=Auto_MY_ADB_Wallet -export TNS_ADMIN=/scratch/tls_wallet -export SSL_SERVER_CERT_DN="CN=3746b756d92b"