diff --git a/.copier-answers.yml b/.copier-answers.yml index 03767e6e..af55d41d 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: v0.0.41-22-gd7c5bcd +_commit: v0.0.41-24-g20eac2f _src_path: gh:LabAutomationAndScreening/copier-base-template.git description: Copier template for creating Python libraries and executables python_ci_versions: diff --git a/.github/renovate.json5 b/.github/renovate.json5 deleted file mode 100644 index b7254d9d..00000000 --- a/.github/renovate.json5 +++ /dev/null @@ -1,27 +0,0 @@ -{ - $schema: "https://docs.renovatebot.com/renovate-schema.json", - lockFileMaintenance: { - enabled: true, - }, - // Only run the PEP 621 manager (disable all others) - enabledManagers: ["pep621"], - - // Optional: customize the file-matching if your pyproject.toml lives - // in a subfolder or has a nonstandard name - pep621: { - fileMatch: ["(^|/)pyproject\\.toml$"], - }, - - // Example: group all Python updates into one PR - packageRules: [ - { - matchManagers: ["pep621"], - groupName: "all python dependencies", - }, - ], - - postUpgradeTasks: { - commands: ["echo $RENOVATE_ALLOWED_COMMANDS", "pre-commit run -a"], - executionMode: "update", - }, -} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cccc647e..9f2dcb14 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,20 +17,7 @@ permissions: jobs: get-values: - runs-on: ubuntu-24.04 - outputs: - new-dependabot-sha: ${{ steps.update-hash.outputs.new-sha }} - dependabot-commit-created: ${{ steps.update-hash.outputs.commit-created }} - steps: - - name: Checkout code - uses: actions/checkout@v4.2.2 - - - name: Update Devcontainer Hash - if: ${{ github.actor == 'dependabot[bot]' }} - id: update-hash - uses: ./.github/actions/update-devcontainer-hash - with: - branch: ${{ github.ref_name }} + uses: ./.github/workflows/get-values.yaml pre-commit: needs: [ get-values ] diff --git a/.github/workflows/get-values.yaml b/.github/workflows/get-values.yaml new file mode 100644 index 00000000..d91a28e1 --- /dev/null +++ b/.github/workflows/get-values.yaml @@ -0,0 +1,34 @@ +name: Get Values + +on: + workflow_call: + outputs: + new-dependabot-sha: + description: BUILD_HASH + value: ${{ jobs.get-values.outputs.new-dependabot-sha }} + dependabot-commit-created: + description: whether or not a commit was created on a dependabot branch + value: ${{ jobs.get-values.outputs.dependabot-commit-created }} + +env: + PYTHONUNBUFFERED: True + +permissions: + contents: write # needed to push commit of new devcontainer hash for dependabot PRs + +jobs: + get-values: + runs-on: ubuntu-24.04 + outputs: + new-dependabot-sha: ${{ steps.update-hash.outputs.new-sha }} + dependabot-commit-created: ${{ steps.update-hash.outputs.commit-created }} + steps: + - name: Checkout code + uses: actions/checkout@v4.2.2 + + - name: Update Devcontainer Hash + if: ${{ github.actor == 'dependabot[bot]' }} + id: update-hash + uses: ./.github/actions/update-devcontainer-hash + with: + branch: ${{ github.ref_name }} diff --git a/template/.github/renovate.json5.jinja b/template/.github/renovate.json5.jinja deleted file mode 100644 index 746f8c91..00000000 --- a/template/.github/renovate.json5.jinja +++ /dev/null @@ -1,6 +0,0 @@ -{% raw %}{ - $schema: "https://docs.renovatebot.com/renovate-schema.json", - lockFileMaintenance: { - enabled: true, - }, -}{% endraw %}