Skip to content

Commit 85386ff

Browse files
nzloshnzlosh
committed
Replace setup.py with pip to install in editable mode.
1 parent 7d20478 commit 85386ff

1 file changed

Lines changed: 21 additions & 20 deletions

File tree

‎Makefile‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ install-runners:
174174
@echo "================== INSTALL RUNNERS ===================="
175175
@echo ""
176176
# NOTE: We use xargs to speed things up by installing runners in parallel
177-
echo -e "$(COMPONENTS_RUNNERS)" | tr -d "\n" | xargs -P $(XARGS_CONCURRENCY) -d " " -n1 -i sh -c ". $(VIRTUALENV_DIR)/bin/activate; cd $$(pwd)/{} ; python setup.py develop --no-deps"
177+
echo -e "$(COMPONENTS_RUNNERS)" | tr -d "\n" | xargs -P $(XARGS_CONCURRENCY) -d " " -n1 -i sh -c ". $(VIRTUALENV_DIR)/bin/activate; cd $$(pwd)/{} ; python -m pip install --editable . --no-deps"
178178
#@for component in $(COMPONENTS_RUNNERS); do \
179179
# echo "==========================================================="; \
180180
# echo "Installing runner:" $$component; \
181181
# echo "==========================================================="; \
182-
# #(. $(VIRTUALENV_DIR)/bin/activate; cd $$component; python setup.py develop --no-deps); \
182+
# #(. $(VIRTUALENV_DIR)/bin/activate; cd $$component; python -m pip install --editable . --no-deps); \
183183
#done
184184

185185
.PHONY: install-mock-runners
@@ -188,12 +188,12 @@ install-mock-runners:
188188
@echo "================== INSTALL MOCK RUNNERS ===================="
189189
@echo ""
190190
# NOTE: We use xargs to speed things up by installing runners in parallel
191-
echo -e "$(MOCK_RUNNERS)" | tr -d "\n" | xargs -P $(XARGS_CONCURRENCY) -d " " -n1 -i sh -c ". $(VIRTUALENV_DIR)/bin/activate; cd $$(pwd)/{} ; python setup.py develop --no-deps"
191+
echo -e "$(MOCK_RUNNERS)" | tr -d "\n" | xargs -P $(XARGS_CONCURRENCY) -d " " -n1 -i sh -c ". $(VIRTUALENV_DIR)/bin/activate; cd $$(pwd)/{} ; python -m pip install --editable . --no-deps"
192192
#@for component in $(MOCK_RUNNERS); do \
193193
# echo "==========================================================="; \
194194
# echo "Installing mock runner:" $$component; \
195195
# echo "==========================================================="; \
196-
# (. $(VIRTUALENV_DIR)/bin/activate; cd $$component; python setup.py develop --no-deps); \
196+
# (. $(VIRTUALENV_DIR)/bin/activate; cd $$component; python -m pip install --editable . --no-deps); \
197197
#done
198198

