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.

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

pin cryptography version 3.0 #506

Merged
merged 1 commit into from
Aug 27, 2020
Merged
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions ros2_batch_job/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@
'pyyaml',
'vcstool',
]
# https://github.com/pyca/cryptography/issues/5433
pip_cryptography_version = '==3.0'
if sys.platform in ('darwin'):
pip_dependencies += [
'cryptography',
f'cryptography{pip_cryptography_version}',
'lxml',
'netifaces'
]
Expand Down Expand Up @@ -534,7 +536,7 @@ def run(args, build_function, blacklisted_package_names=None):
]
else:
pip_packages += [
'cryptography',
f'cryptography{pip_cryptography_version}',
'lxml',
'netifaces',
'numpy',
Expand All @@ -548,7 +550,7 @@ def run(args, build_function, blacklisted_package_names=None):
# to ensure that the build type specific package is installed
job.run(
['"%s"' % job.python, '-m', 'pip', 'uninstall', '-y'] +
['cryptography', 'lxml', 'numpy'], shell=True)
[f'cryptography{pip_cryptography_version}', 'lxml', 'numpy'], shell=True)
pip_cmd = ['"%s"' % job.python, '-m', 'pip', 'install', '-U']
if args.do_venv or sys.platform == 'win32':
# Force reinstall so all dependencies are in virtual environment
Expand Down