Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes from master merged in #416

Merged
merged 39 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
57d762d
chore: update contributing guidelines
sanjayankur31 Mar 4, 2024
bb5781e
docs(contributing): add venv, editable installs, info on tests
sanjayankur31 Mar 4, 2024
dba5561
docs(readme): add extra sub-packages
sanjayankur31 Mar 5, 2024
ce1a0c9
docs: update README.md
allcontributors[bot] Mar 18, 2024
fa72993
docs: update .all-contributorsrc
allcontributors[bot] Mar 18, 2024
f619fae
Merge pull request #322 from NeuroML/all-contributors/add-lej0hn
sanjayankur31 Mar 18, 2024
9f09f60
docs: update README.md
allcontributors[bot] Mar 18, 2024
419bf30
docs: update .all-contributorsrc
allcontributors[bot] Mar 18, 2024
3c68bd1
Merge pull request #323 from NeuroML/all-contributors/add-Dhruvanshu-…
sanjayankur31 Mar 18, 2024
2b356e0
docs: update README.md
allcontributors[bot] Mar 18, 2024
e33a030
docs: update .all-contributorsrc
allcontributors[bot] Mar 18, 2024
75dbc99
Merge pull request #324 from NeuroML/all-contributors/add-AdityaBITMESRA
sanjayankur31 Mar 18, 2024
dda3817
docs: update README.md
allcontributors[bot] Apr 9, 2024
8f738cc
docs: update .all-contributorsrc
allcontributors[bot] Apr 9, 2024
3269c90
Merge pull request #331 from NeuroML/all-contributors/add-YBCS
sanjayankur31 Apr 9, 2024
57f84fe
docs: update README.md
allcontributors[bot] May 16, 2024
fd9d0f6
docs: update .all-contributorsrc
allcontributors[bot] May 16, 2024
1b78e93
Merge pull request #363 from NeuroML/all-contributors/add-lej0hn
sanjayankur31 May 16, 2024
6bb2358
docs: update README.md
allcontributors[bot] May 16, 2024
9a13540
docs: update .all-contributorsrc
allcontributors[bot] May 16, 2024
7676d4e
Merge pull request #364 from NeuroML/all-contributors/add-YBCS
sanjayankur31 May 16, 2024
33a9382
docs: update README.md
allcontributors[bot] May 22, 2024
f38e178
docs: update .all-contributorsrc
allcontributors[bot] May 22, 2024
016bf7d
Merge pull request #370 from NeuroML/all-contributors/add-lej0hn
sanjayankur31 May 22, 2024
2056045
chore: update contributing guidelines
sanjayankur31 May 22, 2024
b6986b3
fix(setup.cfg): include template channel file in data
sanjayankur31 Feb 6, 2024
761e174
ci: update config to match development
sanjayankur31 Jun 3, 2024
a68c475
Merge pull request #378 from NeuroML/feat/fix-master
sanjayankur31 Jun 3, 2024
e6c3713
docs: update README.md
allcontributors[bot] Jun 4, 2024
9ea94ac
docs: update .all-contributorsrc
allcontributors[bot] Jun 4, 2024
abec063
Merge pull request #381 from NeuroML/all-contributors/add-AdityaBITMESRA
sanjayankur31 Jun 4, 2024
c231033
docs: update README.md
allcontributors[bot] Jul 18, 2024
0cda1c8
docs: update .all-contributorsrc
allcontributors[bot] Jul 18, 2024
d7815f0
Merge pull request #409 from NeuroML/all-contributors/add-stellaprins
sanjayankur31 Jul 18, 2024
8b01bdf
fix: add mandatory cell biophys
sanjayankur31 Jul 21, 2024
180eb5f
fix(ci): correct ruff command
sanjayankur31 Jul 21, 2024
c8abfb0
deps: limit pyopengl-accelerate to py<3.12
sanjayankur31 Jul 21, 2024
be1d616
feat(ci): correct ruff cli
sanjayankur31 Jul 21, 2024
88b9e71
Merge branch 'master' into experimental
pgleeson Aug 19, 2024
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
54 changes: 54 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,60 @@
"code",
"test"
]
},
{
"login": "lej0hn",
"name": "Giannis Daras",
"avatar_url": "https://avatars.githubusercontent.com/u/72049569?v=4",
"profile": "https://github.com/lej0hn",
"contributions": [
"bug",
"ideas",
"review",
"code"
]
},
{
"login": "Dhruvanshu-Joshi",
"name": "Dhruvanshu-Joshi",
"avatar_url": "https://avatars.githubusercontent.com/u/104030847?v=4",
"profile": "https://github.com/Dhruvanshu-Joshi",
"contributions": [
"bug",
"ideas"
]
},
{
"login": "AdityaBITMESRA",
"name": "AdityaBITMESRA",
"avatar_url": "https://avatars.githubusercontent.com/u/147182147?v=4",
"profile": "https://github.com/AdityaBITMESRA",
"contributions": [
"bug",
"ideas",
"code",
"review"
]
},
{
"login": "YBCS",
"name": "Y. Budhachandra",
"avatar_url": "https://avatars.githubusercontent.com/u/29734619?v=4",
"profile": "https://github.com/YBCS",
"contributions": [
"code",
"test"
]
},
{
"login": "stellaprins",
"name": "Stella",
"avatar_url": "https://avatars.githubusercontent.com/u/30465823?v=4",
"profile": "https://github.com/stellaprins",
"contributions": [
"code",
"ideas"
]
}
],
"contributorsPerLine": 7,
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,8 @@ jobs:
pynml -h

