From 096cd4f8aa953c2d313b2d6ee8f7e40ebb9b8aae Mon Sep 17 00:00:00 2001 From: tdstein Date: Fri, 14 Feb 2025 13:23:17 -0500 Subject: [PATCH 1/2] test: add v2024.12.0 and v2025.01.0 to integration test suite --- .github/workflows/ci.yaml | 2 ++ integration/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4332e7ae..62edf338 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,6 +41,8 @@ jobs: matrix: CONNECT_VERSION: - preview + - 2025.01.0 + - 2024.12.0 - 2024.11.0 - 2024.09.0 - 2024.08.0 diff --git a/integration/Makefile b/integration/Makefile index 120af993..7f819dd5 100644 --- a/integration/Makefile +++ b/integration/Makefile @@ -26,6 +26,8 @@ PYTEST_ARGS ?= "-s" # Versions CONNECT_VERSIONS := \ + 2025.01.0 \ + 2024.12.0 \ 2024.11.0 \ 2024.09.0 \ 2024.08.0 \ From cdd51951dbd0d1aad03f2a7f5d430469a5a46641 Mon Sep 17 00:00:00 2001 From: tdstein Date: Fri, 14 Feb 2025 13:42:50 -0500 Subject: [PATCH 2/2] fix: linting error --- Makefile | 7 ++++--- pyproject.toml | 6 +++++- src/posit/connect/system.py | 5 +++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4365b596..1121951a 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ include vars.mk .PHONY: build clean cov default dev docker-deps docs ensure-uv fmt fix install it lint test uninstall version help +$(UV_LOCK): dev + $(UV) lock + all: dev test lint build build: dev @@ -30,7 +33,7 @@ cov-xml: dev $(UV) run coverage xml dev: ensure-uv - $(UV) pip install -e . + $(UV) pip install --upgrade -e . docker-deps: ensure-uv # Sync given the `uv.lock` file @@ -59,8 +62,6 @@ fmt: dev install: build $(UV) pip install dist/*.whl -$(UV_LOCK): dev - $(UV) lock it: $(UV_LOCK) $(MAKE) -C ./integration diff --git a/pyproject.toml b/pyproject.toml index 79985b04..bcdfb6e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,11 @@ classifiers = [ "Typing :: Typed", ] dynamic = ["version"] -dependencies = ["requests>=2.31.0,<3", "packaging", "typing-extensions"] +dependencies = [ + "requests>=2.31.0,<3", + "packaging", + "typing-extensions", +] [project.urls] Source = "https://github.com/posit-dev/posit-sdk-py" diff --git a/src/posit/connect/system.py b/src/posit/connect/system.py index 60b46ab8..32a8bef3 100644 --- a/src/posit/connect/system.py +++ b/src/posit/connect/system.py @@ -201,7 +201,8 @@ def destroy( version: str, image_name: str, dry_run: Literal[False] = False, - ) -> Task: ... + ) -> Task | None: ... + @overload def destroy( self, @@ -211,7 +212,7 @@ def destroy( version: str, image_name: str, dry_run: Literal[True] = True, - ) -> None: ... + ) -> Task | None: ... def destroy( self,