8000 Feature/add possibility to overwrite the name of venv by zhukovgreen · Pull Request #675 · oamg/leapp · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Feature/add possibility to overwrite the name of venv #675

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

Merged
merged 2 commits into from
Nov 2, 2020
Merged

Feature/add possibility to overwrite the name of venv #675

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ad6572
Allow to overwrite the default python version
zhukovgreen Nov 2, 2020
6f63345
Add a possibility to overwrite the name of venv
zhukovgreen Nov 2, 2020
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
12 changes: 7 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
PYTHON_VENV ?= python
VENVNAME ?= tut
CONFDIR=${DESTDIR}/etc/leapp
LIBDIR=${DESTDIR}/var/lib/leapp

Expand Down Expand Up @@ -109,7 +111,7 @@ install:
install -m 0744 etc/leapp/leapp.conf ${CONFDIR}
install -m 0744 etc/leapp/logger.conf ${CONFDIR}
install -dm 0755 ${LIBDIR}
umask 177 && python -c "import sqlite3; sqlite3.connect('${LIBDIR}/audit.db').executescript(open('res/audit-layout.sql', 'r').read())"
umask 177 && $(PYTHON_VENV) -c "import sqlite3; sqlite3.connect('${LIBDIR}/audit.db').executescript(open('res/audit-layout.sql', 'r').read())"

install-container-test:
docker pull ${CONTAINER}
Expand All @@ -119,8 +121,8 @@ install-test:
ifeq ($(shell id -u), 0)
pip install -r requirements-tests.txt
else
virtualenv --python /usr/bin/python tut
. tut/bin/activate ; \
virtualenv --python $(PYTHON_VENV) $(VENVNAME)
. $(VENVNAME)/bin/activate ; \
pip install -r requirements-tests.txt
endif

Expand All @@ -131,7 +133,7 @@ test: lint
ifeq ($(shell id -u), 0)
pytest -vv --cov-report term-missing --cov=leapp tests/scripts
else
. tut/bin/activate ; \
. $(VENVNAME)/bin/activate ; \
pytest -vv --cov-report term-missing --cov=leapp tests/scripts
endif

Expand All @@ -140,7 +142,7 @@ ifeq ($(shell id -u), 0)
pytest --cache-clear --pylint -m pylint leapp tests/scripts/*.py; \
pytest --cache-clear --flake8 -m flake8 leapp tests/scripts/*.py
else
. tut/bin/activate ; \
. $(VENVNAME)/bin/activate ; \
pytest --cache-clear --pylint -m pylint leapp tests/scripts/*.py; \
pytest --cache-clear --flake8 -m flake8 leapp tests/scripts/*.py
endif
Expand Down
0