From 1aebc870a09c627340370d5a05c976efc06b2256 Mon Sep 17 00:00:00 2001 From: Antony Milne Date: Tue, 24 Oct 2023 12:17:31 +0100 Subject: [PATCH] A few small comments --- .github/workflows/check-release.yml | 4 ++++ .github/workflows/lint-vizro-core.yml | 7 ++----- vizro-core/hatch.toml | 13 ++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 53d8eaca3..c40fed3b1 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -118,3 +118,7 @@ jobs: ./../tools/version-bump.sh mckinsey vizro ${{ secrets.GITHUB_TOKEN }} \ ${{needs.check-version.outputs.package_name}} \ ${{needs.check-version.outputs.package_version}} release/version_bump_next_minor/${formatted_date} + +# automate merging of this? +# why need lint here? +# does github release notes automatically? Why not scriv github-release? \ No newline at end of file diff --git a/.github/workflows/lint-vizro-core.yml b/.github/workflows/lint-vizro-core.yml index 599f6e6f1..c6a9b2372 100644 --- a/.github/workflows/lint-vizro-core.yml +++ b/.github/workflows/lint-vizro-core.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }} + fetch-depth: ${{ github.event_name == 'pull_request' && 2 || 0 }} #why? - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -50,14 +50,11 @@ jobs: run: hatch run all.py${{ matrix.python-version }}:schema --check - name: Check requirements for Snyk are up to date - run: | - pwd - hatch run all.py${{ matrix.python-version }}:update-snyk-requirements --check + run: hatch run all.py${{ matrix.python-version }}:update-snyk-requirements --check - name: Find added changelog fragments id: added-files run: | - pwd if ${{ github.event_name == 'pull_request' }}; then echo "added_files=$(git diff --name-only --diff-filter=A -r HEAD^1 HEAD -- changelog.d/*.md | xargs)" >> $GITHUB_OUTPUT else diff --git a/vizro-core/hatch.toml b/vizro-core/hatch.toml index 6c342e028..20a648ff4 100644 --- a/vizro-core/hatch.toml +++ b/vizro-core/hatch.toml @@ -40,16 +40,15 @@ lint = "SKIP=gitleaks pre-commit run {args} --all-files" post-release = [ "hatch version patch,dev", "echo 'Raise a PR to bump to the new development version'" -] # can it be automated? +] # No longer needed? prep-release = [ "hatch version release", - "git checkout -b release/vizro-core/$(hatch version) origin/main", - #"hatch run changelog:scriv collect --add", -# "rm -rf schemas/*json", -# "schema", -# "hatch run lint || hatch run lint", #why? -# "hatch run changelog:add", + "hatch run changelog:scriv collect --add", + "rm -rf schemas/*json", + "schema", + "hatch run lint || hatch run lint", + "hatch run changelog:add", 'echo "Now raise a PR to merge into main with title: Release of vizro-core $(hatch version)"', ] pypath = "python -c 'import sys; print(sys.executable)'"