serjb9/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Pull requests Activity

Remove neofs-keywords dependency and fix make venv.local-pytest

Browse source 
Signed-off-by: anastasia prasolova <anastasia@nspcc.ru>
This commit is contained in:
anastasia prasolova 2022-11-07 17:38:55 +03:00 committed by Anastasia Prasolova
parent 9650dfb4aa
commit 013cf8fcc8
6 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -17,10 +17,6 @@ venvs:
$(foreach venv,$(VENVS),$(eval $(call VENV_template,$(venv)))) $(foreach venv,$(VENVS),$(eval $(call VENV_template,$(venv))))
submodules:
@git submodule init
@git submodule update --recursive --remote
clean: clean:
rm -rf venv.* rm -rf venv.*

1
neofs-keywords

@ -1 +0,0 @@
Subproject commit 58650099362f05b51b97f04e2244a4ba20f88351

1
requirements.txt
View file

@ -56,6 +56,7 @@ pyparsing==3.0.9
pyrsistent==0.18.1 pyrsistent==0.18.1
pytest==7.1.2 pytest==7.1.2
python-dateutil==2.8.2 python-dateutil==2.8.2
pyyaml==6.0
requests==2.28.0 requests==2.28.0
robotframework==4.1.2 robotframework==4.1.2
s3transfer==0.3.7 s3transfer==0.3.7

2
venv/local-pytest/environment.sh
View file

@ -5,4 +5,4 @@ pushd $DEVENV_PATH > /dev/null
export `make env` export `make env`
popd > /dev/null popd > /dev/null
export PYTHONPATH=${PYTHONPATH}:${VIRTUAL_ENV}/../neofs-keywords/lib:${VIRTUAL_ENV}/../neofs-keywords/robot:${VIRTUAL_ENV}/../robot/resources/lib/:${VIRTUAL_ENV}/../robot/resources/lib/python_keywords:${VIRTUAL_ENV}/../robot/resources/lib/robot:${VIRTUAL_ENV}/../robot/variables:${VIRTUAL_ENV}/../pytest_tests/helpers:${VIRTUAL_ENV}/../pytest_tests/steps export PYTHONPATH=${PYTHONPATH}:${VIRTUAL_ENV}/../robot/resources/lib/:${VIRTUAL_ENV}/../robot/resources/lib/python_keywords:${VIRTUAL_ENV}/../robot/resources/lib/robot:${VIRTUAL_ENV}/../robot/variables:${VIRTUAL_ENV}/../pytest_tests/helpers:${VIRTUAL_ENV}/../pytest_tests/steps

10
venv/local-pytest/requirements.txt
View file

@ -1,10 +0,0 @@
robotframework==4.1.2
requests==2.25.1
pexpect==4.8.0
boto3==1.16.33
docker==4.4.0
botocore==1.19.33
urllib3==1.26.3
base58==2.1.0
allure-pytest==2.9.45
pytest==7.1.2

7
venv_template.mk
View file

@ -1,13 +1,12 @@
define VENV_template define VENV_template
venv.$(1): venv.$(1)/bin/activate venv.$(1)/bin/environment.sh venv.$(1): venv.$(1)/bin/activate venv.$(1)/bin/environment.sh
venv.$(1)/bin/activate: venv/$(1)/requirements.txt submodules venv.$(1)/bin/activate:
@echo "Creating $(1) venv in $$@ from $$<" @echo "Creating $(1) venv in $$@ from $$<"
virtualenv --python=python3.9 --prompt="($(1))" venv.$(1) virtualenv --python=python3.9 --prompt="($(1))" venv.$(1)
source venv.$(1)/bin/activate && \ . venv.$(1)/bin/activate && \
pip3.9 install -U setuptools==56.0.0 && \ pip3.9 install -U setuptools==56.0.0 && \
pip3.9 install -Ur venv/$(1)/requirements.txt && \ pip3.9 install -Ur requirements.txt
pip3.9 install -Ur neofs-keywords/requirements.txt
@echo "Applying activate script patch" @echo "Applying activate script patch"
patch -R --dry-run -p1 -s -f -d venv.$(1)/bin/ < build_assets/activate.patch || \ patch -R --dry-run -p1 -s -f -d venv.$(1)/bin/ < build_assets/activate.patch || \
patch -p1 -d venv.$(1)/bin/ < build_assets/activate.patch patch -p1 -d venv.$(1)/bin/ < build_assets/activate.patch