Skip to content

Commit

Permalink
Merge pull request #663 from StackStorm/remove_exclude_mistral
Browse files Browse the repository at this point in the history
No-longer need to exclude mistral runner, as it is removed from st2
  • Loading branch information
amanda11 authored Sep 17, 2020
2 parents ded40d8 + 13bfd65 commit ca5d0c9
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions packages/st2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ else
PYTHON_ALT_BINARY := python
endif

# Don't include Mistral runner
# TODO: Go back to all runners when mistral removed from st2
# RUNNERS := $(shell ls ../contrib/runners)
RUNNERS := $(shell ls -I mistral* ../contrib/runners)
RUNNERS := $(shell ls ../contrib/runners)

# Moved from top of file to handle when only py2 or py3 available
ST2PKG_VERSION ?= $(shell $(PYTHON_BINARY) -c "from $(ST2_COMPONENT) import __version__; print(__version__),")
Expand Down Expand Up @@ -114,10 +111,7 @@ populate_version: .stamp-populate_version
touch $@

requirements:
# Don't include Mistral runner for now
# TODO: Use all runners when mistral removed from st2 core
# $(PYTHON_BINARY) ../scripts/fixate-requirements.py -s ../st2*/in-requirements.txt ../contrib/runners/*/in-requirements.txt -f ../fixed-requirements.txt
$(PYTHON_BINARY) ../scripts/fixate-requirements.py --skip=stackstorm-runner-mistral-v2,python-mistralclient -s ../st2*/in-requirements.txt ../contrib/runners/*/in-requirements.txt -f ../fixed-requirements.txt
$(PYTHON_BINARY) ../scripts/fixate-requirements.py -s ../st2*/in-requirements.txt ../contrib/runners/*/in-requirements.txt -f ../fixed-requirements.txt
cat requirements.txt

changelog: populate_version
Expand Down

0 comments on commit ca5d0c9

Please sign in to comment.