From 8c7633d742e6432b7e9be717a44a10cf5fbf117e Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 9 Jun 2025 15:18:04 +0100
Subject: [PATCH 1/5] chore: drop six dependency

---
 neuroml/nml/nml.py | 2 +-
 setup.cfg          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/neuroml/nml/nml.py b/neuroml/nml/nml.py
index f975c86..8d8c5b7 100644
--- a/neuroml/nml/nml.py
+++ b/neuroml/nml/nml.py
@@ -37,6 +37,7 @@
 import re as re_
 import typing
 from functools import cached_property, lru_cache
+from itertools import zip_longest
 from math import pi, sqrt
 from operator import attrgetter
 
@@ -44,7 +45,6 @@
 import networkx as nx
 import numpy
 from lxml import etree as etree_
-from six.moves import zip_longest
 
 import neuroml
 import neuroml.neuro_lex_ids
diff --git a/setup.cfg b/setup.cfg
index 4162a76..dd80f14 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,7 +26,6 @@ classifiers =
 [options]
 install_requires =
     lxml
-    six
     networkx
     numpy
     tables

From c0b80338fcbcceebb6affd7cfe66a508ccc0bd10 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 9 Jun 2025 15:19:34 +0100
Subject: [PATCH 2/5] chore: remove dependency on six

---
 neuroml/nml/regenerate-nml.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/neuroml/nml/regenerate-nml.sh b/neuroml/nml/regenerate-nml.sh
index 64d587b..bfce5c5 100755
--- a/neuroml/nml/regenerate-nml.sh
+++ b/neuroml/nml/regenerate-nml.sh
@@ -23,6 +23,8 @@ regenerate () {
 
 
         PYTHONPATH="$PYTHONPATH:." generateDS -o nml.py --use-getter-setter=none --user-methods=helper_methods.py --export="write validate" --custom-imports-template=gds_imports-template.py $SCHEMA_FILE
+        # replace six
+        sed -i 's/from six.moves/from itertools/' nml.py
         # correct path to generatedssupersuper module file
         sed -i 's/from generatedssupersuper/from .generatedssupersuper/' nml.py
         sed -i 's/from generatedscollector/from .generatedscollector/' nml.py

From 15ab61d7b3443bfec37332a0aa118bb4a4c64988 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 9 Jun 2025 15:39:43 +0100
Subject: [PATCH 3/5] feat(deps): setup deps for tables for py3.9

---
 setup.cfg | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index dd80f14..2cb8919 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -27,9 +27,12 @@ classifiers =
 install_requires =
     lxml
     networkx
-    numpy
-    tables
-    typing; python_version<"3.5"
+    # tables 3.10+ support numpy2x, but no wheels are provided for py<3.10
+    numpy<2.0; python<"3.10"
+    tables; python<"3.10"
+    # for py>3.10, specify minimum tables version and let that choose appropriate numpy
+    numpy; python>="3.10"
+    tables>3.10; python>="3.10"
     natsort
 
 packages = find:

From 8004aa129b969af7cc981854b5b65bfe1e338108 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 9 Jun 2025 15:41:26 +0100
Subject: [PATCH 4/5] fix(deps): correct dep specs

---
 setup.cfg | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2cb8919..fa814ed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,11 +28,11 @@ install_requires =
     lxml
     networkx
     # tables 3.10+ support numpy2x, but no wheels are provided for py<3.10
-    numpy<2.0; python<"3.10"
-    tables; python<"3.10"
+    numpy<2.0; python_version<"3.10"
+    tables; python_version<"3.10"
     # for py>3.10, specify minimum tables version and let that choose appropriate numpy
-    numpy; python>="3.10"
-    tables>3.10; python>="3.10"
+    numpy; python_versio>="3.10"
+    tables>3.10; python_version>="3.10"
     natsort
 
 packages = find:

From a1e439679108bfcd76adcf1d4cbdeb34e8bb632d Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 9 Jun 2025 15:43:39 +0100
Subject: [PATCH 5/5] chore(deps): fix typo

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

diff --git a/setup.cfg b/setup.cfg
index fa814ed..8f6e785 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,7 @@ install_requires =
     numpy<2.0; python_version<"3.10"
     tables; python_version<"3.10"
     # for py>3.10, specify minimum tables version and let that choose appropriate numpy
-    numpy; python_versio>="3.10"
+    numpy; python_version>="3.10"
     tables>3.10; python_version>="3.10"
     natsort