Skip to content

Commit 0a82277

Browse files
Merge pull request #395 from NeuroML/feat/ci-fixes
Deps and CI fixes
2 parents 107c94b + 0f84866 commit 0a82277

File tree

2 files changed

+3
-25
lines changed

2 files changed

+3
-25
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 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"]
@@ -53,24 +51,3 @@ jobs:
5351
pynml -h
5452
5553
./test-ghactions.sh -neuron
56-
57-
- name: Code Coverage Summary
58-
uses: irongut/[email protected]
59-
if: ${{ matrix.python-version == '3.12' }}
60-
with:
61-
output: both
62-
filename: coverage.xml
63-
badge: true
64-
format: markdown
65-
indicators: true
66-
fail_below_min: false
67-
hide_complexity: true
68-
hide_branch_rate: true
69-
thresholds: '50 75'
70-
71-
- name: Add Coverage PR Comment
72-
uses: marocchino/sticky-pull-request-comment@v2
73-
if: ${{ github.event_name == 'pull_request_target' && matrix.python-version == '3.12' }}
74-
with:
75-
recreate: true
76-
path: code-coverage-results.md

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)