Skip to content

Commit

Permalink
Merge pull request #396 from NeuroML/experimental
Browse files Browse the repository at this point in the history
 To v1.3.2 and use jnml v0.13.2; pinning numpy<2.0
  • Loading branch information
pgleeson authored Jun 18, 2024
2 parents 9c89227 + 0a82277 commit 1477a0a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 27 deletions.
26 changes: 2 additions & 24 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- development
- experimental
- 'test*'
pull_request_target:
pull_request:
branches:
- master
- development
Expand All @@ -18,8 +18,6 @@ jobs:
build:

runs-on: ubuntu-latest
permissions:
pull-requests: write
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
Expand All @@ -41,6 +39,7 @@ jobs:
- name: Upgrade pip, install deps
run: |
python -m pip install --upgrade pip
pip install 'numpy<2.0.0' # due to lingering issues with other modules
pip install .[dev]
- name: List packages so far
Expand All @@ -52,24 +51,3 @@ jobs:
pynml -h
./test-ghactions.sh -neuron
- name: Code Coverage Summary
uses: irongut/[email protected]
if: ${{ matrix.python-version == '3.12' }}
with:
output: both
filename: coverage.xml
badge: true
format: markdown
indicators: true
fail_below_min: false
hide_complexity: true
hide_branch_rate: true
thresholds: '50 75'

- name: Add Coverage PR Comment
uses: marocchino/sticky-pull-request-comment@v2
if: ${{ github.event_name == 'pull_request_target' && matrix.python-version == '3.12' }}
with:
recreate: true
path: code-coverage-results.md
2 changes: 1 addition & 1 deletion pyneuroml/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
__version__ = importlib_metadata.version("pyNeuroML")


JNEUROML_VERSION = "0.13.1"
JNEUROML_VERSION = "0.13.2"

# Define a logger for the package
logging.basicConfig(
Expand Down
Binary file not shown.
5 changes: 3 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = pyNeuroML
version = 1.3.1
version = 1.3.2
author = Padraig Gleeson
author_email = [email protected]
url = https://github.com/NeuroML/pyNeuroML
Expand Down Expand Up @@ -32,6 +32,7 @@ install_requires =
graphviz
typing; python_version<"3.5"
lxml
numpy<2.0.0
sympy
ppft[dill]

Expand Down Expand Up @@ -96,7 +97,7 @@ vispy-common =
vispy>=0.13.0
scipy
pyopengl
PyOpenGL-accelerate
PyOpenGL-accelerate; python_version<"3.12"

vispy-qt5 =
pyNeuroML[vispy-common]
Expand Down

0 comments on commit 1477a0a

Please sign in to comment.