make py3.5 compliant

Author: isabelizimm

Makefile

@@ -20,6 +20,8 @@ endif
 
 TEST_ENV =
 
+RSC_API_KEYS=vetiver-testing/rsconnect_api_keys.json
+
 ifneq ($(CONNECT_SERVER),)
   TEST_ENV += CONNECT_SERVER=$(CONNECT_SERVER)
 endif
@@ -173,11 +175,11 @@ promote-docs-in-s3:
 		s3://docs.rstudio.com/rsconnect-python/
 
 
-dev: vetiver/tests/rsconnect_api_keys.json
+dev: vetiver-testing/rsconnect_api_keys.json
 
 dev-start:
 	docker-compose up -d
-	docker-compose exec -T rsconnect bash < script/setup-rsconnect/add-users.sh
+	docker-compose exec -T rsconnect bash < vetiver-testing/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
@@ -187,4 +189,5 @@ dev-stop:
 	rm -f $(RSC_API_KEYS)
 
 $(RSC_API_KEYS): dev-start
-	python script/setup-rsconnect/dump_api_keys.py $@
+	python vetiver-testing/setup-rsconnect/dump_api_keys.py $@
+	

conftest.py

@@ -1,7 +1,22 @@
 import sys
+import pytest
 
 from os.path import abspath, dirname
 
 
 HERE = dirname(abspath(__file__))
 sys.path.insert(0, HERE)
+
+
+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")

docker-compose.yml

@@ -8,8 +8,8 @@ services:
     ports:
       - 3939:3939
     volumes:
-      - $PWD/script/setup-rsconnect/users.txt:/etc/users.txt
-      - $PWD/script/setup-rsconnect/rstudio-connect.gcfg:/etc/rstudio-connect/rstudio-connect.gcfg
+      - $PWD/vetiver-testing/setup-rsconnect/users.txt:/etc/users.txt
+      - $PWD/vetiver-testing/setup-rsconnect/rstudio-connect.gcfg:/etc/rstudio-connect/rstudio-connect.gcfg
     # by default, mysql rounds to 4 decimals, but tests require more precision
     privileged: true
     environment:

tests/test_vetiver_pins.py

@@ -13,7 +13,7 @@
 from rsconnect.api import RSConnectServer, RSConnectClient # noqa
 
 RSC_SERVER_URL = "http://localhost:3939"
-RSC_KEYS_FNAME = "vetiver/tests/rsconnect_api_keys.json"
+RSC_KEYS_FNAME = "vetiver-testing/rsconnect_api_keys.json"
 
 pytestmark = pytest.mark.vetiver  # noqa
 
@@ -85,7 +85,7 @@ def test_deploy(rsc_short):
     rsc_api = list(filter(lambda x: x["title"] == "testapivetiver", dicts))
     content_url = rsc_api[0].get("content_url")
 
-    h = {"Authorization": f'Key {get_key("susan")}'}
+    h = {"Authorization": 'Key {}'.format(get_key("susan"))}
 
     endpoint = vetiver.vetiver_endpoint(content_url + "/predict")
     response = vetiver.predict(endpoint, X_df, headers=h)