diff --git a/.cookiecutter.json b/.cookiecutter.json index bc0b9ada..85770132 100644 --- a/.cookiecutter.json +++ b/.cookiecutter.json @@ -23,7 +23,19 @@ "pull_request_strategy": "update-or-create", "post_actions": [], "draft": false, +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD "baked_commit_ref": "e4d0e9bd14396e92e7cc2699a9afe91ca5946468", +======= + "baked_commit_ref": "f5117554351af5fa96717c22efbbe12e9b9c95fa", +>>>>>>> 624e611 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) +======= + "baked_commit_ref": "de952226ae0b53c8f40fbab18f65a13c3b81ad11", +>>>>>>> 26305bc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) +======= + "baked_commit_ref": "c259553023c359845e9955117f81d790c44d453f", +>>>>>>> 7a88450 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) "drift_managed_branch": "develop" } } diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 185bdccf..ecffff0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,9 +21,17 @@ jobs: with: poetry-version: "${{ env.POETRY_VERSION }}" python-version: "${{ env.PYTHON_VERSION }}" +<<<<<<< HEAD +<<<<<<< HEAD poetry-install-options: "--only dev,docs" - name: "Build Documentation" run: "poetry run invoke build-and-check-docs" +======= + poetry-install-options: "--no-root" +>>>>>>> 26305bc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) +======= + poetry-install-options: "--with dev,docs" +>>>>>>> 7a88450 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) - name: "Run Poetry Build" run: "poetry build" diff --git a/changes/+main.housekeeping b/changes/+main.housekeeping new file mode 100644 index 00000000..3433adf6 --- /dev/null +++ b/changes/+main.housekeeping @@ -0,0 +1 @@ +Rebaked from the cookie `main`. diff --git a/docs/admin/release_notes/version_1.0.md b/docs/admin/release_notes/version_1.0.md index 63ef2244..d2f79849 100644 --- a/docs/admin/release_notes/version_1.0.md +++ b/docs/admin/release_notes/version_1.0.md @@ -6,7 +6,19 @@ - Commit to SemVer - F5 fixes +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD ## v1.0.0 - 2021-11 +======= +## [v1.0.0] - 2026-08-26 +>>>>>>> 624e611 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) +======= +## [v1.0.0] - 2026-09-23 +>>>>>>> 26305bc (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) +======= +## [v1.0.0] - 2026-09-23 +>>>>>>> 7a88450 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool) ### Added diff --git a/docs/images/networktocode_logo.svg b/docs/images/networktocode_logo.svg deleted file mode 100644 index 348e5241..00000000 --- a/docs/images/networktocode_logo.svg +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -