Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,33 +179,3 @@ jobs:
license: ${{ secrets.CONNECT_LICENSE_FILE }}
command: |
uv run --no-sync --group test ./scripts/runtests

test-dev-connect:
name: "Integration tests against dev Connect"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: astral-sh/setup-uv@v6
with:
version: ">=0.9.0"
- uses: extractions/setup-just@v3
- name: Install dependencies
run: |
uv sync --python 3.12 --group test
uv pip install -r vetiver-testing/vetiver-requirements.txt
- name: Run Posit Connect
run: |
docker compose up --build -d
uv pip freeze > requirements.txt
just dev
env:
RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- name: Get logs in case of failure
run: |
docker compose logs rsconnect
if: ${{ failure() }}
- name: Run tests
run: |
uv run --no-sync pytest tests/test_main_system_caches.py
uv run --no-sync pytest --vetiver -m 'vetiver'
12 changes: 0 additions & 12 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,6 @@ clean-stores:
set -euo pipefail
find . -type d \( -name "rsconnect-python" -o -name "rsconnect_python-*" \) -exec rm -rf {} +

# Start a local Connect server for development (Docker; not replaced by uv)
dev:
docker compose up -d
sleep 30
docker compose exec -T rsconnect bash < vetiver-testing/setup-rsconnect/add-users.sh
uv run python vetiver-testing/setup-rsconnect/dump_api_keys.py vetiver-testing/rsconnect_api_keys.json

# Stop the local Connect server
dev-stop:
docker compose down
rm -f vetiver-testing/rsconnect_api_keys.json

# Sync latest docs to S3 (CI)
sync-latest-docs-to-s3:
aws s3 sync --acl bucket-owner-full-control --cache-control max-age=0 site/ s3://rstudio-connect-downloads/connect/rsconnect-python/latest/docs/
Expand Down
18 changes: 0 additions & 18 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os
import sys
import pytest

from os.path import abspath, dirname

Expand All @@ -13,20 +12,3 @@
# default argument value at import time, so this must be set before any test
# module imports rsconnect. (Previously injected by the Makefile's TEST_ENV.)
os.environ.setdefault("CONNECT_CONTENT_BUILD_DIR", "rsconnect-build-test")


def pytest_addoption(parser):
parser.addoption("--vetiver", action="store_true", default=False, help="run vetiver tests")


def pytest_configure(config):
config.addinivalue_line("markers", "vetiver: test for vetiver interaction")


def pytest_collection_modifyitems(config, items):
if config.getoption("--vetiver"):
return
skip_vetiver = pytest.mark.skip(reason="need --vetiver option to run")
for item in items:
if "vetiver" in item.keywords:
item.add_marker(skip_vetiver)
15 changes: 0 additions & 15 deletions docker-compose.yml

This file was deleted.

4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ module-root = ""

[tool.ruff]
line-length = 120
extend-exclude = ["my-shiny-app", "rsconnect-build", "rsconnect-build-test", "integration", "vetiver-testing", "tests/testdata"]
extend-exclude = ["my-shiny-app", "rsconnect-build", "rsconnect-build-test", "integration", "tests/testdata"]

[tool.ruff.lint]
select = ["E", "F", "W"]
Expand All @@ -71,7 +71,7 @@ per-file-ignores = { "tests/test_metadata.py" = ["E501"] }
omit = ["tests/*"]

[tool.pytest.ini_options]
markers = ["vetiver: tests for vetiver"]
markers = []
addopts = """
--ignore=tests/testdata
"""
Expand Down
11 changes: 6 additions & 5 deletions rsconnect/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,11 @@ def validate_quarto_engines(inspect: QuartoInspectResult):


# ===============================================================================
# START: The following deprecated functions are here only for the vetiver-python
# package.
# Some the code in this section has `pyright: ignore` comments, because this
# deprecated code which will be removed in the future.
# START: Compatibility entry point used by the vetiver-python package.
# vetiver's `deploy_connect` calls `deploy_python_fastapi` (below), which routes
# through `deploy_app` and the local `validate_*` helpers. This is a supported
# shim; keep these signatures stable. The `pyright: ignore` comments remain
# because the kwargs-forwarding style predates strict typing.
# ===============================================================================
def validate_extra_files(directory: str, extra_files: Sequence[str]):
"""
Expand Down Expand Up @@ -439,7 +440,7 @@ def deploy_app(


# ===============================================================================
# END deprecated functions for the vetiver-python package
# END compatibility entry point for the vetiver-python package
# ===============================================================================


Expand Down
Loading
Loading