Skip to content

Commit

Permalink
Added missing dependency to minimum-constraints.txt
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Maier <[email protected]>
  • Loading branch information
andy-maier committed May 5, 2024
1 parent 506bc3e commit 062f3d5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -347,29 +347,29 @@ _check_installed:
$(PYTHON_CMD) -c "import $(package_name)"
@echo "Makefile: Done verifying installation of package $(package_name)"

$(done_dir)/pip_upgrade_$(pymn)_$(PACKAGE_LEVEL).done: Makefile
$(done_dir)/pip_upgrade_$(pymn)_$(PACKAGE_LEVEL).done: Makefile minimum-constraints.txt
@echo "Makefile: Installing/upgrading Pip (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
bash -c 'pv=$$($(PIP_CMD) --version); if [[ $$pv =~ (^pip [1-8]\..*) ]]; then $(PYTHON_CMD) -m pip $(pip_opts) install pip==9.0.1; fi'
$(PYTHON_CMD) -m pip $(pip_opts) install $(pip_level_opts) pip
echo "done" >$@
@echo "Makefile: Done installing/upgrading Pip"

$(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/pip_upgrade_$(pymn)_$(PACKAGE_LEVEL).done
$(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/pip_upgrade_$(pymn)_$(PACKAGE_LEVEL).done minimum-constraints.txt
@echo "Makefile: Installing/upgrading basic Python packages (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
$(PIP_CMD_MOD) $(pip_opts) install $(pip_level_opts) setuptools wheel
echo "done" >$@
@echo "Makefile: Done installing/upgrading basic Python packages"

$(done_dir)/install_reqs_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done requirements.txt
$(done_dir)/install_reqs_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done requirements.txt minimum-constraints.txt
@echo "Makefile: Installing Python installation prerequisites (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
$(PIP_CMD_MOD) $(pip_opts) install $(pip_level_opts) -r requirements.txt
echo "done" >$@
@echo "Makefile: Done installing Python installation prerequisites"

$(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done dev-requirements.txt test-requirements.txt
$(done_dir)/develop_reqs_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/install_basic_$(pymn)_$(PACKAGE_LEVEL).done dev-requirements.txt test-requirements.txt minimum-constraints.txt
@echo "Makefile: Installing development requirements (with PACKAGE_LEVEL=$(PACKAGE_LEVEL))"
-$(call RM_FUNC,$@)
$(PIP_CMD_MOD) $(pip_opts) install $(pip_level_opts) -r dev-requirements.txt
Expand Down
3 changes: 3 additions & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ Released: not yet
* Docs: Converted README file from RST to MarkDown to fix badge alignment issue
(issue #172)

* Dev: Added missing dependency to minimum-constraints.txt to several make
targets that used it with PACKAGE_LEVEL=minimum.

**Enhancements:**

* Improvements for safety check tool: Made passing the safety check mandatory;
Expand Down

0 comments on commit 062f3d5

Please sign in to comment.