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 dependencies #81

Merged
merged 2 commits into from
Feb 3, 2022
Merged

Fix dependencies #81

merged 2 commits into from
Feb 3, 2022

Conversation

mgorny
Copy link
Contributor

@mgorny mgorny commented Feb 2, 2022 •
edited
Loading

  1. Remove stale runtime dependency on setuptools.
  2. Make importlib-metadata conditional properly.

@mgorny
Remove obsolete setuptools from install_requires
09dc90a 
Now that pkg_resources are no longer used, there is no need to depend
on setuptools at runtime.
@mgorny
Fix version-conditional dependency on importlib-metadata
f1185a4 
Use version markers to depend on importlib-metadata correctly.  Explicit
conditions mean that wheels built with setup.py will either have the dep
or not depending on what Python version they're built with, rather than
what version they're installed on.
wjwwood
wjwwood requested changes Feb 2, 2022
View reviewed changes
Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change in how the dependencies are specified lgtm, but would prefer to do one thing a time in this pull request, so requested the mock changes to be removed.

tests/unit/test_terminal_utils.py Outdated Show resolved Hide resolved
@mgorny mgorny changed the title Fix dependencies & use unittest.mock Fix dependencies Feb 2, 2022
@wjwwood
Copy link
Member

wjwwood commented Feb 2, 2022

Thanks!

@wjwwood
Copy link
Member

wjwwood commented Feb 2, 2022 •
edited
Loading

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status (unrelated flakes)

@wjwwood wjwwood merged commit 4b2f3a8 into osrf:master Feb 3, 2022
@mgorny
Copy link
Contributor Author

mgorny commented Feb 3, 2022

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjwwood wjwwood wjwwood approved these changes

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
@mgorny @wjwwood