Skip to content

Commit 406d5ce

Browse files
authored
Merge pull request #81 from NeuroML/experimental
feat: convert to pyproject; fix numpy issues
2 parents 15af317 + 0d23fc0 commit 406d5ce

File tree

7 files changed

+118
-60
lines changed

7 files changed

+118
-60
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: ["3.8", "3.9", "3.10", "3.11"]
16+
python-version: ["3.10", "3.11", "3.12"]
1717
env:
1818
JNML_HOME: "/home/runner/work/NeuroMLlite/NeuroMLlite/jNeuroML"
1919
HDF5_DISABLE_VERSION_CHECK: 1
@@ -33,9 +33,7 @@ jobs:
3333
- name: Install NeuroMLlite and extra requirements
3434
run: |
3535
pip install .
36-
pip install -r requirements-extra.txt
37-
38-
#pip install 'numpy<=1.23.0' # temp fix, see https://github.com/OpenSourceBrain/osb-model-validation/issues/91
36+
pip install .[dev]
3937
4038
4139
- name: Lint with flake8
@@ -57,8 +55,7 @@ jobs:
5755
git clone https://github.com/NeuroML/pyNeuroML.git
5856
cd pyNeuroML
5957
git checkout $pynml_branch
60-
pip install pandas==1.3.5
61-
pip install NEURON==8.2.2 # Specify version of neuron - 8.2.1 fails
58+
pip install "NEURON>=8.2.2" # Specify version of neuron - 8.2.1 fails
6259
#pip install -r requirements-dev.txt
6360
pip install .
6461
cd -
@@ -93,7 +90,7 @@ jobs:
9390
9491
- name: Install some simulators for testing
9592
run: |
96-
#pip install cython
93+
pip install "cython<3.1.0" # for nest...
9794
omv install NEURON
9895
pip install NetPyNE # strange issues on py3.7 with omv install...
9996
omv install PyNN

.pre-commit-config.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# See https://pre-commit.com for more information
2+
# See https://pre-commit.com/hooks.html for more hooks
3+
repos:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v4.4.0
6+
hooks:
7+
- id: trailing-whitespace
8+
- id: end-of-file-fixer
9+
- id: check-added-large-files
10+
args: [ "--maxkb=5000"]
11+
- repo: https://github.com/astral-sh/ruff-pre-commit
12+
rev: v0.4.1
13+
hooks:
14+
- id: ruff
15+
args: [ "--select", "I", "--fix" ]
16+
- id: ruff-format

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ NeuroMLlite is in active development. This will evolve into a framework for more
1414

1515
For some more background to this package see here: https://github.com/NeuroML/NetworkShorthand.
1616

17-
![Architecture](images/NetworkShorthand.png)
17+
![Architecture](images/NetworkShorthand.png)
1818

1919

2020
## Examples

pyproject.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[build-system]
2+
requires = ["setuptools"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[tool.ruff]
6+
7+
exclude = [
8+
"examples",
9+
]
10+
11+
[tool.ruff.lint]
12+
ignore = ["F403", "F405"]

requirements-extra.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

setup.cfg

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
[metadata]
2+
name = neuromllite
3+
version = 0.6.1
4+
author = Padraig Gleeson
5+
author_email = [email protected]
6+
url = https://github.com/NeuroML/NeuroMLlit
7+
license = LGPL-3.0-only
8+
description = A common JSON/YAML based format for compact network specification, closely tied to NeuroML v2
9+
long_description = file: README.md
10+
long_description_content_type = text/markdown
11+
classifiers =
12+
Intended Audience :: Science/Research
13+
Natural Language :: English
14+
Operating System :: OS Independent
15+
Programming Language :: Python :: 3.9
16+
Programming Language :: Python :: 3.10
17+
Programming Language :: Python :: 3.11
18+
Programming Language :: Python :: 3.12
19+
Programming Language :: Python :: 3.13
20+
Topic :: Scientific/Engineering
21+
22+
[options]
23+
install_requires =
24+
libNeuroML>=0.5.1
25+
pyyaml
26+
numpy
27+
tables
28+
h5py
29+
modelspec>=0.2.6
30+
ppft[dill]
31+
32+
packages = find:
33+
34+
[options.packages.find]
35+
include =
36+
neuromllite
37+
neuromllite.sweep
38+
neuromllite.gui
39+
40+
[options.entry_points]
41+
console_scripts =
42+
nmllite-ui = neuromllite.gui.NMLliteUI:main
43+
44+
[options.extras_require]
45+
extras =
46+
pyNN
47+
bmtk
48+
matplotlib
49+
PyQt5
50+
pyneuroml
51+
pyelectro
52+
neuron
53+
h5py
54+
graphviz
55+
56+
57+
all =
58+
neuromllite[extras]
59+
60+
dev =
61+
neuromllite[all]
62+
neuromllite[doc]
63+
pytest
64+
pytest-xdist
65+
pre-commit
66+
67+
68+
doc =
69+
sphinxcontrib-bibtex
70+
#pyNN
71+
bmtk
72+
matplotlib
73+
PyQt5
74+
pyneuroml
75+
pyelectro
76+
numpy
77+
neuron
78+
h5py
79+
graphviz
80+
pylems
81+
tables
82+
arbor==0.9.0
83+
84+
[flake8]
85+
extend-ignore = E501, E502, F403, F405, W503, W504

setup.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)