Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion neuroml/nml/nml.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
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

import natsort
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
Expand Down
2 changes: 2 additions & 0 deletions neuroml/nml/regenerate-nml.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down