diff --git a/.copier-answers.yml b/.copier-answers.yml index 39bfe07..1ed00ea 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -2,7 +2,7 @@ # It is needed to track the repo template version, and editing may break things. # This file will be overwritten by copier on template updates. -_commit: v1.2.2 +_commit: v1.2.3 _src_path: https://github.com/bec-project/plugin_copier_template.git make_commit: true project_name: bec_testing_plugin diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index ab4aa4c..9634ce2 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -28,7 +28,7 @@ on: description: "Python version to use" required: false type: string - default: "3.11" + default: "3.12" permissions: pull-requests: write @@ -44,7 +44,18 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: "${{ inputs.PYTHON_VERSION || '3.11' }}" + python-version: "${{ inputs.PYTHON_VERSION || '3.12' }}" + + - name: Checkout BEC Plugin Repository + uses: actions/checkout@v4 + with: + repository: bec/bec_testing_plugin + ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}" + path: ./bec_testing_plugin + + - name: Lint for merge conflicts + run: | + - name: Checkout BEC Core uses: actions/checkout@v4 @@ -67,13 +78,6 @@ jobs: ref: "${{ inputs.BEC_WIDGETS_BRANCH || 'main' }}" path: ./bec_widgets - - name: Checkout BEC Plugin Repository - uses: actions/checkout@v4 - with: - repository: bec/bec_testing_plugin - ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}" - path: ./bec_testing_plugin - - name: Install dependencies shell: bash run: | diff --git a/.gitea/workflows/create_update_pr.yml b/.gitea/workflows/create_update_pr.yml index e027ca8..1871858 100644 --- a/.gitea/workflows/create_update_pr.yml +++ b/.gitea/workflows/create_update_pr.yml @@ -6,11 +6,16 @@ permissions: pull-requests: write jobs: +<<<<<<< before updating create_update_branch_and_pr: runs-on: ubuntu-latest permissions: contents: write pull-requests: write +======= + test: + runs-on: ubuntu-latest +>>>>>>> after updating steps: - name: Setup Python @@ -20,13 +25,18 @@ jobs: - name: Install tools run: | +<<<<<<< before updating pip install copier PySide6 +======= + pip install copier +>>>>>>> after updating - name: Checkout uses: actions/checkout@v4 - name: Perform update run: | +<<<<<<< before updating set -x git config --global user.email "bec_ci_staging@psi.ch" git config --global user.name "BEC automated CI" @@ -62,3 +72,11 @@ jobs: \"head\": \"$(echo branch)\", \"base\": \"main\" }" +======= + branch="chore/update-template-$(python -m uuid)" + git checkout -b $branch + msg = $(copier update --trust --defaults --conflict inline 2>&1 | sed -n 1p) + git add -A + git diff-index --quiet HEAD || git commit -a -m $msg + git push -u origin $branch +>>>>>>> after updating diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 1cbc65b..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,7 +0,0 @@ -include: -- file: /templates/plugin-repo-template.yml - inputs: - name: bec_testing_plugin - target: bec_testing_plugin - branch: $CHILD_PIPELINE_BRANCH - project: bec/awi_utils diff --git a/pyproject.toml b/pyproject.toml index 0d540c9..f054b76 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" name = "bec_testing_plugin" version = "0.0.0" description = "A plugin repository for BEC" -requires-python = ">=3.10" +requires-python = ">=3.11" classifiers = [ "Development Status :: 3 - Alpha", "Programming Language :: Python :: 3",