From d3c302e1ee2b1ed3c05aab8533341fa5d240b792 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 12 Jan 2023 10:15:20 +0000 Subject: [PATCH 01/21] Install hdf5 from source --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b770161..e3683cc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,7 @@ jobs: - name: Install package run: | + if [[ ${{ matrix.python-version }} == 3.11 ]]; then pip3 install --no-binary=h5py h5py ; fi python -m pip install --upgrade pip pip install .[dev] @@ -56,7 +57,7 @@ jobs: - name: Run pytest run: | - pytest tests + pytest tests -v - name: Install & test NeuroMLlite run: | From f49bb8862ee9c242f9d0b0ebbad14e1c4464f286 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 12 Jan 2023 10:20:34 +0000 Subject: [PATCH 02/21] install libhdf5-dev --- .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 e3683cc7..1c0e3a0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - name: Install package run: | - if [[ ${{ matrix.python-version }} == 3.11 ]]; then pip3 install --no-binary=h5py h5py ; fi + if [[ ${{ matrix.python-version }} == 3.11 ]]; then apt install -y libhdf5-dev; pip3 install --no-binary=h5py h5py ; fi python -m pip install --upgrade pip pip install .[dev] From ad4df1922bf80bd1cdba33361079dc7915819dee Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 12 Jan 2023 10:28:55 +0000 Subject: [PATCH 03/21] sudo --- .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 1c0e3a0f..8d7fea41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - name: Install package run: | - if [[ ${{ matrix.python-version }} == 3.11 ]]; then apt install -y libhdf5-dev; pip3 install --no-binary=h5py h5py ; fi + if [[ ${{ matrix.python-version }} == 3.11 ]]; then sudo apt install -y libhdf5-dev; pip3 install --no-binary=h5py h5py ; fi python -m pip install --upgrade pip pip install .[dev] From f25194c61c89fb46646d5d80340a19a5bb226afb Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 31 Jan 2023 16:42:07 +0000 Subject: [PATCH 04/21] Update ci.yml --- .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 8d7fea41..050a41a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: - name: Install package run: | - if [[ ${{ matrix.python-version }} == 3.11 ]]; then sudo apt install -y libhdf5-dev; pip3 install --no-binary=h5py h5py ; fi + if [[ ${{ matrix.python-version }} == 3.11 ]]; then sudo apt-get install libhdf5-serial-dev liblzo2-dev -y; pip3 install --no-binary=h5py h5py ; fi python -m pip install --upgrade pip pip install .[dev] From 49d9fc6e1f70826b503c8be7e1515ca5203dc157 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Tue, 8 Aug 2023 13:15:17 +0100 Subject: [PATCH 05/21] Test 3.11 --- .github/workflows/ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69208b06..5b8706b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.7", "3.8", "3.9", "3.10"] + python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] runs-on: [ubuntu-latest, macos-latest, windows-latest] steps: @@ -34,9 +34,16 @@ jobs: with: python-version: ${{ matrix.python-version }} + + - name: Install h5py + if: ${{ matrix.python-version == '3.11' }} + run: | + #if [[ ${{ matrix.runs-on }} == *"macos"* ]]; then brew install graphviz ; fi + #if [[ ${{ matrix.runs-on }} == *"ubuntu"* ]]; then sudo apt-get install libhdf5-serial-dev liblzo2-dev -y; pip3 install --no-binary=h5py h5py ; fi + pip list + - name: Install package run: | - if [[ ${{ matrix.python-version }} == 3.11 ]]; then sudo apt-get install libhdf5-serial-dev liblzo2-dev -y; pip3 install --no-binary=h5py h5py ; fi python -m pip install --upgrade pip pip install .[dev] From c3000df1f4bbd1aae43090412afc386a1311342c Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 8 Nov 2023 16:17:59 +0000 Subject: [PATCH 06/21] Regenerated --- docs/sphinx/source/api/Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/api/Contributors.md b/docs/sphinx/source/api/Contributors.md index 51d4661e..348797e3 100644 --- a/docs/sphinx/source/api/Contributors.md +++ b/docs/sphinx/source/api/Contributors.md @@ -3,7 +3,7 @@ # Modelspec contributors This page list names and Github profiles of contributors to Modelspec, listed in no particular order. -This page is generated periodically, most recently on 2023-09-19. +This page is generated periodically, most recently on 2023-11-08. - Padraig Gleeson ([@pgleeson](https://github.com/pgleeson)) - Manifest Chakalov ([@mqnifestkelvin](https://github.com/mqnifestkelvin)) From 5f6b50dbe927d03eebc5012aca7b9d1b5e7e20c8 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 8 Nov 2023 16:46:48 +0000 Subject: [PATCH 07/21] Add isbn to doc --- docs/sphinx/source/api/examples/document.bson | Bin 222 -> 232 bytes docs/sphinx/source/api/examples/document.json | 1 + docs/sphinx/source/api/examples/document.py | 2 +- docs/sphinx/source/api/examples/document.xml | 2 +- docs/sphinx/source/api/examples/document.yaml | 1 + examples/document.bson | Bin 222 -> 232 bytes examples/document.json | 1 + examples/document.py | 2 +- examples/document.xml | 2 +- examples/document.yaml | 1 + 10 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/sphinx/source/api/examples/document.bson b/docs/sphinx/source/api/examples/document.bson index 61eb48f7410792fb18b01ad108a1764219f2bd56..577bfeed44bab2a72fb0578c06f5ced25c7f882c 100644 GIT binary patch delta 34 qcmcb|_=1u51p@;Evu~wSettH??TNe!oC2P~PJRs43=9)>HUR*%hY8vM delta 24 gcmaFCc#o0y9s>gdvu~wSettH?#fiKM6U{dQ0Aa)k5C8xG diff --git a/docs/sphinx/source/api/examples/document.json b/docs/sphinx/source/api/examples/document.json index 5e61879e..f94e651c 100644 --- a/docs/sphinx/source/api/examples/document.json +++ b/docs/sphinx/source/api/examples/document.json @@ -1,6 +1,7 @@ { "MyBook": { "title": "My life in Python", + "ISBN": 123, "sections": { "Abstract": { "paragraphs": [ diff --git a/docs/sphinx/source/api/examples/document.py b/docs/sphinx/source/api/examples/document.py index c57be063..578099c7 100644 --- a/docs/sphinx/source/api/examples/document.py +++ b/docs/sphinx/source/api/examples/document.py @@ -52,7 +52,7 @@ class Document(Base): sections: List[Section] = field(factory=list) -doc = Document(id="MyBook") +doc = Document(id="MyBook", ISBN=123) doc.title = "My life in Python" a = Section(id="Abstract") diff --git a/docs/sphinx/source/api/examples/document.xml b/docs/sphinx/source/api/examples/document.xml index 164039f1..a7f9fedc 100644 --- a/docs/sphinx/source/api/examples/document.xml +++ b/docs/sphinx/source/api/examples/document.xml @@ -1,5 +1,5 @@ - +
diff --git a/docs/sphinx/source/api/examples/document.yaml b/docs/sphinx/source/api/examples/document.yaml index 54e03ea7..a5a8df3f 100644 --- a/docs/sphinx/source/api/examples/document.yaml +++ b/docs/sphinx/source/api/examples/document.yaml @@ -1,5 +1,6 @@ MyBook: title: My life in Python + ISBN: 123 sections: Abstract: paragraphs: diff --git a/examples/document.bson b/examples/document.bson index 61eb48f7410792fb18b01ad108a1764219f2bd56..577bfeed44bab2a72fb0578c06f5ced25c7f882c 100644 GIT binary patch delta 34 qcmcb|_=1u51p@;Evu~wSettH??TNe!oC2P~PJRs43=9)>HUR*%hY8vM delta 24 gcmaFCc#o0y9s>gdvu~wSettH?#fiKM6U{dQ0Aa)k5C8xG diff --git a/examples/document.json b/examples/document.json index 5e61879e..f94e651c 100644 --- a/examples/document.json +++ b/examples/document.json @@ -1,6 +1,7 @@ { "MyBook": { "title": "My life in Python", + "ISBN": 123, "sections": { "Abstract": { "paragraphs": [ diff --git a/examples/document.py b/examples/document.py index c57be063..578099c7 100644 --- a/examples/document.py +++ b/examples/document.py @@ -52,7 +52,7 @@ class Document(Base): sections: List[Section] = field(factory=list) -doc = Document(id="MyBook") +doc = Document(id="MyBook", ISBN=123) doc.title = "My life in Python" a = Section(id="Abstract") diff --git a/examples/document.xml b/examples/document.xml index 164039f1..a7f9fedc 100644 --- a/examples/document.xml +++ b/examples/document.xml @@ -1,5 +1,5 @@ - +
diff --git a/examples/document.yaml b/examples/document.yaml index 54e03ea7..a5a8df3f 100644 --- a/examples/document.yaml +++ b/examples/document.yaml @@ -1,5 +1,6 @@ MyBook: title: My life in Python + ISBN: 123 sections: Abstract: paragraphs: From 309eecb2df696f1aa731ca33993f93e74b211805 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 8 Nov 2023 17:03:16 +0000 Subject: [PATCH 08/21] Add pandas requirement for docs --- setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.cfg b/setup.cfg index cc44eee2..34665b58 100644 --- a/setup.cfg +++ b/setup.cfg @@ -68,6 +68,7 @@ test = typing_extensions; python_version<'3.8' docs = + pandas requests Sphinx recommonmark>=0.5.0 From 5b96714320c788b8e06b63e59501a304e0bc5f3a Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 22 Nov 2023 16:11:18 +0000 Subject: [PATCH 09/21] Tweak --- docs/sphinx/source/api/Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/api/Contributors.md b/docs/sphinx/source/api/Contributors.md index 348797e3..f6b2757b 100644 --- a/docs/sphinx/source/api/Contributors.md +++ b/docs/sphinx/source/api/Contributors.md @@ -3,7 +3,7 @@ # Modelspec contributors This page list names and Github profiles of contributors to Modelspec, listed in no particular order. -This page is generated periodically, most recently on 2023-11-08. +This page is generated periodically, most recently on 2023-11-22. - Padraig Gleeson ([@pgleeson](https://github.com/pgleeson)) - Manifest Chakalov ([@mqnifestkelvin](https://github.com/mqnifestkelvin)) From dbb32226b3b7452dadeaf79ae1a31deee7a6f186 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 22 Nov 2023 17:06:45 +0000 Subject: [PATCH 10/21] Pin cattrs to test if that's the issue... --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 34665b58..cc57b630 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,7 +38,7 @@ install_requires = numpy tabulate attrs - cattrs + cattrs==23.1.2 # dependency needs to be removed... docstring-parser typing_extensions;python_version<'3.8' typing_compat;python_version<'3.8' From b8b1f662ce8c6c4b241fe40a18f227656c4b8e9a Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Thu, 23 Nov 2023 11:01:23 +0000 Subject: [PATCH 11/21] Update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index cc57b630..a54b863c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,7 +38,7 @@ install_requires = numpy tabulate attrs - cattrs==23.1.2 # dependency needs to be removed... + cattrs<23.2.1 # Issue with JSON serialisation from this version, see https://github.com/ModECI/modelspec/issues/66 docstring-parser typing_extensions;python_version<'3.8' typing_compat;python_version<'3.8' From 50c54c5c43ba67615af7cbe6620852d823b1adc5 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 13 Dec 2023 17:17:03 +0000 Subject: [PATCH 12/21] Add 3.11 as supported env --- docs/sphinx/source/api/Contributors.md | 2 +- setup.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/sphinx/source/api/Contributors.md b/docs/sphinx/source/api/Contributors.md index f6b2757b..a43d6881 100644 --- a/docs/sphinx/source/api/Contributors.md +++ b/docs/sphinx/source/api/Contributors.md @@ -3,7 +3,7 @@ # Modelspec contributors This page list names and Github profiles of contributors to Modelspec, listed in no particular order. -This page is generated periodically, most recently on 2023-11-22. +This page is generated periodically, most recently on 2023-12-13. - Padraig Gleeson ([@pgleeson](https://github.com/pgleeson)) - Manifest Chakalov ([@mqnifestkelvin](https://github.com/mqnifestkelvin)) diff --git a/setup.cfg b/setup.cfg index a54b863c..c43a6e39 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,6 +26,7 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Topic :: Scientific/Engineering Topic :: Software Development Typing :: Typed From 6216251aa1a831359e5d61f17a82d861c2e9007f Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 13 Dec 2023 17:34:10 +0000 Subject: [PATCH 13/21] Test unpin cattrs --- .github/workflows/ci.yml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93f171f2..e9e5f119 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11"] runs-on: [ubuntu-latest, macos-latest, windows-latest] steps: diff --git a/setup.cfg b/setup.cfg index c43a6e39..fadb3e7a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,7 +39,7 @@ install_requires = numpy tabulate attrs - cattrs<23.2.1 # Issue with JSON serialisation from this version, see https://github.com/ModECI/modelspec/issues/66 + cattrs docstring-parser typing_extensions;python_version<'3.8' typing_compat;python_version<'3.8' From 8e9339475e3b04e4fbd0a9d3cb63331d8a87c963 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 13 Dec 2023 17:46:39 +0000 Subject: [PATCH 14/21] More specific version... --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fadb3e7a..c732f09c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,7 +39,7 @@ install_requires = numpy tabulate attrs - cattrs + cattrs>=23.2.3 # Issue with JSON serialisation in some versions, see https://github.com/ModECI/modelspec/issues/66 docstring-parser typing_extensions;python_version<'3.8' typing_compat;python_version<'3.8' From 1f6db923e35b1b82db6d6360444efcf61b2188b6 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 13 Dec 2023 17:57:01 +0000 Subject: [PATCH 15/21] Remove 3.7 support... --- .github/workflows/ci.yml | 2 +- setup.cfg | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e9e5f119..a8f80fa6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: [ "3.8", "3.9", "3.10", "3.11"] runs-on: [ubuntu-latest, macos-latest, windows-latest] steps: diff --git a/setup.cfg b/setup.cfg index c732f09c..cd33b37f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,7 +22,6 @@ classifiers = Programming Language :: Python Programming Language :: Python :: 3 Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 From 386fa236fe8bf5ae72b4b236b2d7408d46757fed Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 13 Dec 2023 17:58:40 +0000 Subject: [PATCH 16/21] h5py install not required --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8f80fa6..44058c1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,13 +35,6 @@ jobs: python-version: ${{ matrix.python-version }} - - name: Install h5py - if: ${{ matrix.python-version == '3.11' }} - run: | - #if [[ ${{ matrix.runs-on }} == *"macos"* ]]; then brew install graphviz ; fi - #if [[ ${{ matrix.runs-on }} == *"ubuntu"* ]]; then sudo apt-get install libhdf5-serial-dev liblzo2-dev -y; pip3 install --no-binary=h5py h5py ; fi - pip list - - name: Install package run: | python -m pip install --upgrade pip From b3db3a6e0d12bea32f63eab2e2df3b5e98b144c2 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 17 Jan 2024 18:25:45 +0000 Subject: [PATCH 17/21] Remove 3.7 checks in ci --- .github/workflows/ci.yml | 7 ++----- docs/sphinx/source/api/Contributors.md | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44058c1a..1d71ca54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,7 +57,6 @@ jobs: python test.py - name: Test NeuroML examples - if: ${{ matrix.python-version != '3.7'}} run: | cd examples/neuroml2 @@ -66,7 +65,6 @@ jobs: # Note: NeuroML files will be validated with OMV below - name: Test SBML examples - if: ${{ matrix.python-version != '3.7'}} run: | cd examples/sbml @@ -76,11 +74,11 @@ jobs: run: | pytest tests -v - - name: Install & test NeuroMLlite + - name: Test NeuroMLlite run: | git clone --branch development https://github.com/NeuroML/NeuroMLlite.git cd NeuroMLlite - #pip install . # Use versions of neuroml libs as set in setup.py + # pip install . # Use versions of neuroml libs as set in modelspec's setup.cfg -> dev -> NeuroMLlite cd examples python Example1.py @@ -94,7 +92,6 @@ jobs: python arrays.py -run # test one example - name: Build Documentation - if: ${{ matrix.python-version != '3.7'}} run: | # Note: contributors generation below fails on py 3.7 due to pandas version... pip install .[docs] diff --git a/docs/sphinx/source/api/Contributors.md b/docs/sphinx/source/api/Contributors.md index a43d6881..8877907a 100644 --- a/docs/sphinx/source/api/Contributors.md +++ b/docs/sphinx/source/api/Contributors.md @@ -3,7 +3,7 @@ # Modelspec contributors This page list names and Github profiles of contributors to Modelspec, listed in no particular order. -This page is generated periodically, most recently on 2023-12-13. +This page is generated periodically, most recently on 2024-01-17. - Padraig Gleeson ([@pgleeson](https://github.com/pgleeson)) - Manifest Chakalov ([@mqnifestkelvin](https://github.com/mqnifestkelvin)) @@ -12,3 +12,4 @@ This page is generated periodically, most recently on 2023-12-13. - Parikshit Singh Rathore ([@parikshit14](https://github.com/parikshit14)) - Ankur Sinha ([@sanjayankur31](https://github.com/sanjayankur31)) - kmantel ([@kmantel](https://github.com/kmantel)) +- Robert Vickerstaff ([@robertvi](https://github.com/robertvi)) From fbadf72ab14fddda8767a74c3b53840fc368cb17 Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 7 Feb 2024 09:18:07 +0000 Subject: [PATCH 18/21] To v0.3.4 --- docs/sphinx/source/api/Contributors.md | 2 +- src/modelspec/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/source/api/Contributors.md b/docs/sphinx/source/api/Contributors.md index 8877907a..36c90ea0 100644 --- a/docs/sphinx/source/api/Contributors.md +++ b/docs/sphinx/source/api/Contributors.md @@ -3,7 +3,7 @@ # Modelspec contributors This page list names and Github profiles of contributors to Modelspec, listed in no particular order. -This page is generated periodically, most recently on 2024-01-17. +This page is generated periodically, most recently on 2024-02-07. - Padraig Gleeson ([@pgleeson](https://github.com/pgleeson)) - Manifest Chakalov ([@mqnifestkelvin](https://github.com/mqnifestkelvin)) diff --git a/src/modelspec/__init__.py b/src/modelspec/__init__.py index b8bd118b..7d2060a9 100644 --- a/src/modelspec/__init__.py +++ b/src/modelspec/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.3.3" +__version__ = "0.3.4" from .base_types import Base, define, has, field, fields, optional, instance_of, in_ From b8004f52d21661275a648b8b07fb41aa5067f88f Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 7 Feb 2024 09:21:10 +0000 Subject: [PATCH 19/21] Update gha versions --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d71ca54..0e529565 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,8 @@ jobs: name: Format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - uses: pre-commit/action@v3.0.0 with: extra_args: --hook-stage manual --all-files @@ -28,9 +28,9 @@ jobs: runs-on: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} From e254be8dfb49a3883aa7c56a0a43c49345af1de4 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Wed, 7 Feb 2024 17:25:52 +0000 Subject: [PATCH 20/21] Print differences --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e529565..e5d2c935 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: run: | cd examples python document.py + git diff cd test python test.py From 3746060c5b4a87294e8781d5b44a0b3ea716255a Mon Sep 17 00:00:00 2001 From: pgleeson Date: Wed, 6 Mar 2024 15:26:40 +0000 Subject: [PATCH 21/21] Regenerated --- docs/sphinx/source/api/Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sphinx/source/api/Contributors.md b/docs/sphinx/source/api/Contributors.md index 36c90ea0..ee65d182 100644 --- a/docs/sphinx/source/api/Contributors.md +++ b/docs/sphinx/source/api/Contributors.md @@ -3,7 +3,7 @@ # Modelspec contributors This page list names and Github profiles of contributors to Modelspec, listed in no particular order. -This page is generated periodically, most recently on 2024-02-07. +This page is generated periodically, most recently on 2024-03-06. - Padraig Gleeson ([@pgleeson](https://github.com/pgleeson)) - Manifest Chakalov ([@mqnifestkelvin](https://github.com/mqnifestkelvin))