From b6986b300e7e6528747ea8081765f671a36501a7 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Tue, 6 Feb 2024 14:51:52 +0000
Subject: [PATCH 1/2] fix(setup.cfg): include template channel file in data

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index e7925067..9379d892 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -61,6 +61,7 @@ console_scripts =
         *.md
         *.xsl
         *.hoc
+        TEMPLATE.channel.nml
 
 [options.extras_require]
 neuron =

From 761e17452d1c0247a705485e1b9e58cf795e4b9f Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 3 Jun 2024 12:05:45 +0100
Subject: [PATCH 2/2] ci: update config to match development

---
 .github/workflows/ci.yml             | 15 +++++++--------
 .github/workflows/python-publish.yml |  4 ++--
 .pre-commit-config.yaml              | 10 ++++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fa95c2f3..a5c7db26 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,14 +20,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python  ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version:  ${{ matrix.python-version }}
 
@@ -36,10 +36,9 @@ jobs:
         echo "github.ref is: ${{ github.ref }}"
         echo "github.base_ref is: ${{ github.base_ref }}"
 
-    - name: Upgrade pip, install inspyred
+    - name: Upgrade pip, install deps
       run: |
         python -m pip install --upgrade pip
-        pip install git+https://github.com/aarongarrett/inspyred.git@master#egg=inspyred
         pip install .[dev]
 
     - name: List packages so far
@@ -52,7 +51,7 @@ jobs:
 
         ./test-ghactions.sh -neuron
 
-    - name: Lint with flake8
+    - name: Lint with ruff
       run: |
-        pip install flake8
-        flake8 . --count --exit-zero --show-source --max-line-length=127 --statistics
+        pip install ruff
+        ruff . --exit-zero --show-source
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index a3953478..85cc411b 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 25398389..5f83cf7e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,9 @@ repos:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-added-large-files
--   repo: https://github.com/psf/black
-    rev: 23.3.0
-    hooks:
-    -   id: black
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.4.1
+  hooks:
+    - id: ruff
+      args: [ "--select", "I", "--fix" ]
+    - id: ruff-format