From 013cf8fcc882e4ab92a6751a029c56bf4c093a07 Mon Sep 17 00:00:00 2001 From: anastasia prasolova Date: Mon, 7 Nov 2022 17:38:55 +0300 Subject: [PATCH] Remove `neofs-keywords` dependency and fix `make venv.local-pytest` Signed-off-by: anastasia prasolova --- Makefile | 4 ---- neofs-keywords | 1 - requirements.txt | 1 + venv/local-pytest/environment.sh | 2 +- venv/local-pytest/requirements.txt | 10 ---------- venv_template.mk | 7 +++---- 6 files changed, 5 insertions(+), 20 deletions(-) delete mode 160000 neofs-keywords delete mode 100644 venv/local-pytest/requirements.txt diff --git a/Makefile b/Makefile index a07557a9..db276b74 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,6 @@ venvs: $(foreach venv,$(VENVS),$(eval $(call VENV_template,$(venv)))) -submodules: - @git submodule init - @git submodule update --recursive --remote - clean: rm -rf venv.* diff --git a/neofs-keywords b/neofs-keywords deleted file mode 160000 index 58650099..00000000 --- a/neofs-keywords +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58650099362f05b51b97f04e2244a4ba20f88351 diff --git a/requirements.txt b/requirements.txt index 2bcf6c2e..8189397f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,6 +56,7 @@ pyparsing==3.0.9 pyrsistent==0.18.1 pytest==7.1.2 python-dateutil==2.8.2 +pyyaml==6.0 requests==2.28.0 robotframework==4.1.2 s3transfer==0.3.7 diff --git a/venv/local-pytest/environment.sh b/venv/local-pytest/environment.sh index 2db199d7..702c3588 100644 --- a/venv/local-pytest/environment.sh +++ b/venv/local-pytest/environment.sh @@ -5,4 +5,4 @@ pushd $DEVENV_PATH > /dev/null export `make env` 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 diff --git a/venv/local-pytest/requirements.txt b/venv/local-pytest/requirements.txt deleted file mode 100644 index 947e5fe9..00000000 --- a/venv/local-pytest/requirements.txt +++ /dev/null @@ -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 diff --git a/venv_template.mk b/venv_template.mk index af49998b..033d0ef3 100644 --- a/venv_template.mk +++ b/venv_template.mk @@ -1,13 +1,12 @@ define VENV_template 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 $$<" 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 -Ur venv/$(1)/requirements.txt && \ - pip3.9 install -Ur neofs-keywords/requirements.txt + pip3.9 install -Ur requirements.txt @echo "Applying activate script 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