From 705fadf81d14e501859c46b6f09c56623b693d74 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 19 Sep 2023 11:45:20 +0100 Subject: [PATCH 1/6] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f541de2..fef5a77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: Build on: push: - branches: [ master, development ] + branches: [ master, development, test* ] pull_request: - branches: [ master, development ] + branches: [ master, development, test* ] jobs: build: From 26853b1e9fdc31fad1e9ab8f9edb633e2cdf4570 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Tue, 19 Sep 2023 11:49:44 +0100 Subject: [PATCH 2/6] Don't test on 2.7; add pypi badge; add readthedocs yaml --- .github/workflows/ci.yml | 3 ++- .readthedocs.yaml | 15 +++++++++++++++ README.md | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .readthedocs.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fef5a77..cd70745 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,9 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - python-version: [2.7, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 0000000..ae78afd --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,15 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.11" + + +sphinx: + configuration: doc/conf.py + + +python: + install: + - requirements: doc/requirements.txt diff --git a/README.md b/README.md index c85fa07..73b6aec 100644 --- a/README.md +++ b/README.md @@ -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 (http://neuroml.org/neuroml2.php) models. From c96ef7c506268f84f296e15f0f8824f726377b82 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Fri, 22 Sep 2023 16:37:06 +0100 Subject: [PATCH 3/6] To v0.6.5 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 3068171..7581086 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = PyLEMS -version = 0.6.4 +version = 0.6.5 author = PyLEMS authors and contributors author_email = gautham@lisphacker.org, p.gleeson@gmail.com maintainer_email = p.gleeson@gmail.com From 73f6f80516b9d1b6e9403f3c7810810e5f893441 Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 12 Dec 2023 15:56:05 +0000 Subject: [PATCH 4/6] feat: add py312, drop EOL pys --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7581086..a84acf1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 From d410251ae1c22836d30848cc9464fe0c1124a25e Mon Sep 17 00:00:00 2001 From: "Ankur Sinha (Ankur Sinha Gmail)" Date: Tue, 12 Dec 2023 15:57:00 +0000 Subject: [PATCH 5/6] ci: drop EOL pys, add py312 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 524f10b..3bfdf23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: From 20c0cb36a3080dd86a6ec94d0ae74f49acf2b27c Mon Sep 17 00:00:00 2001 From: leon-k-martin Date: Tue, 30 Jan 2024 16:37:16 +0100 Subject: [PATCH 6/6] FIX: Add symbol attribute to Constant class constructor to fix false assigment of description to the symbol attribute. --- lems/parser/LEMS.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lems/parser/LEMS.py b/lems/parser/LEMS.py index 47158aa..b8b1d71 100644 --- a/lems/parser/LEMS.py +++ b/lems/parser/LEMS.py @@ -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)