Cleanup

Author: nealrichardson

.github/workflows/ci.yml

@@ -102,9 +102,7 @@ jobs:
           # License file is valid until 2026-11-05
           license: ${{ secrets.CONNECT_LICENSE }}
           config-file: "script/setup-rsconnect/rstudio-connect.gcfg"
-          command: |
-            bash -c 'python script/setup-rsconnect/dump_api_keys.py pins/tests/rsconnect_api_keys.json && pytest pins -m "fs_rsc and not skip_on_github"'
-
+          command: pytest pins -m "fs_rsc and not skip_on_github"
 
   test-fork:
     name: "Test a fork PR (no secrets)"

Makefile

@@ -1,24 +1,4 @@
 SPHINX_BUILDARGS=
-# Note that these are keys generated by the docker rsconnect service, so are
-# not really secrets. They are saved to json to make it easy to use rsconnect
-# as multiple users from the tests
-RSC_API_KEYS=pins/tests/rsconnect_api_keys.json
-
-dev: pins/tests/rsconnect_api_keys.json
-
-dev-start:
-	docker compose up -d
-	docker compose exec -T rsconnect bash < script/setup-rsconnect/add-users.sh
-	# curl fails with error 52 without a short sleep....
-	sleep 5
-	curl -s --retry 10 --retry-connrefused http://localhost:3939
-
-dev-stop:
-	docker compose down
-	rm -f $(RSC_API_KEYS)
-
-$(RSC_API_KEYS): dev-start
-	python script/setup-rsconnect/dump_api_keys.py $@
 
 README.md:
 	quarto render README.qmd

pins/tests/.gitignore

@@ -33,7 +33,9 @@
 ]
 
 # rsc should only be used once, because users are created at docker setup time
-param_rsc = pytest.param(lambda api_keys: RscBoardBuilder("rsc", api_keys=api_keys), id="rsc", marks=m.fs_rsc)
+param_rsc = pytest.param(
+    lambda api_keys: RscBoardBuilder("rsc", api_keys=api_keys), id="rsc", marks=m.fs_rsc
+)
 
 params_backend = [*params_safe, param_rsc]
 

pins/tests/conftest.py

@@ -1,6 +1,5 @@
 import contextlib
 import functools
-import json
 import os
 import shutil
 import uuid
@@ -211,7 +210,9 @@ def __init__(self, fs_name, path=None, api_keys=None, *args, **kwargs):
     def create_tmp_board(self, src_board=None, versioned=True):
         from pins.rsconnect.fs import PinBundleManifest  # noqa
 
-        board = BoardRsConnect("", rsc_fs_from_key("derek", self.api_keys), versioned=versioned)
+        board = BoardRsConnect(
+            "", rsc_fs_from_key("derek", self.api_keys), versioned=versioned
+        )
         if src_board is None:
             return board