merge conflicts

Author: isabelizimm

.github/workflows/tests.yml

@@ -78,24 +78,13 @@ jobs:
             python-version: 3.8
         - name: Install dependencies
           run: |
-<<<<<<< HEAD
-=======
             python -m pip install --upgrade pip
->>>>>>> aa70c3e (always install latest vetiver in docker)
             python -m pip install ".[dev]"
             python -m pip install --upgrade git+https://github.com/rstudio/vetiver-python@${{ github.sha }}
         - name: run Docker
           run: |
             python script/setup-docker/docker.py
-<<<<<<< HEAD
-<<<<<<< HEAD
             pip freeze > vetiver_requirements.txt
-=======
-            pip freeze > requirements.txt
->>>>>>> aa70c3e (always install latest vetiver in docker)
-=======
-            pip freeze > vetiver_requirements.txt
->>>>>>> 3edaa19 (refactoring docker test again)
             docker build -t mock .
             docker run -d -v $PWD/pinsboard:/vetiver/pinsboard -p 8080:8080 mock
             sleep 5

vetiver/pin_read_write.py

@@ -51,42 +51,28 @@ def vetiver_pin_write(board, model: VetiverModel, versioned: bool = True):
         "reporting. \n Use the vetiver `.qmd` Quarto template as a place to start, \n "
         "with vetiver.model_card()",
     )
-<<<<<<< HEAD
 
     # convert older model's ptype to prototype
     if hasattr(model, "ptype"):
         model.prototype = model.ptype
-=======
     # metadata is dict
     if isinstance(model.metadata, dict):
         model.metadata = VetiverMeta.from_dict(model.metadata)
->>>>>>> bfe7205 (coerce VetiverMeta rather than try/except)
 
     board.pin_write(
         model.model,
         name=model.model_name,
         type="joblib",
         description=model.description,
         metadata={
-<<<<<<< HEAD
-            "user": model.metadata.get("user"),
-            "vetiver_meta": {
-                "required_pkgs": model.metadata.get("required_pkgs"),
-                "prototype": None if model.prototype is None else model.prototype().json(),
-            },
-            versioned=versioned,
-        )
-    # metadata is VetiverMeta
-=======
             "user": model.metadata.user,
             "vetiver_meta": {
                 "required_pkgs": model.metadata.required_pkgs,
-                "ptype": None if model.ptype is None else model.ptype().json(),
+                "ptype": None if model.prototype is None else model.prototype().json(),
             },
         },
         versioned=versioned,
     )
->>>>>>> bfe7205 (coerce VetiverMeta rather than try/except)
 
 
 def vetiver_pin_read(board, name: str, version: str = None) -> VetiverModel:

vetiver/tests/test_xgboost.py

@@ -44,16 +44,13 @@ def vetiver_client_check_ptype_false(xgb_model):  # With check_prototype=True
 
     return client
 
-<<<<<<< HEAD
-=======
 
 def test_model(xgb_model):
     v = xgb_model
 
     assert v.metadata.required_pkgs == ["xgboost"]
     assert not v.metadata.user
 
->>>>>>> 38a4b80 (use dataclass rather than dict)
 
 def test_vetiver_build(vetiver_client):
     data = mtcars.head(1).drop(columns="mpg")