maint: call docker compose for containers (#216)

* call docker compose for containers * remove griffe pin x2
rstudio · Aug 27, 2024 · eeab40e · eeab40e
1 parent 857298d
commit eeab40e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -23,7 +23,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install -e .[docs]
-          python -m pip install griffe==0.32.3
       - name: Set up Quarto
         uses: quarto-dev/quarto-actions/setup@v2
       - name: build docs

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -60,7 +60,7 @@ jobs:
           echo {{ github.sha }}
       - name: run Connect
         run: |
-          docker-compose up --build -d
+          docker compose up --build -d
           pip freeze > requirements.txt
           make dev
           cat requirements.txt

diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: run Connect
         run: |
-          docker-compose up --build -d
+          docker compose up --build -d
           make dev
         env:
           RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
@@ -86,7 +86,7 @@ jobs:
 
       - name: run Connect
         run: |
-          docker-compose up --build -d
+          docker compose up --build -d
           make dev
         env:
           RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
@@ -133,7 +133,7 @@ jobs:
 
       - name: run Connect
         run: |
-          docker-compose up --build -d
+          docker compose up --build -d
           make dev
         env:
           RSC_LICENSE: ${{ secrets.RSC_LICENSE }}
@@ -168,7 +168,7 @@ jobs:
 
       - name: run Connect
         run: |
-          docker-compose up --build -d
+          docker compose up --build -d
           make dev
         env:
           RSC_LICENSE: ${{ secrets.RSC_LICENSE }}

diff --git a/Makefile b/Makefile
@@ -81,14 +81,14 @@ develop: clean-pyc
 dev: vetiver/tests/rsconnect_api_keys.json
 
 dev-start:
-	docker-compose up -d
-	docker-compose exec -T rsconnect bash < script/setup-rsconnect/add-users.sh
+	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
+	docker compose down
 	rm -f $(RSC_API_KEYS)
 
 typecheck:

diff --git a/setup.cfg b/setup.cfg
@@ -58,7 +58,7 @@ dev =
 
 docs =
     quartodoc
-    griffe==0.32.3
+    griffe
 
 statsmodels =
     statsmodels