From cafff5a6f7c5e84244e4f0084779d6f3bee6c60d Mon Sep 17 00:00:00 2001 From: Alexander Song Date: Thu, 19 Oct 2023 12:43:02 -0500 Subject: [PATCH 1/4] build frontend --- .github/workflows/publish-to-pypi.yml | 58 ++++++--------------------- pyproject.toml | 10 ----- 2 files changed, 12 insertions(+), 56 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 203f83ad04..ebc5046077 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -1,10 +1,10 @@ -name: Publish Python 🐍 distribution 📦 to PyPI +name: Publish to PyPI on: push jobs: build: - name: Build distribution 📦 + name: Build distribution runs-on: ubuntu-latest steps: @@ -13,14 +13,16 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.x" - - name: Install pypa/build - run: >- - python3 -m - pip install - build - --user + - name: Set up node + uses: actions/setup-node@v3 + - name: Build frontend + run: cd app && rm -rf node_modules && npm install && npm run build + - name: Install hatch + run: | + python -m pip install --upgrade pip==${{ env.pip-version }} + pip install hatch - name: Build a binary wheel and a source tarball - run: python3 -m build + run: rm -rf dist && hatch build - name: Store the distribution packages uses: actions/upload-artifact@v3 with: @@ -28,8 +30,7 @@ jobs: path: dist/ publish-to-pypi: - name: >- - Publish Python 🐍 distribution 📦 to PyPI + name: Publish to PyPI if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes needs: - build @@ -47,38 +48,3 @@ jobs: path: dist/ - name: Publish distribution 📦 to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - - github-release: - name: >- - Sign the Python 🐍 distribution 📦 with Sigstore - and upload them to GitHub Release - needs: - - publish-to-pypi - runs-on: ubuntu-latest - - permissions: - contents: write # IMPORTANT: mandatory for making GitHub Releases - id-token: write # IMPORTANT: mandatory for sigstore - - steps: - - name: Download all the dists - uses: actions/download-artifact@v3 - with: - name: python-package-distributions - path: dist/ - - name: Sign the dists with Sigstore - uses: sigstore/gh-action-sigstore-python@v1.2.3 - with: - inputs: >- - ./dist/*.tar.gz - ./dist/*.whl - - name: Upload artifact signatures to GitHub Release - env: - GITHUB_TOKEN: ${{ github.token }} - # Upload to GitHub Release using the `gh` CLI. - # `dist/` contains the built packages, and the - # sigstore-produced signatures and certificates. - run: >- - gh release upload - '${{ github.ref_name }}' dist/** - --repo '${{ github.repository }}' diff --git a/pyproject.toml b/pyproject.toml index 6cb66d2ffc..a964040c42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -82,16 +82,6 @@ artifacts = ["src/phoenix/server/static"] [tool.hatch.build] only-packages = true -[tool.hatch.build.hooks.jupyter-builder] -dependencies = ["hatch-jupyter-builder"] -build-function = "hatch_jupyter_builder.npm_builder" -ensured-targets = ["src/phoenix/server/static/index.js"] -skip-if-exists = ["src/phoenix/server/static/index.js"] - -[tool.hatch.build.hooks.jupyter-builder.build-kwargs] -path = "app" -source_dir = "app" - [tool.hatch.build.targets.sdist] artifacts = ["src/phoenix/server/static"] From d4e053cd69a4077afa1e88aab1e2e318d1ed2230 Mon Sep 17 00:00:00 2001 From: Alexander Song Date: Thu, 19 Oct 2023 12:50:33 -0500 Subject: [PATCH 2/4] unpin pip version --- .github/workflows/publish-to-pypi.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index ebc5046077..426b41b3f8 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -6,7 +6,6 @@ jobs: build: name: Build distribution runs-on: ubuntu-latest - steps: - uses: actions/checkout@v4 - name: Set up Python @@ -19,7 +18,7 @@ jobs: run: cd app && rm -rf node_modules && npm install && npm run build - name: Install hatch run: | - python -m pip install --upgrade pip==${{ env.pip-version }} + python -m pip install --upgrade pip pip install hatch - name: Build a binary wheel and a source tarball run: rm -rf dist && hatch build From e59cc481c3bc47582f95af59b6bcf68838b2ad4e Mon Sep 17 00:00:00 2001 From: Alexander Song Date: Thu, 19 Oct 2023 12:58:00 -0500 Subject: [PATCH 3/4] build dist only on tag commit --- .github/workflows/publish-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 426b41b3f8..664f5a1563 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -5,6 +5,7 @@ on: push jobs: build: name: Build distribution + if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -30,7 +31,6 @@ jobs: publish-to-pypi: name: Publish to PyPI - if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes needs: - build runs-on: ubuntu-latest From 0f946d86be04b9c69719dcab39bb1330a284427c Mon Sep 17 00:00:00 2001 From: Alexander Song Date: Thu, 19 Oct 2023 12:58:40 -0500 Subject: [PATCH 4/4] increment version --- src/phoenix/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phoenix/__init__.py b/src/phoenix/__init__.py index 1e26dda9bf..dc8dcf99cf 100644 --- a/src/phoenix/__init__.py +++ b/src/phoenix/__init__.py @@ -5,7 +5,7 @@ from .trace.fixtures import load_example_traces from .trace.trace_dataset import TraceDataset -__version__ = "0.0.50rc" +__version__ = "0.0.50rc1" # module level doc-string __doc__ = """