199199
.PHONY: check-requirements
@@ -276,7 +276,7 @@ check-python-packages-nightly:
276276
echo "==========================================================="; \
277277
(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python setup.py --version) || exit 1; \
278278
(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python setup.py sdist bdist_wheel) || exit 1; \
279-
(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python setup.py develop --no-deps) || exit 1; \
279+
(set -e; cd $$component; ../$(VIRTUALENV_COMPONENTS_DIR)/bin/python -m pip install --editable . --no-deps) || exit 1; \
280280
($(VIRTUALENV_COMPONENTS_DIR)/bin/python -c "import $$component") || exit 1; \
281281
(set -e; cd $$component; rm -rf dist/; rm -rf $$component.egg-info) || exit 1; \
282282
done
@@ -505,9 +505,9 @@ flake8: requirements .flake8
505505
touch $(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/activate
506506
chmod +x $(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/activate
507507

508-
$(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
509-
$(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/pip install --upgrade "readme_renderer"
510-
$(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/pip install --upgrade "restructuredtext-lint"
508+
$(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/python -m pip install --upgrade "pip==$(PIP_VERSION)"
509+
$(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/python -m pip install --upgrade "readme_renderer"
510+
$(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/python -m pip install --upgrade "restructuredtext-lint"
511511

512512
# Check with readme-renderer
513513
. $(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_PYPI_DIR)/bin/python -m readme_renderer README.rst
@@ -534,10 +534,10 @@ flake8: requirements .flake8
534534
touch $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
535535
chmod +x $(VIRTUALENV_ST2CLIENT_DIR)/bin/activate
536536

537-
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
538-
$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install --upgrade "setuptools==$(SETUPTOOLS_VERSION)"
537+
$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -m pip install --upgrade "pip==$(PIP_VERSION)"
538+
$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -m pip install --upgrade "setuptools==$(SETUPTOOLS_VERSION)"
539539

540-
$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/pip install . ; cd ..
540+
$(VIRTUALENV_ST2CLIENT_DIR)/bin/activate; cd st2client ; ../$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -m pip install . ; cd ..
541541
$(VIRTUALENV_ST2CLIENT_DIR)/bin/st2 --version
542542
$(VIRTUALENV_ST2CLIENT_DIR)/bin/python -c "import st2client"
543543

@@ -661,7 +661,7 @@ distclean: clean
661661

662662
.PHONY: .requirements
663663
.requirements: virtualenv
664-
$(VIRTUALENV_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
664+
$(VIRTUALENV_DIR)/bin/python -m pip install --upgrade "pip==$(PIP_VERSION)"
665665
# Print out pip version
666666
$(VIRTUALENV_DIR)/bin/pip --version
667667
# Generate all requirements to support current CI pipeline.
@@ -694,32 +694,33 @@ requirements: virtualenv .requirements .sdist-requirements install-runners insta
694694

695695
# Note: Use the verison of virtualenv pinned in fixed-requirements.txt so we
696696
# only have to update it one place when we change the version
697-
$(VIRTUALENV_DIR)/bin/pip install --upgrade $(shell grep "^virtualenv" fixed-requirements.txt)
698-
$(VIRTUALENV_DIR)/bin/pip install --upgrade "setuptools==$(SETUPTOOLS_VERSION)" # workaround for pbr issue
697+
# virtualenv is deprecated, use python -m venv
698+
#$(VIRTUALENV_DIR)/bin/python -m pip install --upgrade $(shell grep "^virtualenv" fixed-requirements.txt)
699+
$(VIRTUALENV_DIR)/bin/python -m pip install --upgrade "setuptools==$(SETUPTOOLS_VERSION)" # workaround for pbr issue
699700

700701
# Install requirements
701702
for req in $(REQUIREMENTS); do \
702703
echo "Installing $$req..." ; \
703-
$(VIRTUALENV_DIR)/bin/pip install $(PIP_OPTIONS) -r $$req ; \
704+
$(VIRTUALENV_DIR)/bin/python -m pip install $(PIP_OPTIONS) -r $$req ; \
704705
done
705706

706707
# Install st2common package to load drivers defined in st2common setup.py
707708
# NOTE: We pass --no-deps to the script so we don't install all the
708709
# package dependencies which are already installed as part of "requirements"
709710
# make targets. This speeds up the build
710-
(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps)
711+
(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python -m pip install --editable . --no-deps)
711712

712713
# Install st2common to register metrics drivers
713714
# NOTE: We pass --no-deps to the script so we don't install all the
714715
# package dependencies which are already installed as part of "requirements"
715716
# make targets. This speeds up the build
716-
(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps)
717+
(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python -m pip install --editable . --no-deps)
717718

718719
# Install st2auth to register SSO drivers
719720
# NOTE: We pass --no-deps to the script so we don't install all the
720721
# package dependencies which are already installed as part of "requirements"
721722
# make targets. This speeds up the build
722-
(cd ${ROOT_DIR}/st2auth; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps)
723+
(cd ${ROOT_DIR}/st2auth; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python -m pip install --editable . --no-deps)
723724

724725
# Some of the tests rely on submodule so we need to make sure submodules are check out
725726
git submodule update --init --recursive --remote
@@ -1058,7 +1059,7 @@ packs-tests: requirements .packs-tests
10581059
@echo "==================== packs-tests ===================="
10591060
@echo
10601061
# Install st2common to register metrics drivers
1061-
(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python setup.py develop --no-deps)
1062+
(cd ${ROOT_DIR}/st2common; ${ROOT_DIR}/$(VIRTUALENV_DIR)/bin/python -m pip install --editable . --no-deps)
10621063
. $(VIRTUALENV_DIR)/bin/activate; find ${ROOT_DIR}/contrib/* -maxdepth 0 -type d -print0 | xargs -0 -I FILENAME ./st2common/bin/st2-run-pack-tests -c -t -x -p FILENAME
10631064

10641065

@@ -1122,7 +1123,7 @@ cli:
11221123
@echo
11231124
@echo "=================== Building st2 client ==================="
11241125
@echo
1125-
pushd $(CURDIR) && cd st2client && ((python setup.py develop || printf "\n\n!!! ERROR: BUILD FAILED !!!\n") || popd)
1126+
pushd $(CURDIR) && cd st2client && ((python -m pip install --editable . || printf "\n\n!!! ERROR: BUILD FAILED !!!\n") || popd)
11261127

11271128
.PHONY: rpms
11281129
rpms:

0 commit comments

Comments
 (0)