From d9954694a44dff670cd05e3128e0ef134d7ddcaf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 14:09:00 +0000 Subject: [PATCH 1/3] Update examples --- examples/arfi_example/README.md | 2 +- examples/arfi_example/jobs.sh | 2 +- examples/arfi_example/scripts/get_plot.py | 2 +- examples/arfi_example/scripts/merge_descriptives.py | 2 +- examples/arfi_example/scripts/merge_metrics.py | 2 +- examples/arfi_example/scripts/merge_tds.py | 2 +- examples/basic_example/README.md | 2 +- examples/basic_example/jobs.sh | 2 +- examples/basic_example/scripts/get_plot.py | 2 +- examples/basic_example/scripts/merge_descriptives.py | 2 +- examples/basic_example/scripts/merge_metrics.py | 2 +- examples/basic_example/scripts/merge_tds.py | 2 +- examples/multimodel_example/README.md | 2 +- examples/multimodel_example/jobs.sh | 2 +- examples/multimodel_example/scripts/get_plot.py | 2 +- examples/multimodel_example/scripts/merge_descriptives.py | 2 +- examples/multimodel_example/scripts/merge_metrics.py | 2 +- examples/multimodel_example/scripts/merge_tds.py | 2 +- examples/prior_example/README.md | 2 +- examples/prior_example/jobs.sh | 2 +- examples/prior_example/scripts/get_plot.py | 2 +- examples/prior_example/scripts/merge_descriptives.py | 2 +- examples/prior_example/scripts/merge_metrics.py | 2 +- examples/prior_example/scripts/merge_tds.py | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/arfi_example/README.md b/examples/arfi_example/README.md index a848036..9cce638 100644 --- a/examples/arfi_example/README.md +++ b/examples/arfi_example/README.md @@ -1,6 +1,6 @@ # Simulation study -*This project was rendered with ASReview-Makita version 0.1.dev1+g6b83df8.* +*This project was rendered with ASReview-Makita version 0.1.dev1+gd662348.* This project was rendered from the Makita-ARFI template. See [asreview/asreview-makita#templates](https://github.com/asreview/asreview-makita#templates) for template rules and formats. diff --git a/examples/arfi_example/jobs.sh b/examples/arfi_example/jobs.sh index be629d2..4283be3 100644 --- a/examples/arfi_example/jobs.sh +++ b/examples/arfi_example/jobs.sh @@ -1,6 +1,6 @@ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 # Create folder structure. By default, the folder 'output' is used to store output. mkdir output diff --git a/examples/arfi_example/scripts/get_plot.py b/examples/arfi_example/scripts/get_plot.py index 0129ee8..7d72dd1 100644 --- a/examples/arfi_example/scripts/get_plot.py +++ b/examples/arfi_example/scripts/get_plot.py @@ -15,7 +15,7 @@ - Teijema, Jelle """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse from pathlib import Path diff --git a/examples/arfi_example/scripts/merge_descriptives.py b/examples/arfi_example/scripts/merge_descriptives.py index 53f80d3..bfc9d6b 100644 --- a/examples/arfi_example/scripts/merge_descriptives.py +++ b/examples/arfi_example/scripts/merge_descriptives.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/arfi_example/scripts/merge_metrics.py b/examples/arfi_example/scripts/merge_metrics.py index d29a0b5..cd55c27 100644 --- a/examples/arfi_example/scripts/merge_metrics.py +++ b/examples/arfi_example/scripts/merge_metrics.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/arfi_example/scripts/merge_tds.py b/examples/arfi_example/scripts/merge_tds.py index 0530c68..a7d323d 100644 --- a/examples/arfi_example/scripts/merge_tds.py +++ b/examples/arfi_example/scripts/merge_tds.py @@ -19,7 +19,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/basic_example/README.md b/examples/basic_example/README.md index d7fc0eb..6568da7 100644 --- a/examples/basic_example/README.md +++ b/examples/basic_example/README.md @@ -1,6 +1,6 @@ # Simulation study -*This project was rendered with ASReview-Makita version 0.1.dev1+g6b83df8.* +*This project was rendered with ASReview-Makita version 0.1.dev1+gd662348.* This project was rendered from the Makita-basic template. See [asreview/asreview-makita#templates](https://github.com/asreview/asreview-makita#templates) for template rules and formats. diff --git a/examples/basic_example/jobs.sh b/examples/basic_example/jobs.sh index 44e01eb..ab9c559 100644 --- a/examples/basic_example/jobs.sh +++ b/examples/basic_example/jobs.sh @@ -1,6 +1,6 @@ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 # Create folder structure. By default, the folder 'output' is used to store output. mkdir output diff --git a/examples/basic_example/scripts/get_plot.py b/examples/basic_example/scripts/get_plot.py index 0129ee8..7d72dd1 100644 --- a/examples/basic_example/scripts/get_plot.py +++ b/examples/basic_example/scripts/get_plot.py @@ -15,7 +15,7 @@ - Teijema, Jelle """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse from pathlib import Path diff --git a/examples/basic_example/scripts/merge_descriptives.py b/examples/basic_example/scripts/merge_descriptives.py index 53f80d3..bfc9d6b 100644 --- a/examples/basic_example/scripts/merge_descriptives.py +++ b/examples/basic_example/scripts/merge_descriptives.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/basic_example/scripts/merge_metrics.py b/examples/basic_example/scripts/merge_metrics.py index d29a0b5..cd55c27 100644 --- a/examples/basic_example/scripts/merge_metrics.py +++ b/examples/basic_example/scripts/merge_metrics.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/basic_example/scripts/merge_tds.py b/examples/basic_example/scripts/merge_tds.py index 0530c68..a7d323d 100644 --- a/examples/basic_example/scripts/merge_tds.py +++ b/examples/basic_example/scripts/merge_tds.py @@ -19,7 +19,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/multimodel_example/README.md b/examples/multimodel_example/README.md index 7be72f9..421104a 100644 --- a/examples/multimodel_example/README.md +++ b/examples/multimodel_example/README.md @@ -1,6 +1,6 @@ # Simulation study -*This project was rendered with ASReview-Makita version 0.1.dev1+g6b83df8.* +*This project was rendered with ASReview-Makita version 0.1.dev1+gd662348.* This project was rendered from the Makita-multimodel template. See [asreview/asreview-makita#templates](https://github.com/asreview/asreview-makita#templates) for template rules and formats. diff --git a/examples/multimodel_example/jobs.sh b/examples/multimodel_example/jobs.sh index f5dafc6..a19399d 100644 --- a/examples/multimodel_example/jobs.sh +++ b/examples/multimodel_example/jobs.sh @@ -1,5 +1,5 @@ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 # Create folder structure. By default, the folder 'output' is used to store output. mkdir output diff --git a/examples/multimodel_example/scripts/get_plot.py b/examples/multimodel_example/scripts/get_plot.py index 0129ee8..7d72dd1 100644 --- a/examples/multimodel_example/scripts/get_plot.py +++ b/examples/multimodel_example/scripts/get_plot.py @@ -15,7 +15,7 @@ - Teijema, Jelle """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse from pathlib import Path diff --git a/examples/multimodel_example/scripts/merge_descriptives.py b/examples/multimodel_example/scripts/merge_descriptives.py index 53f80d3..bfc9d6b 100644 --- a/examples/multimodel_example/scripts/merge_descriptives.py +++ b/examples/multimodel_example/scripts/merge_descriptives.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/multimodel_example/scripts/merge_metrics.py b/examples/multimodel_example/scripts/merge_metrics.py index d29a0b5..cd55c27 100644 --- a/examples/multimodel_example/scripts/merge_metrics.py +++ b/examples/multimodel_example/scripts/merge_metrics.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/multimodel_example/scripts/merge_tds.py b/examples/multimodel_example/scripts/merge_tds.py index 0530c68..a7d323d 100644 --- a/examples/multimodel_example/scripts/merge_tds.py +++ b/examples/multimodel_example/scripts/merge_tds.py @@ -19,7 +19,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/prior_example/README.md b/examples/prior_example/README.md index 3ddac61..f616dc4 100644 --- a/examples/prior_example/README.md +++ b/examples/prior_example/README.md @@ -1,6 +1,6 @@ # Simulation study -*This project was rendered with ASReview-Makita version 0.1.dev1+g6b83df8.* +*This project was rendered with ASReview-Makita version 0.1.dev1+gd662348.* This project was rendered from the Makita-prior template. See [asreview/asreview-makita#templates](https://github.com/asreview/asreview-makita#templates) for template rules and formats. diff --git a/examples/prior_example/jobs.sh b/examples/prior_example/jobs.sh index 3da5296..a05d5d4 100644 --- a/examples/prior_example/jobs.sh +++ b/examples/prior_example/jobs.sh @@ -1,6 +1,6 @@ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 # Create folder structure. By default, the folder 'output' is used to store output. mkdir output diff --git a/examples/prior_example/scripts/get_plot.py b/examples/prior_example/scripts/get_plot.py index 0129ee8..7d72dd1 100644 --- a/examples/prior_example/scripts/get_plot.py +++ b/examples/prior_example/scripts/get_plot.py @@ -15,7 +15,7 @@ - Teijema, Jelle """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse from pathlib import Path diff --git a/examples/prior_example/scripts/merge_descriptives.py b/examples/prior_example/scripts/merge_descriptives.py index 53f80d3..bfc9d6b 100644 --- a/examples/prior_example/scripts/merge_descriptives.py +++ b/examples/prior_example/scripts/merge_descriptives.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/prior_example/scripts/merge_metrics.py b/examples/prior_example/scripts/merge_metrics.py index d29a0b5..cd55c27 100644 --- a/examples/prior_example/scripts/merge_metrics.py +++ b/examples/prior_example/scripts/merge_metrics.py @@ -18,7 +18,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob diff --git a/examples/prior_example/scripts/merge_tds.py b/examples/prior_example/scripts/merge_tds.py index 0530c68..a7d323d 100644 --- a/examples/prior_example/scripts/merge_tds.py +++ b/examples/prior_example/scripts/merge_tds.py @@ -19,7 +19,7 @@ - De Bruin, Jonathan """ -# version 0.1.dev1+g6b83df8 +# version 0.1.dev1+gd662348 import argparse import glob From d61f250d3594ceacc7eb66b8c016585d340362dd Mon Sep 17 00:00:00 2001 From: jteijema Date: Wed, 8 Jan 2025 15:34:59 +0100 Subject: [PATCH 2/3] change when example workflow is run --- .github/workflows/create-examples.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-examples.yml b/.github/workflows/create-examples.yml index a7cd438..5a8b490 100644 --- a/.github/workflows/create-examples.yml +++ b/.github/workflows/create-examples.yml @@ -1,6 +1,10 @@ name: Update Examples -on: [push, pull_request] +on: + push: + branches: + - v.1.0.x + - main jobs: update-examples: From 21b97e95e8f032adb9f8361a2f4c497cb9d3e3e9 Mon Sep 17 00:00:00 2001 From: jteijema Date: Wed, 8 Jan 2025 15:48:37 +0100 Subject: [PATCH 3/3] Drop the commit and dev status from version in output --- asreviewcontrib/makita/template_base.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/asreviewcontrib/makita/template_base.py b/asreviewcontrib/makita/template_base.py index 8014d9d..77dbf5b 100644 --- a/asreviewcontrib/makita/template_base.py +++ b/asreviewcontrib/makita/template_base.py @@ -4,7 +4,7 @@ from cfgtemplater.config_template import ConfigTemplate -from asreviewcontrib.makita import __version__ +from asreviewcontrib.makita import __version_tuple__ from asreviewcontrib.makita.config import TEMPLATES_FP from asreviewcontrib.makita.entrypoint import ProjectPaths from asreviewcontrib.makita.utils import FileHandler @@ -36,7 +36,11 @@ def __init__( self.instances_per_query = instances_per_query self.stop_if = stop_if self.file_handler = file_handler - self.__version__ = __version__ + self.__version__ = '.'.join( + str(part) + for part in __version_tuple__ + if isinstance(part, int) + ) self.template = ConfigTemplate( fp_template if fp_template is not None else self.get_template_file()