./test-ghactions.sh -neuron

- name: Lint with ruff
run: |
pip install ruff
ruff check . --exit-zero
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pyNeuroML
[![Twitter Follow](https://img.shields.io/twitter/follow/NeuroML?style=social)](https://twitter.com/NeuroML)
[![Gitter](https://badges.gitter.im/NeuroML/community.svg)](https://gitter.im/NeuroML/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors)
[![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

A single package in Python unifying scripts and modules for reading, writing, simulating and analysing NeuroML2/LEMS models.
Expand Down Expand Up @@ -192,6 +192,13 @@ More closely tied to PyNN?
<td align="center" valign="top" width="14.28%"><a href="https://github.com/andrisecker"><img src="https://avatars.githubusercontent.com/u/13274870?v=4?s=100" width="100px;" alt="András Ecker"/><br /><sub><b>András Ecker</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/issues?q=author%3Aandrisecker" title="Bug reports">🐛</a> <a href="https://github.com/NeuroML/pyNeuroML/commits?author=andrisecker" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/RokasSt"><img src="https://avatars.githubusercontent.com/u/12904422?v=4?s=100" width="100px;" alt="Rokas Stanislovas"/><br /><sub><b>Rokas Stanislovas</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/issues?q=author%3ARokasSt" title="Bug reports">🐛</a> <a href="https://github.com/NeuroML/pyNeuroML/commits?author=RokasSt" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/robertvi"><img src="https://avatars.githubusercontent.com/u/456100?v=4?s=100" width="100px;" alt="Robert Vickerstaff"/><br /><sub><b>Robert Vickerstaff</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/commits?author=robertvi" title="Code">💻</a> <a href="https://github.com/NeuroML/pyNeuroML/commits?author=robertvi" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lej0hn"><img src="https://avatars.githubusercontent.com/u/72049569?v=4?s=100" width="100px;" alt="Giannis Daras"/><br /><sub><b>Giannis Daras</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/issues?q=author%3Alej0hn" title="Bug reports">🐛</a> <a href="#ideas-lej0hn" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/NeuroML/pyNeuroML/pulls?q=is%3Apr+reviewed-by%3Alej0hn" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/NeuroML/pyNeuroML/commits?author=lej0hn" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Dhruvanshu-Joshi"><img src="https://avatars.githubusercontent.com/u/104030847?v=4?s=100" width="100px;" alt="Dhruvanshu-Joshi"/><br /><sub><b>Dhruvanshu-Joshi</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/issues?q=author%3ADhruvanshu-Joshi" title="Bug reports">🐛</a> <a href="#ideas-Dhruvanshu-Joshi" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AdityaBITMESRA"><img src="https://avatars.githubusercontent.com/u/147182147?v=4?s=100" width="100px;" alt="AdityaBITMESRA"/><br /><sub><b>AdityaBITMESRA</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/issues?q=author%3AAdityaBITMESRA" title="Bug reports">🐛</a> <a href="#ideas-AdityaBITMESRA" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/NeuroML/pyNeuroML/commits?author=AdityaBITMESRA" title="Code">💻</a> <a href="https://github.com/NeuroML/pyNeuroML/pulls?q=is%3Apr+reviewed-by%3AAdityaBITMESRA" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/YBCS"><img src="https://avatars.githubusercontent.com/u/29734619?v=4?s=100" width="100px;" alt="Y. Budhachandra"/><br /><sub><b>Y. Budhachandra</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/commits?author=YBCS" title="Code">💻</a> <a href="https://github.com/NeuroML/pyNeuroML/commits?author=YBCS" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/stellaprins"><img src="https://avatars.githubusercontent.com/u/30465823?v=4?s=100" width="100px;" alt="Stella"/><br /><sub><b>Stella</b></sub></a><br /><a href="https://github.com/NeuroML/pyNeuroML/commits?author=stellaprins" title="Code">💻</a> <a href="#ideas-stellaprins" title="Ideas, Planning, & Feedback">🤔</a></td>
</tr>
</tbody>
<tfoot>
Expand Down
1 change: 1 addition & 0 deletions tests/utils/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import pathlib as pl

import neuroml

from pyneuroml.pynml import read_neuroml2_file, write_neuroml2_file
from pyneuroml.utils import (
extract_position_info,
Expand Down
Loading