Skip to content

Commit

Permalink
Moving around dependancies and making scripts better.
Browse files Browse the repository at this point in the history
  • Loading branch information
bishopbm1 committed Aug 7, 2023
1 parent 4b9d22a commit c1fe308
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ PY_FILES := $(shell git ls-files '*.py')
ROOT_VIRTUALENV ?= ""

### python 2/3 specific stuff
PYTHON_EXE ?= python3

#PYTHON_EXE ?= python3
PYTHON_EXE ?= $(shell if python3.8 --version >/dev/null 2>&1; then echo "python3.8"; else echo "python3"; fi)
PYTHON_VERSION = $(shell $(PYTHON_EXE) --version 2>&1 | awk '{ print $$2 }')
PYTHON_NAME = python$(PYTHON_VERSION)
PYTHON_CI_DIR = $(ROOT_DIR)/$(PYTHON_NAME)
Expand Down Expand Up @@ -255,9 +257,11 @@ test: packs-tests
. $(VIRTUALENV_DIR)/bin/activate; \
if [ ! -f "$(CI_DIR)/st2-requirements-installed.txt" ]; then \
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(ST2_REPO_PATH)/requirements.txt; \
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(PACK_DIR)requirements.txt; \
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(PACK_DIR)requirements-tests.txt; \
touch $(CI_DIR)/st2-requirements-installed.txt; \
fi; \
ST2_REPO_PATH=${ST2_REPO_PATH} $(ST2_REPO_PATH)/st2common/bin/st2-run-pack-tests -c -t -x -j -v -p $(PACK_DIR) || exit 1;
ST2_REPO_PATH=${ST2_REPO_PATH} $(ST2_REPO_PATH)/st2common/bin/st2-run-pack-tests -c -t -x -j -p $(PACK_DIR) || exit 1;
@echo "End Time = `date --iso-8601=ns`"

.PHONY: .packs-missing-tests
Expand Down Expand Up @@ -307,8 +311,6 @@ requirements:
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache --upgrade "pip"; \
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/requirements-dev.txt; \
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(CI_DIR)/requirements-pack-tests.txt; \
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(PACK_DIR)requirements.txt; \
$(VIRTUALENV_DIR)/bin/pip install --cache-dir $(HOME)/.pip-cache -q -r $(PACK_DIR)requirements-tests.txt; \
touch $(CI_DIR)/requirements-installed.txt; \
fi;
@echo "End Time = `date --iso-8601=ns`"
Expand Down
3 changes: 0 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ flake8==3.7.7
astroid
pylint
isort
importlib-metadata==4.13.0
typing_extensions==4.7.1
prompt-toolkit==3.0.39

0 comments on commit c1fe308

Please sign in to comment.