address comments

mckinsey · Nov 13, 2023 · 214d4e4 · 214d4e4
1 parent 62bfbc7
commit 214d4e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
@@ -71,14 +71,12 @@ jobs:
         run: |
           if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-core" ]; then
             echo 'PYPI_TOKEN=${{ secrets.VIZRO_PYPI_TOKEN }}' >> $GITHUB_ENV
-          fi
-          if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then
+          elif [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then
             echo 'PYPI_TOKEN=${{ secrets.VIZRO_AI_PYPI_TOKEN }}' >> $GITHUB_ENV
           fi
       - name: Publish distribution 📦 to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          # repository-url: https://test.pypi.org/legacy/ # Activate for test.pypi.org
           packages-dir: ${{ needs.check-version.outputs.package_name }}/dist
           password: ${{ env.PYPI_TOKEN }}
       - name: Check correct package uploaded to PyPI

diff --git a/vizro-ai/hatch.toml b/vizro-ai/hatch.toml
@@ -6,7 +6,7 @@ python = ["3.9", "3.10", "3.11"]
 [envs.changelog]
 dependencies = ["scriv"]
 detached = true
-scripts = {add = "scriv create --add"}
+scripts = {add = "scriv create --add", collect = ["scriv collect --add", "- hatch run lint:lint --files=CHANGELOG.md > /dev/null"]}
 
 [envs.default]
 dependencies = [
@@ -33,9 +33,8 @@ cov-report = [
 lint = "hatch run lint:lint {args:--all-files}"
 prep-release = [
   "hatch version release",
-  "hatch run changelog:scriv collect --add",
+  "hatch run changelog:collect",
   "hatch run changelog:add",
-  "hatch run lint || hatch run lint",
   'echo "Now raise a PR to merge into main with title: Release of vizro-ai $(hatch version)"'
 ]
 pypath = "hatch run python -c 'import sys; print(sys.executable)'"