pip is now in .venv/bin (#2771)

elastic · Aug 23, 2024 · e9b5e56 · e9b5e56
1 parent ec71495
commit e9b5e56
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/Dockerfile.ftest b/Dockerfile.ftest
@@ -4,4 +4,4 @@ RUN apt update && apt upgrade && apt install make -y
 COPY . /app
 WORKDIR /app
 RUN make clean install
-RUN bin/pip install -r requirements/ftest.txt
+RUN .venv/bin/pip install -r requirements/ftest.txt
diff --git a/Dockerfile.ftest.wolfi b/Dockerfile.ftest.wolfi
@@ -3,5 +3,5 @@ USER root
 COPY . /connectors
 WORKDIR /connectors
 RUN make clean install
-RUN bin/pip install -r requirements/ftest.txt
+RUN .venv/bin/pip install -r requirements/ftest.txt
 ENTRYPOINT []
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ install: .venv/bin/python .venv/bin/pip-licenses .venv/bin/elastic-ingest
 	.venv/bin/pip install -r requirements/ftest.txt
 
 clean:
-	rm -rf bin lib venv include elasticsearch_connector.egg-info .coverage site-packages pyvenv.cfg include.site.python*.greenlet dist
+	rm -rf bin lib .venv include elasticsearch_connector.egg-info .coverage site-packages pyvenv.cfg include.site.python*.greenlet dist
 
 lint: .venv/bin/python .venv/bin/black .venv/bin/elastic-ingest
 	.venv/bin/black --check connectors

diff --git a/tests/sources/fixtures/box/docker-compose.yml b/tests/sources/fixtures/box/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/box/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/box/fixture.py
     ports:
       - "9092:9092"
     volumes:

diff --git a/tests/sources/fixtures/confluence/docker-compose.yml b/tests/sources/fixtures/confluence/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/confluence/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/confluence/fixture.py
     ports:
       - "9696:9696"
     volumes:

diff --git a/tests/sources/fixtures/dropbox/docker-compose.yml b/tests/sources/fixtures/dropbox/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/dropbox/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/dropbox/fixture.py
     ports:
       - "8085:8085"
     volumes:

diff --git a/tests/sources/fixtures/github/docker-compose.yml b/tests/sources/fixtures/github/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/github/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/github/fixture.py
     ports:
       - "9091:9091"
     volumes:

diff --git a/tests/sources/fixtures/google_cloud_storage/docker-compose.yml b/tests/sources/fixtures/google_cloud_storage/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/google_cloud_storage/mocker.py
+    command: .venv/bin/python tests/sources/fixtures/google_cloud_storage/mocker.py
     ports:
       - "4444:4444"
     volumes:

diff --git a/tests/sources/fixtures/google_drive/docker-compose.yml b/tests/sources/fixtures/google_drive/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/google_drive/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/google_drive/fixture.py
     ports:
       - "10339:10339"
     volumes:

diff --git a/tests/sources/fixtures/graphql/docker-compose.yml b/tests/sources/fixtures/graphql/docker-compose.yml
@@ -47,7 +47,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/graphql/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/graphql/fixture.py
     ports:
       - "9094:9094"
     volumes:

diff --git a/tests/sources/fixtures/jira/docker-compose.yml b/tests/sources/fixtures/jira/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/jira/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/jira/fixture.py
     ports:
       - "8080:8080"
     volumes:

diff --git a/tests/sources/fixtures/microsoft_teams/docker-compose.yml b/tests/sources/fixtures/microsoft_teams/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/microsoft_teams/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/microsoft_teams/fixture.py
     ports:
       - 10971:10971
     volumes:

diff --git a/tests/sources/fixtures/notion/docker-compose.yml b/tests/sources/fixtures/notion/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/notion/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/notion/fixture.py
     ports:
       - "9096:9096"
     volumes:

diff --git a/tests/sources/fixtures/onedrive/docker-compose.yml b/tests/sources/fixtures/onedrive/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/onedrive/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/onedrive/fixture.py
     ports:
       - 10972:10972
     volumes:

diff --git a/tests/sources/fixtures/salesforce/docker-compose.yml b/tests/sources/fixtures/salesforce/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build:
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/salesforce/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/salesforce/fixture.py
     ports:
       - "10338:10338"
     volumes:

diff --git a/tests/sources/fixtures/servicenow/docker-compose.yml b/tests/sources/fixtures/servicenow/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/servicenow/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/servicenow/fixture.py
     ports:
       - "9318:9318"
     volumes:

diff --git a/tests/sources/fixtures/sharepoint_online/docker-compose.yml b/tests/sources/fixtures/sharepoint_online/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/sharepoint_online/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/sharepoint_online/fixture.py
     ports:
       - 10337:10337
     volumes:

diff --git a/tests/sources/fixtures/sharepoint_server/docker-compose.yml b/tests/sources/fixtures/sharepoint_server/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/sharepoint_server/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/sharepoint_server/fixture.py
     ports:
       - "8491:8491"
     volumes:

diff --git a/tests/sources/fixtures/zoom/docker-compose.yml b/tests/sources/fixtures/zoom/docker-compose.yml
@@ -77,7 +77,7 @@ services:
     build: 
       context: ../../../../
       dockerfile: ${DOCKERFILE_FTEST_PATH}
-    command: bin/python tests/sources/fixtures/zoom/fixture.py
+    command: .venv/bin/python tests/sources/fixtures/zoom/fixture.py
     ports:
       - 10971:10971
     volumes: