diff --git a/.github/workflows/release-py.yml b/.github/workflows/release-py.yml index bdb8997..e6cd62a 100644 --- a/.github/workflows/release-py.yml +++ b/.github/workflows/release-py.yml @@ -32,7 +32,7 @@ jobs: echo "$HOME/.local/bin" >> "$GITHUB_PATH" - name: Create .venv and install deps - run: uv sync --extra dev + run: uv sync - name: Build sdist + wheel (via make) run: make build # runs `uv build`, outputs to dist/ diff --git a/CHANGELOG.md b/CHANGELOG.md index ee7d577..65be820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,10 @@ infrastructure overhaul. (Bernhard Merkle, #150). #### Infrastructure +- Changes pyproject.toml to use uv more idiomatically. + - Local devs write `uv sync` instead of `uv sync --extra dev`. + - From PyPI (with uv or pip) you can use `typeagent[dev]` + to install the dev dependencies with the package. - Move _typeagent/_ to _src/typeagent/_ (Bernhard Merkle, #139). - Move tests and test data to _tests/_ directory (Bernhard Merkle, #144). - Move ancillary dirs into subdirs (Bernhard Merkle, #145). diff --git a/pyproject.toml b/pyproject.toml index 379f43e..01470ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "uv_build" [project] name = "typeagent" -version = "0.3.3" +version = "0.4.0.dev" description = "Incremental message indexing and querying pipelines using Structured RAG" readme = { file = "README.md", content-type = "text/markdown" } license = "MIT" diff --git a/tools/release.py b/tools/release.py index ba235f0..22a4ea1 100755 --- a/tools/release.py +++ b/tools/release.py @@ -449,8 +449,11 @@ def main(): ) if exit_code != 0: - print("Error: Failed to create PR", file=sys.stderr) - return 1 + if args.force: + print("Warning: Failed to create PR -- you can create it yourself", file=sys.stderr) + else: + print("Error: Failed to create PR -- but you can create it yourself", file=sys.stderr) + return 1 if args.dry_run: print(f"\n[DRY RUN] Release process completed successfully!") @@ -461,8 +464,11 @@ def main(): print(f"\nRelease process completed successfully!") print(f"Created branch: {branch_name}") print(f"Created tag: {tag_name}") - print(f"Created PR: {pr_url}") + if exit_code == 0: + print(f"Created PR: {pr_url}") print(f"\nNext steps:") + if exit_code == 0: + print(f" 0. Create the PR (since it wasn't created)") print(f" 1. Get the PR approved and merged") print(f" 2. The GitHub Actions release workflow will be triggered by the tag") diff --git a/uv.lock b/uv.lock index e26630a..b4dbf24 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 2 +revision = 3 requires-python = ">=3.12" resolution-markers = [ "python_full_version >= '3.13'", @@ -2360,7 +2360,7 @@ wheels = [ [[package]] name = "typeagent" -version = "0.3.3" +version = "0.4.0.dev0" source = { editable = "." } dependencies = [ { name = "azure-identity" },