Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pip install path remap #866

Merged
merged 8 commits into from
Mar 31, 2020
Merged

pip install path remap #866

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0b55484
Fixed not formatted error message
j0yu Mar 15, 2020
30ccc9d
New pip_src_remaps config
j0yu Mar 22, 2020
246aaf6
Now pip_install_remaps using PipInstallRemaps
j0yu Mar 22, 2020
73154b5
Untested new get_mapping
j0yu Mar 22, 2020
bbccfd0
Better error messages with try-this
j0yu Mar 22, 2020
a312f5f
Fixed errors
j0yu Mar 22, 2020
87d2ad6
Fixed escaping issues
j0yu Mar 22, 2020
d6053ec
Ensure error message triggers in Py3
j0yu Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Better error messages with try-this
  • Loading branch information
@j0yu
j0yu committed Mar 22, 2020
commit bbccfd0bd520501d3057f5a101fee5d6803b4ad4
33 changes: 30 additions & 3 deletions src/rez/pip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
from rez.utils.execution import Popen
from rez.utils.pip import get_rez_requirements, pip_to_rez_package_name, \
pip_to_rez_version
from rez.utils.logging_ import print_debug, print_info, print_warning
from rez.utils.logging_ import print_debug, print_info, print_error, \
print_warning
from rez.exceptions import BuildError, PackageFamilyNotFoundError, \
PackageNotFoundError, RezSystemError, convert_errors
from rez.package_maker import make_package
Expand All @@ -27,6 +28,7 @@
import subprocess
import sys
from tempfile import mkdtemp
from textwrap import dedent


class InstallMode(Enum):
Expand Down Expand Up @@ -421,10 +423,35 @@ def get_mapping(rel_src):
rez_subpath = re.sub(path, remap['rez_install'], rel_src)
return (pip_subpath, rez_subpath)

tokenised_path = rel_src.replace(os.sep, '{pardir}')
tokenised_path = tokenised_path.replace(os.pardir, '{sep}')
info_dir = '{0.name}-{0.version}.dist-info{1}'.format(distribution)
try_this_message = r"""
Unknown source file in {0}RECORD! '{1}'
To resolve, try:
1. Manually install the pip package using 'pip install --target'
to a temporary location.
2. See where '{1}'
actually got installed to by pip, RELATIVE to --target location
3. Create a new rule to 'pip_install_remaps' configuration like:

{
"record_path": "{2}",
"pip_install": "<RELATIVE path pip installed to in 2.>",
"rez_install": "<DESTINATION sub-path in rez package>",
}

4. Try rez-pip install again.

If path remapping is not enough, consider submitting a new issue
via https://github.com/nerdvegas/rez/issues/new
""".format(info_dir, rel_src, tokenised_path)

map(print_error, dedent(try_this_message).splitlines())
raise IOError(
89, # errno.EDESTADDRREQ : Destination address required
"Don't know what to do with source file, please add a custom "
"rule to 'pip_install_remaps' configuration for record_path",
"Don't know what to do with source file in {0}RECORD, see "
"above error message for path".format(info_dir),
rel_src,
)

Expand Down