From e79642720bba21c0d0237bcdb1e76ba46ad78e3a Mon Sep 17 00:00:00 2001
From: Antony Milne <49395058+antonymilne@users.noreply.github.com>
Date: Mon, 13 Nov 2023 14:56:53 +0000
Subject: [PATCH] Fix linting of release process (#165)

---
 ...231113_103808_antony.milne_prep_release.md | 48 +++++++++++++++++++
 vizro-core/hatch.toml                         |  8 ++--
 2 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 vizro-core/changelog.d/20231113_103808_antony.milne_prep_release.md

diff --git a/vizro-core/changelog.d/20231113_103808_antony.milne_prep_release.md b/vizro-core/changelog.d/20231113_103808_antony.milne_prep_release.md
new file mode 100644
index 000000000..f1f65e73c
--- /dev/null
+++ b/vizro-core/changelog.d/20231113_103808_antony.milne_prep_release.md
@@ -0,0 +1,48 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Highlights ✨
+
+- A bullet item for the Highlights ✨ category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Removed
+
+- A bullet item for the Removed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Added
+
+- A bullet item for the Added category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Changed
+
+- A bullet item for the Changed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Fixed
+
+- A bullet item for the Fixed category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category with a link to the relevant PR at the end of your entry, e.g. Enable feature XXX ([#1](https://github.com/mckinsey/vizro/pull/1))
+
+-->
diff --git a/vizro-core/hatch.toml b/vizro-core/hatch.toml
index 615f9c0ab..25d9b040d 100644
--- a/vizro-core/hatch.toml
+++ b/vizro-core/hatch.toml
@@ -11,7 +11,7 @@ matrix.python.features = [
 [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 = [
@@ -43,15 +43,15 @@ example = "cd examples/{args:default}; python app.py"
 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",
   "rm -rf schemas/*json",
   "schema",
   "git add schemas",
-  "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)'"
-schema = ["python schemas/generate.py {args}", 'hatch run lint --files="schemas/$(hatch version).json" > /dev/null']
+schema = ["python schemas/generate.py {args}", '- hatch run lint --files="schemas/$(hatch version).json" > /dev/null']
 secrets = "pre-commit run gitleaks --all-files"
 test = [
   "test-unit",