Skip to content

Commit da0e9ad

Browse files
committed
always install latest vetiver in docker
1 parent f49cb35 commit da0e9ad

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

.github/workflows/tests.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,20 @@ jobs:
7878
python-version: 3.8
7979
- name: Install dependencies
8080
run: |
81+
<<<<<<< HEAD
82+
=======
83+
python -m pip install --upgrade pip
84+
>>>>>>> aa70c3e (always install latest vetiver in docker)
8185
python -m pip install ".[dev]"
8286
python -m pip install --upgrade git+https://github.com/rstudio/vetiver-python@${{ github.sha }}
8387
- name: run Docker
8488
run: |
8589
python script/setup-docker/docker.py
90+
<<<<<<< HEAD
8691
pip freeze > vetiver_requirements.txt
92+
=======
93+
pip freeze > requirements.txt
94+
>>>>>>> aa70c3e (always install latest vetiver in docker)
8795
docker build -t mock .
8896
docker run -d -v $PWD/pinsboard:/vetiver/pinsboard -p 8080:8080 mock
8997
sleep 5

script/setup-docker/docker.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
vetiver.vetiver_pin_write(board, v)
1515
<<<<<<< HEAD
16+
<<<<<<< HEAD
1617

1718
vetiver.prepare_docker(board, "mymodel")
1819
=======
@@ -21,6 +22,9 @@
2122
packages=["git+https://github.com/rstudio/vetiver-python@metadata"],
2223
path="vetiver_",
2324
)
25+
=======
26+
vetiver.load_pkgs(v, path="vetiver_")
27+
>>>>>>> aa70c3e (always install latest vetiver in docker)
2428
vetiver.write_app(board, "mymodel")
2529
vetiver.write_docker()
2630
>>>>>>> 875faf2 (install into docker from branch)

0 commit comments

Comments
 (0)