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 Aug 7, 2024
2 parents f19ab2d + 2b6acdd commit 533dbf3
Show file tree
Hide file tree
Showing 18 changed files with 322 additions and 59 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
runs-on: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -30,7 +30,7 @@ jobs:
python -m pip install pytest pytest-cov
- name: Checkout NeuroML2
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: NeuroML/NeuroML2
ref: development
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: nelonoel/[email protected]

# https://stackoverflow.com/questions/58033366/how-to-get-current-branch-within-github-actions
Expand All @@ -21,7 +21,7 @@ jobs:
id: extract_branch

- name: Checkout jlems
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: LEMS/jLEMS
ref: ${{ steps.extract_branch.outputs.branch }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
7 changes: 5 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ build:
sphinx:
configuration: doc/conf.py


python:
install:
- requirements: doc/requirements.txt
- method: pip
path: .
extra_requirements:
- doc

1 change: 0 additions & 1 deletion doc/requirements.txt

This file was deleted.

1 change: 1 addition & 0 deletions lems/base/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def __init__(self, message, *params, **key_params):

self.message = None
""" Error message
:type: string """

if params:
Expand Down
1 change: 1 addition & 0 deletions lems/base/stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def __init__(self):

self.stack = []
""" List used to store the stack contents.
:type: list """

def push(self, val):
Expand Down
Loading

0 comments on commit 533dbf3

Please sign in to comment.