Skip to content

Commit 1477a0a

Browse files
authored
Merge pull request #396 from NeuroML/experimental
To v1.3.2 and use jnml v0.13.2; pinning numpy<2.0
2 parents 9c89227 + 0a82277 commit 1477a0a

File tree

4 files changed

+6
-27
lines changed

4 files changed

+6
-27
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- development
88
- experimental
99
- 'test*'
10-
pull_request_target:
10+
pull_request:
1111
branches:
1212
- master
1313
- development
@@ -18,8 +18,6 @@ jobs:
1818
build:
1919

2020
runs-on: ubuntu-latest
21-
permissions:
22-
pull-requests: write
2321
strategy:
2422
matrix:
2523
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
@@ -41,6 +39,7 @@ jobs:
4139
- name: Upgrade pip, install deps
4240
run: |
4341
python -m pip install --upgrade pip
42+
pip install 'numpy<2.0.0' # due to lingering issues with other modules
4443
pip install .[dev]
4544
4645
- name: List packages so far
@@ -52,24 +51,3 @@ jobs:
5251
pynml -h
5352
5453
./test-ghactions.sh -neuron
55-
56-
- name: Code Coverage Summary
57-
uses: irongut/CodeCoverageSummary@v1.3.0
58-
if: ${{ matrix.python-version == '3.12' }}
59-
with:
60-
output: both
61-
filename: coverage.xml
62-
badge: true
63-
format: markdown
64-
indicators: true
65-
fail_below_min: false
66-
hide_complexity: true
67-
hide_branch_rate: true
68-
thresholds: '50 75'
69-
70-
- name: Add Coverage PR Comment
71-
uses: marocchino/sticky-pull-request-comment@v2
72-
if: ${{ github.event_name == 'pull_request_target' && matrix.python-version == '3.12' }}
73-
with:
74-
recreate: true
75-
path: code-coverage-results.md

pyneuroml/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
__version__ = importlib_metadata.version("pyNeuroML")
1313

1414

15-
JNEUROML_VERSION = "0.13.1"
15+
JNEUROML_VERSION = "0.13.2"
1616

1717
# Define a logger for the package
1818
logging.basicConfig(
27.5 MB
Binary file not shown.

setup.cfg

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = pyNeuroML
3-
version = 1.3.1
3+
version = 1.3.2
44
author = Padraig Gleeson
55
author_email = p.gleeson@gmail.com
66
url = https://github.com/NeuroML/pyNeuroML
@@ -32,6 +32,7 @@ install_requires =
3232
graphviz
3333
typing; python_version<"3.5"
3434
lxml
35+
numpy<2.0.0
3536
sympy
3637
ppft[dill]
3738

@@ -96,7 +97,7 @@ vispy-common =
9697
vispy>=0.13.0
9798
scipy
9899
pyopengl
99-
PyOpenGL-accelerate
100+
PyOpenGL-accelerate; python_version<"3.12"
100101

101102
vispy-qt5 =
102103
pyNeuroML[vispy-common]

0 commit comments

Comments
 (0)