Skip to content
This repository was archived by the owner on Sep 2, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d359a8f
Use PyHive pure-sasl import
colin-rogers-dbt Jun 28, 2023
bb3c688
Test PyHive pure-sasl import
colin-rogers-dbt Jun 28, 2023
44f1b14
update requirements.txt
colin-rogers-dbt Jun 28, 2023
7360353
use github fix for >3.11
colin-rogers-dbt Jun 28, 2023
3779c2d
use github fix for >3.11
colin-rogers-dbt Jun 28, 2023
4982589
fix pyhive spec
colin-rogers-dbt Jun 28, 2023
71030e3
remove unnecessary requests extra
colin-rogers-dbt Jun 28, 2023
ddd1f79
remove unnecessary sasl install
colin-rogers-dbt Jun 28, 2023
bcb47f5
add changie
colin-rogers-dbt Jun 28, 2023
b5b2b20
specify no-binary for pyodbc install
colin-rogers-dbt Jun 28, 2023
152a2ee
conditionally import sasl vs puresasl
colin-rogers-dbt Jun 28, 2023
0a51daa
conditionally import sasl vs pure-sasl
colin-rogers-dbt Jun 28, 2023
3c18e5b
Merge branch 'main' into usePureSasl
colin-rogers-dbt Jun 29, 2023
c80e599
experiment with pure sasl SASLClient
colin-rogers-dbt Jun 29, 2023
50a5a54
file formatting
colin-rogers-dbt Jun 29, 2023
9e738b1
test using only puresasl
colin-rogers-dbt Jul 1, 2023
52a2ba7
test using only puresasl
colin-rogers-dbt Jul 1, 2023
a03e364
update requirements.txt
colin-rogers-dbt Jul 1, 2023
7987673
remove sasl from req
colin-rogers-dbt Jul 5, 2023
3941979
remove unused sys dependency
colin-rogers-dbt Jul 5, 2023
6ff75f7
Merge branch 'main' into usePureSasl
colin-rogers-dbt Jul 10, 2023
078d2c6
Merge branch 'main' into usePureSasl
mikealfare Jul 12, 2023
6d6c561
Merge branch 'main' into usePureSasl
mikealfare Jul 19, 2023
ef99d3e
test spark-session
colin-rogers-dbt Aug 1, 2023
645c695
fix pure-sasl
colin-rogers-dbt Aug 1, 2023
86d9767
allow pre-release installs
colin-rogers-dbt Aug 3, 2023
5ea5c55
allow pre-release installs
colin-rogers-dbt Aug 3, 2023
9ea4393
Merge branch 'main' into usePureSasl
colin-rogers-dbt Aug 3, 2023
3486590
Merge branch 'main' into usePureSasl
colin-rogers-dbt Aug 3, 2023
cede12f
use pyhive 0.7.0
colin-rogers-dbt Aug 21, 2023
215b9fa
merge main
colin-rogers-dbt Aug 21, 2023
c88567f
add pyhive back to reqs
colin-rogers-dbt Aug 21, 2023
2851b78
fix setup.py and remove sasl from dev-requirements.txt
colin-rogers-dbt Aug 21, 2023
9e0769e
Update Dependencies-20230628-121341.yaml
colin-rogers-dbt Aug 21, 2023
fc2c610
remove unnecessary pip_pre arg from tox.ini
colin-rogers-dbt Aug 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
conditionally import sasl vs puresasl
  • Loading branch information
colin-rogers-dbt committed Jun 28, 2023
commit 152a2eebba00ab369b55140ea8e65de9b0ea247c
6 changes: 5 additions & 1 deletion dbt/adapters/spark/connections.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import sys
from contextlib import contextmanager

import dbt.exceptions
Expand Down Expand Up @@ -31,8 +32,11 @@
from thrift.transport.TSSLSocket import TSSLSocket
import thrift
import ssl
import sasl
import thrift_sasl
if sys.version_info < (3, 11):
import sasl
else:
import puresasl as sasl
except ImportError:
pass # done deliberately: setting modules to None explicitly violates MyPy contracts by degrading type semantics

Expand Down
2 changes: 2 additions & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ wheel~=0.40
# Adapter specific dependencies
mock~=5.0
thrift_sasl~=0.4.3
sasl~=0.3.1;python_version<"3.11"
puresasl;python_version>="3.11"