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

Jump to bottom

Fix requirements in master #2063

Merged
merged 1 commit into from
Oct 18, 2021
Merged

Fix requirements in master #2063

merged 1 commit into from
Oct 18, 2021

Conversation

Rebits
Copy link
Member

@Rebits Rebits commented Oct 18, 2021

Description

This PR fix provision error in python requirements installation in master branch.

  The conflict is caused by:
      The user requested urllib3>=1.26.5
      requests 2.23.0 depends on urllib3!=1.25.0, !=1.25.1, <1.26 and >=1.21.1
      The user requested urllib3>=1.26.5
      requests 2.23.0 depends on urllib3!=1.25.0, !=1.25.1, <1.26 and >=1.21.1

urllib3 module version has been removed and MacOS platform has been replaced by Darwin in order to properly install python dependencies in macOS environment

@snaow snaow merged commit 966476a into master Oct 18, 2021
@snaow snaow deleted the fix-master-wazuh-qa-provision branch October 18, 2021 13:32
@snaow snaow mentioned this pull request Jan 27, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Rebits @snaow