From fb00913752d0fa7c73651c7d9659dd7ef7e3aef7 Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Tue, 7 May 2024 22:51:01 -0400
Subject: [PATCH 1/3] Pin ruff, include isort

---
 Makefile       |  7 +++++--
 pyproject.toml | 14 +++++++++++++-
 setup.py       |  5 ++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ba9a67c..3e094c6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,12 @@ develop:
 	python -m pip install nbconvert
 
 lint:
-	python -m ruff klink setup.py docs/source/conf.py
+	python -m isort --check klink setup.py docs/source/conf.py
+	python -m ruff check klink setup.py docs/source/conf.py
+	python -m ruff format --check klink setup.py docs/source/conf.py
 
 fix:
+	python -m isort klink setup.py docs/source/conf.py
 	python -m ruff format klink setup.py docs/source/conf.py
 
 clean:
@@ -19,7 +22,7 @@ clean:
 
 css:
 	lessc klink/less/klink.less klink/static/css/klink.css
-	- cp klink/static/css/klink.css docs/build/html/_static/css/klink.css
+	cp klink/static/css/klink.css docs/build/html/_static/css/klink.css
 
 docs: css
 	$(MAKE) -C docs/ clean
diff --git a/pyproject.toml b/pyproject.toml
index 6402776..eacf805 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,17 @@
+[tool.isort]
+combine_as_imports = true
+include_trailing_comma = true
+line_length = 180
+profile = "black"
+
+default_section = "THIRDPARTY"
+sections = "FUTURE,THIRDPARTY,FIRSTPARTY,LOCALFOLDER"
+
+known_first_party = "klink"
+
+
 [tool.ruff]
 line-length = 180
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "F403"]
diff --git a/setup.py b/setup.py
index bcf70d0..42a087b 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,10 @@ def local_file(filename):
     ],
     extras_require={
         "dev": [
-            "ruff",
+            "isort>=5,<6",
+            "ruff>=0.3,<0.4",
+            "twine",
+            "wheel",
         ],
     },
     packages=["klink"],

From 6c9d6a601dccfc1ac117fd432c0ce74e69753c21 Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Tue, 7 May 2024 22:51:11 -0400
Subject: [PATCH 2/3] autoformat code

---
 klink/__init__.py | 4 ++--
 klink/demo.py     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/klink/__init__.py b/klink/__init__.py
index 387ec38..21df938 100644
--- a/klink/__init__.py
+++ b/klink/__init__.py
@@ -1,7 +1,7 @@
 import os
-from subprocess import call
-import shutil
 import re
+import shutil
+from subprocess import call
 
 
 def convert_notebooks():
diff --git a/klink/demo.py b/klink/demo.py
index e9edf89..4c9a199 100644
--- a/klink/demo.py
+++ b/klink/demo.py
@@ -1,5 +1,4 @@
 class TestClass(object):
-
     """
     This is a test class. Used for demo purposes.
 

From 60a8a3dc0518f8efc3f2ab7fd39fb25a60ab6b78 Mon Sep 17 00:00:00 2001
From: Tim Paine <3105306+timkpaine@users.noreply.github.com>
Date: Tue, 7 May 2024 23:24:10 -0400
Subject: [PATCH 3/3] fix docs build

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3e094c6..7ff1e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -18,15 +18,15 @@ fix:
 clean:
 	- rm -rf build
 	- rm -rf dist
-	- rm -rf klink.egg-info
 
 css:
 	lessc klink/less/klink.less klink/static/css/klink.css
 	cp klink/static/css/klink.css docs/build/html/_static/css/klink.css
 
-docs: css
+docs: 
 	$(MAKE) -C docs/ clean
 	$(MAKE) -C docs/ html 
+	$(MAKE) css 
 
 serve:
 	cd docs/build/html; \