From bace9edf8934a898a4fdba9769f2f68f72669c7f Mon Sep 17 00:00:00 2001 From: mazzol_a Date: Wed, 23 Apr 2025 17:09:06 +0200 Subject: [PATCH] updatet regex pattern to support postfix --- .github/workflows/conda_python.yaml | 2 +- conda-recipes/main-library/meta.yaml | 2 +- conda-recipes/python-client/meta.yaml | 3 +-- update_version.py | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conda_python.yaml b/.github/workflows/conda_python.yaml index 5dad7745a..4b12cb3ff 100644 --- a/.github/workflows/conda_python.yaml +++ b/.github/workflows/conda_python.yaml @@ -33,7 +33,7 @@ jobs: run: conda config --set anaconda_upload no - name: Build - run: conda build ./conda-recipes/python-client --output-folder build_output + run: conda build conda-recipes/python-client --output-folder build_output - name: Upload all Conda packages uses: actions/upload-artifact@v4 diff --git a/conda-recipes/main-library/meta.yaml b/conda-recipes/main-library/meta.yaml index 2c2c88058..3a45167cc 100755 --- a/conda-recipes/main-library/meta.yaml +++ b/conda-recipes/main-library/meta.yaml @@ -1,7 +1,7 @@ source: path: ../.. -{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+\.\d+\.\d+)').group(1) %} +{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+\.\d+\.\d+(?:[\.\-][\.\w\-]+)?)').group(1) %} package: name: sls_detector_software version: {{ version }} #2025.3.19 diff --git a/conda-recipes/python-client/meta.yaml b/conda-recipes/python-client/meta.yaml index cf4f3aa7b..03c4b4436 100644 --- a/conda-recipes/python-client/meta.yaml +++ b/conda-recipes/python-client/meta.yaml @@ -1,8 +1,7 @@ source: path: ../.. -{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+\.\d+\.\d+)').group(1) %} - +{% set version = load_file_regex(load_file = 'VERSION', regex_pattern = '(\d+\.\d+\.\d+(?:[\.\w\-]+)?)').group(1) %} package: name: slsdet version: {{ version }} # diff --git a/update_version.py b/update_version.py index 507857133..c72099b3c 100644 --- a/update_version.py +++ b/update_version.py @@ -17,8 +17,8 @@ def get_version(): version = sys.argv[1] # Validate that the version argument matches semantic versioning format (X.Y.Z) - if not re.match(r'^\d+\.\d+\.\d+$', version): - print("Error: Version argument must be in semantic versioning format (X.Y.Z)") + if not re.match(r'^\d+\.\d+\.\d+(?:[\-\.][\.\w\-]+)?+$', version): + print("Error: Version argument must be in semantic versioning format (X.Y.Z[./-][postfix])") sys.exit(1) return version