Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pip is now in .venv/bin #2771

Merged
merged 3 commits into from
Aug 23, 2024
Merged

pip is now in .venv/bin #2771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1187826
pip is now in .venv/bin
artem-shelkovnikov Aug 23, 2024
8b88838
Also clean .venv
artem-shelkovnikov Aug 23, 2024
1e58b70
Fix bin/python in docker-compose for fixtures
artem-shelkovnikov Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.ftest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Dockerfile.ftest.wolfi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 []
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/box/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/confluence/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/dropbox/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/github/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/google_cloud_storage/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/google_drive/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/graphql/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/jira/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/microsoft_teams/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/notion/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/onedrive/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/salesforce/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/servicenow/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/sharepoint_online/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/sharepoint_server/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tests/sources/fixtures/zoom/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading