From e96115ad4352f78ce0f00dd446ab1d35a2f35444 Mon Sep 17 00:00:00 2001
From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com>
Date: Mon, 8 Jan 2024 10:23:28 -0800
Subject: [PATCH] Skip sasl installation

---
 .github/workflows/test-upstream.yml | 1 -
 .github/workflows/test.yml          | 3 ---
 tests/integration/test_hive.py      | 5 ++---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test-upstream.yml b/.github/workflows/test-upstream.yml
index 91c8a3d34..f9c08bade 100644
--- a/.github/workflows/test-upstream.yml
+++ b/.github/workflows/test-upstream.yml
@@ -75,7 +75,6 @@ jobs:
       - name: Install hive testing dependencies
         if: matrix.os == 'ubuntu-latest'
         run: |
-          mamba install -c conda-forge "sasl>=0.3.1"
           docker pull bde2020/hive:2.3.2-postgresql-metastore
           docker pull bde2020/hive-metastore-postgresql:2.3.0
       - name: Install upstream dev Dask
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f43e1b6fb..be3a0199b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -74,12 +74,9 @@ jobs:
         run: |
           maturin develop
       - name: Install hive testing dependencies
-        # FIXME: sasl is not available on python 3.11
         if: |
           matrix.os == 'ubuntu-latest'
-          && matrix.python != '3.11'
         run: |
-          mamba install -c conda-forge "sasl>=0.3.1"
           docker pull bde2020/hive:2.3.2-postgresql-metastore
           docker pull bde2020/hive-metastore-postgresql:2.3.0
       - name: Optionally install upstream dev Dask
diff --git a/tests/integration/test_hive.py b/tests/integration/test_hive.py
index 4c4ba5053..042b6f1a0 100644
--- a/tests/integration/test_hive.py
+++ b/tests/integration/test_hive.py
@@ -9,9 +9,8 @@
 from tests.utils import assert_eq
 
 pytestmark = pytest.mark.xfail(
-    # FIXME: sasl is not available on python 3.11
-    condition="sys.platform in ('win32', 'darwin') or sys.version_info == (3, 11)",
-    reason="hive testing only supported on linux with python<3.11",
+    condition="sys.platform in ('win32', 'darwin')",
+    reason="hive testing not supported on Windows/macOS",
 )
 docker = pytest.importorskip("docker")
 sqlalchemy = pytest.importorskip("sqlalchemy")