From ab3f0294726fb098f5d657b887b23864d4c30b5f Mon Sep 17 00:00:00 2001
From: Miles Yucht <miles@databricks.com>
Date: Wed, 4 Oct 2023 14:29:08 +0200
Subject: [PATCH 1/4] Remove imp dependency and test on python 3.12

---
 .github/workflows/push.yml | 1 +
 setup.py                   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index cdaa217b..e8319fa6 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -62,6 +62,7 @@ jobs:
       matrix:
         python-version:
           - '3.7'
+          - '3.12'
     env:
       PYTHON_VERSION: ${{ matrix.python-version }}
     steps:
diff --git a/setup.py b/setup.py
index 8e32a013..9507de20 100644
--- a/setup.py
+++ b/setup.py
@@ -21,13 +21,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import imp
 import io
 import os
 from setuptools import setup, find_packages
+from importlib.machinery import SourceFileLoader
 
-version = imp.load_source(
-    'databricks_cli.version', os.path.join('databricks_cli', 'version.py')).version
+path_to_module = os.path.join('databricks_cli', 'version.py')
+loaded_module = SourceFileLoader('databricks_cli.version', path_to_module).load_module()
+version = loaded_module.version
 
 setup(
     name='databricks-cli',

From 69801cf94fd86b171db200e1fa29c60d126a84f2 Mon Sep 17 00:00:00 2001
From: Miles Yucht <miles@databricks.com>
Date: Wed, 4 Oct 2023 17:38:46 +0200
Subject: [PATCH 2/4] inline version

---
 .github/workflows/push.yml | 4 ++--
 setup.py                   | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 804f6f3b..9de19403 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -29,7 +29,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install pip
-        run: pip install --upgrade pip
+        run: pip install --upgrade pip setuptools
 
       - name: Install development dependencies
         run: pip install --upgrade -r dev-requirements.txt
@@ -78,7 +78,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install wheel
+          pip install wheel setuptools
 
       - name: Build distribution files
         id: build-dist
diff --git a/setup.py b/setup.py
index 8a13d63b..0bf203a6 100644
--- a/setup.py
+++ b/setup.py
@@ -22,14 +22,9 @@
 # limitations under the License.
 
 import io
-import os
-from setuptools import setup, find_packages
-from importlib.machinery import SourceFileLoader
-
-path_to_module = os.path.join('databricks_cli', 'version.py')
-loaded_module = SourceFileLoader('databricks_cli.version', path_to_module).load_module()
-version = loaded_module.version
 
+# Keep in sync with version in databricks_cli/version.py.
+version='0.17.9.dev0'
 setup(
     name='databricks-cli',
     version=version,

From 9cda8300cef63a09894787d7d3baed845f29755a Mon Sep 17 00:00:00 2001
From: Miles Yucht <miles@databricks.com>
Date: Wed, 4 Oct 2023 17:42:58 +0200
Subject: [PATCH 3/4] one more tweak

---
 .github/workflows/push.yml | 4 ++--
 setup.py                   | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 9de19403..8ad0e8af 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -74,11 +74,11 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install pip
-        run: pip install --upgrade pip
+        run: pip install --upgrade pip setuptools
 
       - name: Install dependencies
         run: |
-          pip install wheel setuptools
+          pip install wheel
 
       - name: Build distribution files
         id: build-dist
diff --git a/setup.py b/setup.py
index 0bf203a6..8a13d63b 100644
--- a/setup.py
+++ b/setup.py
@@ -22,9 +22,14 @@
 # limitations under the License.
 
 import io
+import os
+from setuptools import setup, find_packages
+from importlib.machinery import SourceFileLoader
+
+path_to_module = os.path.join('databricks_cli', 'version.py')
+loaded_module = SourceFileLoader('databricks_cli.version', path_to_module).load_module()
+version = loaded_module.version
 
-# Keep in sync with version in databricks_cli/version.py.
-version='0.17.9.dev0'
 setup(
     name='databricks-cli',
     version=version,

From 2f73832fa502fcc88832d6ce4e8372c6cd7f61a3 Mon Sep 17 00:00:00 2001
From: Miles Yucht <miles@databricks.com>
Date: Thu, 5 Oct 2023 10:16:04 +0200
Subject: [PATCH 4/4] do not lint on 3.12

---
 .github/workflows/push.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 8ad0e8af..0fc1fd10 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -41,6 +41,7 @@ jobs:
         run: pytest tests --cov=./
 
       - name: Run lint
+        if: matrix.python-version != '3.12' # new lint rules in 3.12 don't pass
         run: prospector --profile ./prospector.yaml -t dodgy -t mccabe -t profile-validator -t pyflakes -t pylint
 
       - name: Run rstcheck