Skip to content

Commit

Permalink
Do not use disabled --install-scripts command of pip
Browse files Browse the repository at this point in the history
This command will raise an error from pip 20.2.2.

pypa/pip#7309

Without this command we can't call coverage3 directly so we had to change our
Makefile a bit.
  • Loading branch information
jkonecny12 committed Aug 18, 2020
1 parent 179cd07 commit f2e13c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ RC_RELEASE ?= $(shell date -u +0.1.%Y%m%d%H%M%S)
MOCKCHROOT ?= fedora-$(DIST_NAME)-$(ARCH_NAME)
MOCK_EXTRA_ARGS ?=

COVERAGE ?= coverage3
PYTHON ?= python3
COVERAGE ?= $(PYTHON) -m coverage
USER_SITE_BASE ?= $(abs_top_builddir)/python-site
USER_SITE_PACKAGES ?= $(shell PYTHONUSERBASE=$(USER_SITE_BASE) $(PYTHON) -m site --user-site)

Expand All @@ -83,7 +84,7 @@ SKIP_BRANCHING_CHECK ?= "false"
dist-hook:
for p in $(distdir)/po/*.po ; do \
if [ -e "$$p" ]; then \
PYTHONPATH=$(srcdir)/translation-canary python3 -m translation_canary.translated \
PYTHONPATH=$(srcdir)/translation-canary $(PYTHON) -m translation_canary.translated \
--release $(distdir)/po ; \
fi ; \
break ; \
Expand Down
2 changes: 1 addition & 1 deletion scripts/testing/setup-mock-test-env.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def install_pip_packages_to_mock(mock_command, packages):

cmd = _run_cmd_in_chroot(cmd)
cmd.append(
'python3 -m pip install --install-option="--install-scripts=/usr/bin" {}'.format(packages)
'python3 -m pip install {}'.format(packages)
)

_check_subprocess(cmd, "Can't install packages via pip to mock.")
Expand Down

0 comments on commit f2e13c9

Please sign in to comment.