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/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 diff --git a/setup.cfg b/setup.cfg index 4162a76..8f6e785 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,11 +26,13 @@ classifiers = [options] install_requires = lxml - six 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_version<"3.10" + tables; python_version<"3.10" + # for py>3.10, specify minimum tables version and let that choose appropriate numpy + numpy; python_version>="3.10" + tables>3.10; python_version>="3.10" natsort packages = find: