Skip to content

Install custom fork of python-humanfriendly #518

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

Closed
jacobperron wants to merge 4 commits into from
Closed

Install custom fork of python-humanfriendly #518

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d7dc53
Install custom fork of python-humanfriendly
jacobperron Oct 2, 2020
3ba273d
Uninstall pyreadline to avoid deprecation warnings
jacobperron Oct 5, 2020
c39215d
Defer uninstall of pyreadline until after mixin install
jacobperron Oct 5, 2020
7db65d2
Defer uninstall of pyreadline until just before build
jacobperron Oct 5, 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
12 changes: 12 additions & 0 deletions ros2_batch_job/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,12 @@ def run(args, build_function, blacklisted_package_names=None):
# Install pip dependencies
pip_packages = list(pip_dependencies)
if sys.platform == 'win32':
# Install custom fork of python-humanfriendly
# TODO(jacobperron): Remove this once the issue is resolved upstream
# https://github.com/xolox/python-humanfriendly/pull/45
pip_packages += [
'git+https://github.com/dirk-thomas/python-humanfriendly@dirk-thomas/skip-pyreadline-py39',
]
if args.cmake_build_type == 'Debug':
if args.ros_distro in ['dashing', 'eloquent']:
pip_packages += [
Expand Down Expand Up @@ -743,6 +749,12 @@ def run(args, build_function, blacklisted_package_names=None):
pass
print('# END SUBSECTION')

# Workaround for Python version <= 3.8 to avoid deprecation warnings
# pyreadline does not support Python 3.9
# TODO(jacobperron): Remove when Windows switches to Python 3.9
if sys.platform == 'win32':
job.run(['"%s"' % job.python, '-m', 'pip', 'uninstall', '-y', 'pyreadline'], shell=True)

rc = build_function(args, job)

job.post()
Expand Down