From 48e0eb91fb8f7a2501cb599a21ca3e90e6abecf7 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 13:12:07 +0100 Subject: [PATCH 01/25] Fix for linting in hatch run prep release --- vizro-ai/hatch.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/vizro-ai/hatch.toml b/vizro-ai/hatch.toml index a83f6efd0..51a18a627 100644 --- a/vizro-ai/hatch.toml +++ b/vizro-ai/hatch.toml @@ -35,6 +35,7 @@ prep-release = [ "hatch version release", "hatch run changelog:scriv collect --add", "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)'" From 496738f14bfb059a15712d938d8b57c29fae960b Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 13:18:39 +0100 Subject: [PATCH 02/25] Test first things --- .github/workflows/check-release.yml | 91 +++++++++++++++-------------- vizro-ai/src/vizro_ai/__init__.py | 2 +- 2 files changed, 48 insertions(+), 45 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index e9b4dad9b..ce88d9f56 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -4,6 +4,9 @@ on: push: branches: - main + pull_request: + branches: + - main jobs: check-version: @@ -72,48 +75,48 @@ jobs: if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-core" ]; then echo 'PYPI_TOKEN=${{ secrets.VIZRO_PYPI_TOKEN }}' >> $GITHUB_ENV fi - - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: ${{ needs.check-version.outputs.package_name }}/dist - password: ${{ env.PYPI_TOKEN }} - - name: Check correct package uploaded to PyPI - run: | - cd "${{ needs.check-version.outputs.package_name }}/dist" - local=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) - cd .. - pip download vizro==${{needs.check-version.outputs.package_version}} -d . --no-deps --timeout 300 - pypi=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) - if [ $local = $pypi ]; then; echo "md5 hash is the same"; else; echo "md5 hash is not the same" exit 1; fi; + # - name: Publish distribution 📦 to PyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # packages-dir: ${{ needs.check-version.outputs.package_name }}/dist + # password: ${{ env.PYPI_TOKEN }} + # - name: Check correct package uploaded to PyPI + # run: | + # cd "${{ needs.check-version.outputs.package_name }}/dist" + # local=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) + # cd .. + # pip download vizro==${{needs.check-version.outputs.package_version}} -d . --no-deps --timeout 300 + # pypi=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) + # if [ $local = $pypi ]; then; echo "md5 hash is the same"; else; echo "md5 hash is not the same" exit 1; fi; - version-bump: - needs: [check-version, build-publish] - if: | - needs.check-version.outputs.new_release == 'True' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install hatch - - name: Bump version to next patch - run: | - formatted_date=$(date +"%Y-%m-%d/%H-%M-%S") - cd "${{ needs.check-version.outputs.package_name }}" - git checkout -b "release/version_bump_next_minor/${formatted_date}" - hatch version patch,dev - hatch run changelog:add - hatch run schema - git config user.email "145135826+vizro-svc@users.noreply.github.com" - git config user.name "Vizro Team" - git add -A - git commit -m "version bump" - git push --set-upstream origin release/version_bump_next_minor/${formatted_date} - ./../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} + # version-bump: + # needs: [check-version, build-publish] + # if: | + # needs.check-version.outputs.new_release == 'True' + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - name: Set up Python + # uses: actions/setup-python@v4 + # with: + # python-version: "3.10" + # - name: Install dependencies + # run: | + # python -m pip install --upgrade pip + # pip install hatch + # - name: Bump version to next patch + # run: | + # formatted_date=$(date +"%Y-%m-%d/%H-%M-%S") + # cd "${{ needs.check-version.outputs.package_name }}" + # git checkout -b "release/version_bump_next_minor/${formatted_date}" + # hatch version patch,dev + # hatch run changelog:add + # hatch run schema + # git config user.email "145135826+vizro-svc@users.noreply.github.com" + # git config user.name "Vizro Team" + # git add -A + # git commit -m "version bump" + # git push --set-upstream origin release/version_bump_next_minor/${formatted_date} + # ./../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} diff --git a/vizro-ai/src/vizro_ai/__init__.py b/vizro-ai/src/vizro_ai/__init__.py index 12f83fd32..e93733f83 100644 --- a/vizro-ai/src/vizro_ai/__init__.py +++ b/vizro-ai/src/vizro_ai/__init__.py @@ -5,6 +5,6 @@ __all__ = ["VizroAI"] -__version__ = "0.1.0.dev2" +__version__ = "0.1.0" logging.basicConfig(level=os.getenv("VIZRO_AI_LOG_LEVEL", "INFO")) From 335ed9c393c8c0d630b4cdd59d0d23f7c97734d9 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 13:26:31 +0100 Subject: [PATCH 03/25] Allow vizro-ai in release process --- tools/check_package_release.py | 2 +- tools/release.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/check_package_release.py b/tools/check_package_release.py index a501080ff..4009f5c56 100644 --- a/tools/check_package_release.py +++ b/tools/check_package_release.py @@ -5,7 +5,7 @@ import requests -AVAILABLE_PACKAGES = ["vizro-core"] +AVAILABLE_PACKAGES = ["vizro-core","vizro-ai"] VERSION_MATCHSTR = r'\s*__version__\s*=\s*"(\d+\.\d+\.\d+)"' RESPONSE_ERROR = 404 diff --git a/tools/release.sh b/tools/release.sh index 1e58b4420..c14929beb 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -13,9 +13,15 @@ GITHUB_ENDPOINT="https://api.github.com/repos/${GITHUB_USER}/${GITHUB_REPO}/rele BODY=$(jq -Rs . < "$BODY_PATH") +if [ "$PACKAGE" = "vizro-core" ]; then + TAG_NAME="${VERSION}" +else + TAG_NAME="${PACKAGE}-${VERSION}" +fi + PAYLOAD=$(cat <<-END { - "tag_name": "${VERSION}", + "tag_name": "${TAG_NAME}", "target_commitish": "main", "name": "${PACKAGE}-${VERSION}", "body": ${BODY}, From 63c0b8469f1995994c13f10267e8afc03aa42a3c Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 13:31:04 +0100 Subject: [PATCH 04/25] TBR release of vizro_ai --- tools/check_package_release.py | 2 +- vizro-ai/CHANGELOG.md | 8 ++++ ...ng_vizro_ai_open_source_initial_commits.md | 46 ------------------ ...101_175538_anna_xiong_prompt_refinement.md | 48 ------------------- ...5201_maximilian_schulz_hosting_vizro_ai.md | 48 ------------------- ...143844_maximilian_schulz_schema_linting.md | 48 ------------------- ...lexey_snigir_vizro_ai_integration_tests.md | 48 ------------------- ..._chiara_pullem_incorporate_e2e_feedback.md | 48 ------------------- ...113606_alexey_snigir_pin_openai_version.md | 48 ------------------- ...ximilian_schulz_adjust_release_process.md} | 0 10 files changed, 9 insertions(+), 335 deletions(-) delete mode 100644 vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md delete mode 100644 vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md delete mode 100644 vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md delete mode 100644 vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md delete mode 100644 vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md delete mode 100644 vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md delete mode 100644 vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md rename vizro-ai/changelog.d/{20231101_120705_maximilian_schulz_check_CI.md => 20231110_132932_maximilian_schulz_adjust_release_process.md} (100%) diff --git a/tools/check_package_release.py b/tools/check_package_release.py index 4009f5c56..2fcbf17c4 100644 --- a/tools/check_package_release.py +++ b/tools/check_package_release.py @@ -5,7 +5,7 @@ import requests -AVAILABLE_PACKAGES = ["vizro-core","vizro-ai"] +AVAILABLE_PACKAGES = ["vizro-core", "vizro-ai"] VERSION_MATCHSTR = r'\s*__version__\s*=\s*"(\d+\.\d+\.\d+)"' RESPONSE_ERROR = 404 diff --git a/vizro-ai/CHANGELOG.md b/vizro-ai/CHANGELOG.md index 22dc5b0a8..0566e6af6 100644 --- a/vizro-ai/CHANGELOG.md +++ b/vizro-ai/CHANGELOG.md @@ -10,3 +10,11 @@ This project adheres to Semantic Versioning (http://semver.org/). --> See the fragment files in the [changelog.d directory](https://github.com/mckinsey/vizro/tree/main/vizro-ai/changelog.d). + + + +# 0.1.0 — 2023-11-10 + +## Highlights ✨ + +- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) diff --git a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md deleted file mode 100644 index 6253ca680..000000000 --- a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md +++ /dev/null @@ -1,46 +0,0 @@ - - -### Highlights ✨ - -- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) - - - - - - - diff --git a/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md b/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md b/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md b/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md b/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md b/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md b/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md b/vizro-ai/changelog.d/20231110_132932_maximilian_schulz_adjust_release_process.md similarity index 100% rename from vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md rename to vizro-ai/changelog.d/20231110_132932_maximilian_schulz_adjust_release_process.md From 34daf1b51eec585ed900b6e90610446e37ec3806 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 16:15:16 +0100 Subject: [PATCH 05/25] Add draft and latest --- tools/release.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index c14929beb..03fa599b4 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -15,8 +15,10 @@ BODY=$(jq -Rs . < "$BODY_PATH") if [ "$PACKAGE" = "vizro-core" ]; then TAG_NAME="${VERSION}" + MAKE_LATEST=true else TAG_NAME="${PACKAGE}-${VERSION}" + MAKE_LATEST=false fi PAYLOAD=$(cat <<-END @@ -25,8 +27,9 @@ PAYLOAD=$(cat <<-END "target_commitish": "main", "name": "${PACKAGE}-${VERSION}", "body": ${BODY}, - "draft": false, - "prerelease": false + "draft": true, + "prerelease": false, + "make_latest": ${MAKE_LATEST} } END ) From 6f75e602bc5f6480bfd97b078ae1a81483613f7a Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 16:30:08 +0100 Subject: [PATCH 06/25] change tokens to test pypi --- .github/workflows/check-release.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index ce88d9f56..414dd6bf0 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -72,9 +72,12 @@ jobs: hatch build - name: Set PyPI token 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-core" ]; then + echo 'PYPI_TOKEN=${{ secrets.VIZRO_TEST_PYPI_TOKEN }}' >> $GITHUB_ENV + fi + if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then + echo 'PYPI_TOKEN=${{ secrets.VIZRO_AI_TEST_PYPI_TOKEN }}' >> $GITHUB_ENV + fi # - name: Publish distribution 📦 to PyPI # uses: pypa/gh-action-pypi-publish@release/v1 # with: From e9e0392d1bb6212abd59fe6277086ba6e679d699 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 16:42:52 +0100 Subject: [PATCH 07/25] stringify boolean --- tools/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index 03fa599b4..31c10a29a 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -15,10 +15,10 @@ BODY=$(jq -Rs . < "$BODY_PATH") if [ "$PACKAGE" = "vizro-core" ]; then TAG_NAME="${VERSION}" - MAKE_LATEST=true + MAKE_LATEST="true" else TAG_NAME="${PACKAGE}-${VERSION}" - MAKE_LATEST=false + MAKE_LATEST="false" fi PAYLOAD=$(cat <<-END From 5795be65672f0ae9b0ac089da6e8f19bebedb85a Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 16:46:14 +0100 Subject: [PATCH 08/25] Fix --- tools/release.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/release.sh b/tools/release.sh index 31c10a29a..5a68bbba5 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -41,3 +41,5 @@ STATUS=$(curl -L \ -H "X-GitHub-Api-Version: 2022-11-28" \ ${GITHUB_ENDPOINT} \ -d "${PAYLOAD}") + +echo "${STATUS}" \ No newline at end of file From d1b8b83e247f30da58bd6616319eb0af70f71531 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 16:51:40 +0100 Subject: [PATCH 09/25] Fix --- tools/release.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index 5a68bbba5..c3432ab48 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -15,10 +15,10 @@ BODY=$(jq -Rs . < "$BODY_PATH") if [ "$PACKAGE" = "vizro-core" ]; then TAG_NAME="${VERSION}" - MAKE_LATEST="true" + MAKE_LATEST=true else TAG_NAME="${PACKAGE}-${VERSION}" - MAKE_LATEST="false" + MAKE_LATEST=false fi PAYLOAD=$(cat <<-END @@ -29,7 +29,7 @@ PAYLOAD=$(cat <<-END "body": ${BODY}, "draft": true, "prerelease": false, - "make_latest": ${MAKE_LATEST} + "make_latest": "${MAKE_LATEST}" } END ) @@ -42,4 +42,7 @@ STATUS=$(curl -L \ ${GITHUB_ENDPOINT} \ -d "${PAYLOAD}") -echo "${STATUS}" \ No newline at end of file +echo "${STATUS}" + +REQUEST_NUMBER=$(echo "${RESPONSE}" | jq -r '.id') +echo "Request number: ${REQUEST_NUMBER}" \ No newline at end of file From 683bca1291e53ecd99b2f43319b4e0401b43afe0 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:01:59 +0100 Subject: [PATCH 10/25] Add test pypi --- .github/workflows/check-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 055cc2bd5..798e4f608 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -81,6 +81,7 @@ jobs: # - name: Publish distribution 📦 to PyPI # uses: pypa/gh-action-pypi-publish@release/v1 # with: + # repository-url: https://test.pypi.org/legacy/ # packages-dir: ${{ needs.check-version.outputs.package_name }}/dist # password: ${{ env.PYPI_TOKEN }} # - name: Check correct package uploaded to PyPI From 6387db5c4fa69ec8d3919082b76e07b757c1bd1a Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:02:29 +0100 Subject: [PATCH 11/25] Revert "TBR release of vizro_ai" This reverts commit 63c0b8469f1995994c13f10267e8afc03aa42a3c. --- tools/check_package_release.py | 2 +- vizro-ai/CHANGELOG.md | 8 ---- ...ng_vizro_ai_open_source_initial_commits.md | 46 ++++++++++++++++++ ...1101_120705_maximilian_schulz_check_CI.md} | 0 ...101_175538_anna_xiong_prompt_refinement.md | 48 +++++++++++++++++++ ...5201_maximilian_schulz_hosting_vizro_ai.md | 48 +++++++++++++++++++ ...143844_maximilian_schulz_schema_linting.md | 48 +++++++++++++++++++ ...lexey_snigir_vizro_ai_integration_tests.md | 48 +++++++++++++++++++ ..._chiara_pullem_incorporate_e2e_feedback.md | 48 +++++++++++++++++++ ...113606_alexey_snigir_pin_openai_version.md | 48 +++++++++++++++++++ 10 files changed, 335 insertions(+), 9 deletions(-) create mode 100644 vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md rename vizro-ai/changelog.d/{20231110_132932_maximilian_schulz_adjust_release_process.md => 20231101_120705_maximilian_schulz_check_CI.md} (100%) create mode 100644 vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md create mode 100644 vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md create mode 100644 vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md create mode 100644 vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md create mode 100644 vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md create mode 100644 vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md diff --git a/tools/check_package_release.py b/tools/check_package_release.py index 2fcbf17c4..4009f5c56 100644 --- a/tools/check_package_release.py +++ b/tools/check_package_release.py @@ -5,7 +5,7 @@ import requests -AVAILABLE_PACKAGES = ["vizro-core", "vizro-ai"] +AVAILABLE_PACKAGES = ["vizro-core","vizro-ai"] VERSION_MATCHSTR = r'\s*__version__\s*=\s*"(\d+\.\d+\.\d+)"' RESPONSE_ERROR = 404 diff --git a/vizro-ai/CHANGELOG.md b/vizro-ai/CHANGELOG.md index 0566e6af6..22dc5b0a8 100644 --- a/vizro-ai/CHANGELOG.md +++ b/vizro-ai/CHANGELOG.md @@ -10,11 +10,3 @@ This project adheres to Semantic Versioning (http://semver.org/). --> See the fragment files in the [changelog.d directory](https://github.com/mckinsey/vizro/tree/main/vizro-ai/changelog.d). - - - -# 0.1.0 — 2023-11-10 - -## Highlights ✨ - -- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) diff --git a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md new file mode 100644 index 000000000..6253ca680 --- /dev/null +++ b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md @@ -0,0 +1,46 @@ + + +### Highlights ✨ + +- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) + + + + + + + diff --git a/vizro-ai/changelog.d/20231110_132932_maximilian_schulz_adjust_release_process.md b/vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md similarity index 100% rename from vizro-ai/changelog.d/20231110_132932_maximilian_schulz_adjust_release_process.md rename to vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md diff --git a/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md b/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md b/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md b/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md b/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md b/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md b/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md @@ -0,0 +1,48 @@ + + + + + + + + + From 9c8b427e602f432c02b5df09caa6b7287538e991 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:04:10 +0100 Subject: [PATCH 12/25] Fix to low version --- vizro-ai/src/vizro_ai/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vizro-ai/src/vizro_ai/__init__.py b/vizro-ai/src/vizro_ai/__init__.py index e93733f83..267c58159 100644 --- a/vizro-ai/src/vizro_ai/__init__.py +++ b/vizro-ai/src/vizro_ai/__init__.py @@ -5,6 +5,6 @@ __all__ = ["VizroAI"] -__version__ = "0.1.0" +__version__ = "0.0.2.dev0" logging.basicConfig(level=os.getenv("VIZRO_AI_LOG_LEVEL", "INFO")) From fea08e3442be9fba29296018a8baedfbab4e7dca Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:07:06 +0100 Subject: [PATCH 13/25] Lint --- .github/workflows/check-release.yml | 12 ++++++------ tools/check_package_release.py | 2 +- tools/release.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 798e4f608..ff548b234 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -72,12 +72,12 @@ jobs: hatch build - name: Set PyPI token run: | - if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-core" ]; then - echo 'PYPI_TOKEN=${{ secrets.VIZRO_TEST_PYPI_TOKEN }}' >> $GITHUB_ENV - fi - if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then - echo 'PYPI_TOKEN=${{ secrets.VIZRO_AI_TEST_PYPI_TOKEN }}' >> $GITHUB_ENV - fi + if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-core" ]; then + echo 'PYPI_TOKEN=${{ secrets.VIZRO_TEST_PYPI_TOKEN }}' >> $GITHUB_ENV + fi + if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then + echo 'PYPI_TOKEN=${{ secrets.VIZRO_AI_TEST_PYPI_TOKEN }}' >> $GITHUB_ENV + fi # - name: Publish distribution 📦 to PyPI # uses: pypa/gh-action-pypi-publish@release/v1 # with: diff --git a/tools/check_package_release.py b/tools/check_package_release.py index 4009f5c56..2fcbf17c4 100644 --- a/tools/check_package_release.py +++ b/tools/check_package_release.py @@ -5,7 +5,7 @@ import requests -AVAILABLE_PACKAGES = ["vizro-core","vizro-ai"] +AVAILABLE_PACKAGES = ["vizro-core", "vizro-ai"] VERSION_MATCHSTR = r'\s*__version__\s*=\s*"(\d+\.\d+\.\d+)"' RESPONSE_ERROR = 404 diff --git a/tools/release.sh b/tools/release.sh index c3432ab48..83d8cc581 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -45,4 +45,4 @@ STATUS=$(curl -L \ echo "${STATUS}" REQUEST_NUMBER=$(echo "${RESPONSE}" | jq -r '.id') -echo "Request number: ${REQUEST_NUMBER}" \ No newline at end of file +echo "Request number: ${REQUEST_NUMBER}" From 8f7a44505988a8c6d642a8f6ef01cfa7e27f9b89 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:07:50 +0100 Subject: [PATCH 14/25] TBR fake release --- vizro-ai/CHANGELOG.md | 8 ++++ ...ng_vizro_ai_open_source_initial_commits.md | 46 ------------------ ...101_175538_anna_xiong_prompt_refinement.md | 48 ------------------- ...5201_maximilian_schulz_hosting_vizro_ai.md | 48 ------------------- ...143844_maximilian_schulz_schema_linting.md | 48 ------------------- ...lexey_snigir_vizro_ai_integration_tests.md | 48 ------------------- ..._chiara_pullem_incorporate_e2e_feedback.md | 48 ------------------- ...113606_alexey_snigir_pin_openai_version.md | 48 ------------------- ...ximilian_schulz_adjust_release_process.md} | 0 vizro-ai/src/vizro_ai/__init__.py | 2 +- 10 files changed, 9 insertions(+), 335 deletions(-) delete mode 100644 vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md delete mode 100644 vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md delete mode 100644 vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md delete mode 100644 vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md delete mode 100644 vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md delete mode 100644 vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md delete mode 100644 vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md rename vizro-ai/changelog.d/{20231101_120705_maximilian_schulz_check_CI.md => 20231110_170717_maximilian_schulz_adjust_release_process.md} (100%) diff --git a/vizro-ai/CHANGELOG.md b/vizro-ai/CHANGELOG.md index 22dc5b0a8..d439a4234 100644 --- a/vizro-ai/CHANGELOG.md +++ b/vizro-ai/CHANGELOG.md @@ -10,3 +10,11 @@ This project adheres to Semantic Versioning (http://semver.org/). --> See the fragment files in the [changelog.d directory](https://github.com/mckinsey/vizro/tree/main/vizro-ai/changelog.d). + + + +# 0.0.2 — 2023-11-10 + +## Highlights ✨ + +- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) diff --git a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md deleted file mode 100644 index 6253ca680..000000000 --- a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md +++ /dev/null @@ -1,46 +0,0 @@ - - -### Highlights ✨ - -- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) - - - - - - - diff --git a/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md b/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md b/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md b/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md b/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md b/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md b/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md deleted file mode 100644 index f1f65e73c..000000000 --- a/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - diff --git a/vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md b/vizro-ai/changelog.d/20231110_170717_maximilian_schulz_adjust_release_process.md similarity index 100% rename from vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md rename to vizro-ai/changelog.d/20231110_170717_maximilian_schulz_adjust_release_process.md diff --git a/vizro-ai/src/vizro_ai/__init__.py b/vizro-ai/src/vizro_ai/__init__.py index 267c58159..b5cb175dd 100644 --- a/vizro-ai/src/vizro_ai/__init__.py +++ b/vizro-ai/src/vizro_ai/__init__.py @@ -5,6 +5,6 @@ __all__ = ["VizroAI"] -__version__ = "0.0.2.dev0" +__version__ = "0.0.2" logging.basicConfig(level=os.getenv("VIZRO_AI_LOG_LEVEL", "INFO")) From 93df9b68169287c216c64a1f59bd5fba13236d3a Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:10:26 +0100 Subject: [PATCH 15/25] Actually release to test-pypi --- .github/workflows/check-release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index ff548b234..a7927e412 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -78,12 +78,12 @@ jobs: if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then echo 'PYPI_TOKEN=${{ secrets.VIZRO_AI_TEST_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/ - # packages-dir: ${{ needs.check-version.outputs.package_name }}/dist - # password: ${{ env.PYPI_TOKEN }} + - name: Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ + packages-dir: ${{ needs.check-version.outputs.package_name }}/dist + password: ${{ env.PYPI_TOKEN }} # - name: Check correct package uploaded to PyPI # run: | # cd "${{ needs.check-version.outputs.package_name }}/dist" From daf95d1210ac9500aa88e89c70ee6441db040d23 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:19:39 +0100 Subject: [PATCH 16/25] check tagging --- .github/workflows/check-release.yml | 12 ++++++------ tools/release.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index a7927e412..024430d45 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -78,12 +78,12 @@ jobs: if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then echo 'PYPI_TOKEN=${{ secrets.VIZRO_AI_TEST_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/ - packages-dir: ${{ needs.check-version.outputs.package_name }}/dist - password: ${{ env.PYPI_TOKEN }} + # - name: Publish distribution 📦 to PyPI + # uses: pypa/gh-action-pypi-publish@release/v1 + # with: + # # repository-url: https://test.pypi.org/legacy/ + # packages-dir: ${{ needs.check-version.outputs.package_name }}/dist + # password: ${{ env.PYPI_TOKEN }} # - name: Check correct package uploaded to PyPI # run: | # cd "${{ needs.check-version.outputs.package_name }}/dist" diff --git a/tools/release.sh b/tools/release.sh index 83d8cc581..e9753ec71 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -27,7 +27,7 @@ PAYLOAD=$(cat <<-END "target_commitish": "main", "name": "${PACKAGE}-${VERSION}", "body": ${BODY}, - "draft": true, + "draft": false, "prerelease": false, "make_latest": "${MAKE_LATEST}" } From dc764960ae0786b40b817fd8ae743c40b80fb7f2 Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:25:07 +0100 Subject: [PATCH 17/25] Revert "TBR fake release" This reverts commit 8f7a44505988a8c6d642a8f6ef01cfa7e27f9b89. --- vizro-ai/CHANGELOG.md | 8 ---- ...ng_vizro_ai_open_source_initial_commits.md | 46 ++++++++++++++++++ ...1101_120705_maximilian_schulz_check_CI.md} | 0 ...101_175538_anna_xiong_prompt_refinement.md | 48 +++++++++++++++++++ ...5201_maximilian_schulz_hosting_vizro_ai.md | 48 +++++++++++++++++++ ...143844_maximilian_schulz_schema_linting.md | 48 +++++++++++++++++++ ...lexey_snigir_vizro_ai_integration_tests.md | 48 +++++++++++++++++++ ..._chiara_pullem_incorporate_e2e_feedback.md | 48 +++++++++++++++++++ ...113606_alexey_snigir_pin_openai_version.md | 48 +++++++++++++++++++ vizro-ai/src/vizro_ai/__init__.py | 2 +- 10 files changed, 335 insertions(+), 9 deletions(-) create mode 100644 vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md rename vizro-ai/changelog.d/{20231110_170717_maximilian_schulz_adjust_release_process.md => 20231101_120705_maximilian_schulz_check_CI.md} (100%) create mode 100644 vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md create mode 100644 vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md create mode 100644 vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md create mode 100644 vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md create mode 100644 vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md create mode 100644 vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md diff --git a/vizro-ai/CHANGELOG.md b/vizro-ai/CHANGELOG.md index d439a4234..22dc5b0a8 100644 --- a/vizro-ai/CHANGELOG.md +++ b/vizro-ai/CHANGELOG.md @@ -10,11 +10,3 @@ This project adheres to Semantic Versioning (http://semver.org/). --> See the fragment files in the [changelog.d directory](https://github.com/mckinsey/vizro/tree/main/vizro-ai/changelog.d). - - - -# 0.0.2 — 2023-11-10 - -## Highlights ✨ - -- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) diff --git a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md new file mode 100644 index 000000000..6253ca680 --- /dev/null +++ b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md @@ -0,0 +1,46 @@ + + +### Highlights ✨ + +- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) + + + + + + + diff --git a/vizro-ai/changelog.d/20231110_170717_maximilian_schulz_adjust_release_process.md b/vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md similarity index 100% rename from vizro-ai/changelog.d/20231110_170717_maximilian_schulz_adjust_release_process.md rename to vizro-ai/changelog.d/20231101_120705_maximilian_schulz_check_CI.md diff --git a/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md b/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231101_175538_anna_xiong_prompt_refinement.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md b/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231102_095201_maximilian_schulz_hosting_vizro_ai.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md b/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231102_143844_maximilian_schulz_schema_linting.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md b/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231102_163517_alexey_snigir_vizro_ai_integration_tests.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md b/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231103_161536_chiara_pullem_incorporate_e2e_feedback.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md b/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md new file mode 100644 index 000000000..f1f65e73c --- /dev/null +++ b/vizro-ai/changelog.d/20231109_113606_alexey_snigir_pin_openai_version.md @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/vizro-ai/src/vizro_ai/__init__.py b/vizro-ai/src/vizro_ai/__init__.py index b5cb175dd..267c58159 100644 --- a/vizro-ai/src/vizro_ai/__init__.py +++ b/vizro-ai/src/vizro_ai/__init__.py @@ -5,6 +5,6 @@ __all__ = ["VizroAI"] -__version__ = "0.0.2" +__version__ = "0.0.2.dev0" logging.basicConfig(level=os.getenv("VIZRO_AI_LOG_LEVEL", "INFO")) From ca9b525df7afaea179af8f5e79f65988fd355e1d Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:26:01 +0100 Subject: [PATCH 18/25] Dev version --- vizro-ai/src/vizro_ai/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vizro-ai/src/vizro_ai/__init__.py b/vizro-ai/src/vizro_ai/__init__.py index 267c58159..6dd20f43e 100644 --- a/vizro-ai/src/vizro_ai/__init__.py +++ b/vizro-ai/src/vizro_ai/__init__.py @@ -5,6 +5,6 @@ __all__ = ["VizroAI"] -__version__ = "0.0.2.dev0" +__version__ = "0.1.0.dev3" logging.basicConfig(level=os.getenv("VIZRO_AI_LOG_LEVEL", "INFO")) From 7769acf080150b8e0e401d0ae66d4d691cf3ba7e Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 17:37:34 +0100 Subject: [PATCH 19/25] Reactivate everything --- .github/workflows/check-release.yml | 90 +++++++++---------- ...ng_vizro_ai_open_source_initial_commits.md | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 024430d45..9dbe9843f 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -78,49 +78,49 @@ jobs: if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-ai" ]; then echo 'PYPI_TOKEN=${{ secrets.VIZRO_AI_TEST_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/ - # packages-dir: ${{ needs.check-version.outputs.package_name }}/dist - # password: ${{ env.PYPI_TOKEN }} - # - name: Check correct package uploaded to PyPI - # run: | - # cd "${{ needs.check-version.outputs.package_name }}/dist" - # local=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) - # cd .. - # pip download vizro==${{needs.check-version.outputs.package_version}} -d . --no-deps --timeout 300 - # pypi=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) - # if [[ $local = $pypi ]]; then echo "md5 hash is the same"; else echo "md5 hash is not the same"; exit 1; 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 + run: | + cd "${{ needs.check-version.outputs.package_name }}/dist" + local=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) + cd .. + pip download vizro==${{needs.check-version.outputs.package_version}} -d . --no-deps --timeout 300 + pypi=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) + if [[ $local = $pypi ]]; then echo "md5 hash is the same"; else echo "md5 hash is not the same"; exit 1; fi - # version-bump: - # needs: [check-version, build-publish] - # if: | - # needs.check-version.outputs.new_release == 'True' - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # - name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: "3.10" - # - name: Install dependencies - # run: | - # python -m pip install --upgrade pip - # pip install hatch - # - name: Bump version to next patch - # run: | - # formatted_date=$(date +"%Y-%m-%d/%H-%M-%S") - # cd "${{ needs.check-version.outputs.package_name }}" - # git checkout -b "release/version_bump_next_minor/${formatted_date}" - # hatch version patch,dev - # hatch run changelog:add - # hatch run schema - # git config user.email "145135826+vizro-svc@users.noreply.github.com" - # git config user.name "Vizro Team" - # git add -A - # git commit -m "version bump" - # git push --set-upstream origin release/version_bump_next_minor/${formatted_date} - # ./../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} + version-bump: + needs: [check-version, build-publish] + if: | + needs.check-version.outputs.new_release == 'True' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: "3.10" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install hatch + - name: Bump version to next patch + run: | + formatted_date=$(date +"%Y-%m-%d/%H-%M-%S") + cd "${{ needs.check-version.outputs.package_name }}" + git checkout -b "release/version_bump_next_minor/${formatted_date}" + hatch version patch,dev + hatch run changelog:add + hatch run schema + git config user.email "145135826+vizro-svc@users.noreply.github.com" + git config user.name "Vizro Team" + git add -A + git commit -m "version bump" + git push --set-upstream origin release/version_bump_next_minor/${formatted_date} + ./../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} diff --git a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md index 6253ca680..aad6d0ef3 100644 --- a/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md +++ b/vizro-ai/changelog.d/20231031_102652_anna_xiong_vizro_ai_open_source_initial_commits.md @@ -6,7 +6,7 @@ Uncomment the section that is right (remove the HTML comment wrapper). ### Highlights ✨ -- Initial release of vizro-ai package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) +- Initial release of `vizro-ai` package. Vizro-AI is a tool for generating data visualizations. ([#138](https://github.com/mckinsey/vizro/pull/138)) + + + + + + + + From 81144d4d94e7e7750fc89087cf20ec3b9acf2e4d Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 19:48:57 +0100 Subject: [PATCH 22/25] CHangelog --- .../20231110_194832_maximilian_schulz_adjust_release_process.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename vizro-core/changelog.d/20231110_194340_maximilian_schulz_adjust_release_process.md => vizro-ai/changelog.d/20231110_194832_maximilian_schulz_adjust_release_process.md (100%) diff --git a/vizro-core/changelog.d/20231110_194340_maximilian_schulz_adjust_release_process.md b/vizro-ai/changelog.d/20231110_194832_maximilian_schulz_adjust_release_process.md similarity index 100% rename from vizro-core/changelog.d/20231110_194340_maximilian_schulz_adjust_release_process.md rename to vizro-ai/changelog.d/20231110_194832_maximilian_schulz_adjust_release_process.md From 62bfbc7e73bb07b3e6f18db7553fc9e1659478da Mon Sep 17 00:00:00 2001 From: Maximilian Schulz Date: Fri, 10 Nov 2023 22:12:54 +0100 Subject: [PATCH 23/25] Remove PR bit --- .github/workflows/check-release.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 1a45f180c..bc03cc6fc 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -4,9 +4,6 @@ on: push: branches: - main - pull_request: - branches: - - main jobs: check-version: From 214d4e4f89b1e79bf741989fa7e81206fea18655 Mon Sep 17 00:00:00 2001 From: Lingyi Zhang Date: Mon, 13 Nov 2023 10:18:47 -0500 Subject: [PATCH 24/25] address comments --- .github/workflows/check-release.yml | 4 +--- vizro-ai/hatch.toml | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index bc03cc6fc..c52bceb99 100644 --- 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 index 51a18a627..a45091ddf 100644 --- 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)'" From d68751202a69388521da89bbaad870a088648dac Mon Sep 17 00:00:00 2001 From: Lingyi Zhang Date: Mon, 13 Nov 2023 10:32:57 -0500 Subject: [PATCH 25/25] make package name variable consistent --- .github/workflows/check-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index c52bceb99..b0dd084ad 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -69,9 +69,9 @@ jobs: hatch build - name: Set PyPI token run: | - if [ "${{ needs.check-version.outputs.PACKAGE_NAME }}" == "vizro-core" ]; then + if [ "${{ needs.check-version.outputs.package_name }}" == "vizro-core" ]; then echo 'PYPI_TOKEN=${{ secrets.VIZRO_PYPI_TOKEN }}' >> $GITHUB_ENV - elif [ "${{ 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 @@ -82,10 +82,10 @@ jobs: - name: Check correct package uploaded to PyPI run: | cd "${{ needs.check-version.outputs.package_name }}/dist" - local=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) + local=$(md5sum ${{ needs.check-version.outputs.package_name }}-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) cd .. - pip download vizro==${{needs.check-version.outputs.package_version}} -d . --no-deps --timeout 300 - pypi=$(md5sum vizro-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) + pip download ${{ needs.check-version.outputs.package_name }}==${{needs.check-version.outputs.package_version}} -d . --no-deps --timeout 300 + pypi=$(md5sum ${{ needs.check-version.outputs.package_name }}-${{needs.check-version.outputs.package_version}}-py3-none-any.whl) if [[ $local = $pypi ]]; then echo "md5 hash is the same"; else echo "md5 hash is not the same"; exit 1; fi version-bump: