Skip to content

Commit

Permalink
Merge branch 'development' into experimental
Browse files Browse the repository at this point in the history
  • Loading branch information
pgleeson committed Feb 20, 2024
2 parents 446b65e + 1296b5c commit e58aecf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Build

on:
push:
branches: [ master, development, experimental ]
branches: [ master, development, experimental, test* ]
pull_request:
branches: [ master, development, experimental ]
branches: [ master, development, experimental, test* ]

jobs:
build:
Expand All @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.7", "3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
runs-on: [ubuntu-latest, windows-latest, macos-latest]

steps:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
[![Build](https://github.com/LEMS/pylems/actions/workflows/ci.yml/badge.svg)](https://github.com/LEMS/pylems/actions/workflows/ci.yml)
[![Check LEMS examples](https://github.com/LEMS/pylems/actions/workflows/examples.yml/badge.svg)](https://github.com/LEMS/pylems/actions/workflows/examples.yml)
[![Documentation Status](https://readthedocs.org/projects/pylems/badge/?version=latest)](https://pylems.readthedocs.io/en/latest/?badge=latest)
[![PyPI](https://img.shields.io/pypi/v/pylems)](https://pypi.org/project/pylems/)

A LEMS (http://lems.github.io/LEMS) simulator written in Python which can be used to run NeuroML2 models (see [here](https://docs.neuroml.org/Userdocs/Software/pyLEMS.html)).

Expand Down
9 changes: 8 additions & 1 deletion lems/parser/LEMS.py
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,14 @@ def parse_constant(self, node):
else:
description = None

constant = Constant(name, value, dimension, description)
if "symbol" in node.lattrib:
symbol = node.lattrib["symbol"]
else:
symbol = None

constant = Constant(
name, value, dimension=dimension, description=description, symbol=symbol
)

if self.current_component_type:
self.current_component_type.add_constant(constant)
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = PyLEMS
version = 0.6.4
version = 0.6.5
author = PyLEMS authors and contributors
author_email = [email protected], [email protected]
maintainer_email = [email protected]
Expand All @@ -13,12 +13,11 @@ classifiers =
License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
Natural Language :: English
Operating System :: OS Independent
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Topic :: Scientific/Engineering
license = LGPL-3.0-only

Expand Down

0 comments on commit e58aecf

Please sign in to comment.