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

[deps] Removing swapper dependency #125 #126

Merged
merged 2 commits into from
Jan 4, 2022

Conversation

DavidMeu
Copy link

@DavidMeu DavidMeu commented Jan 3, 2022

Removing swapper dependency so that whatever is required will be consumed by openwisp-utils.

Closes #125

@DavidMeu DavidMeu force-pushed the fix_dependency_conflict branch 2 times, most recently from 85f8d90 to 5203a8b Compare January 3, 2022 13:21
@DavidMeu DavidMeu changed the title Removing swapper dependency. [deps] Removing swapper dependency. Jan 3, 2022
@DavidMeu DavidMeu changed the title [deps] Removing swapper dependency. [deps] Removing swapper dependency #125 Jan 3, 2022
@DavidMeu DavidMeu force-pushed the fix_dependency_conflict branch 9 times, most recently from 9df746b to 6f1674b Compare January 4, 2022 10:47
Removed swapper dependency since it is defined in openwisp-utils.
Upgraded sample-users app to use django-organization~=2.

Closes openwisp#125

Co-authored-by: Gagan Deep <pandafy.dev@gmail.com>
@coveralls
Copy link

Coverage Status

Coverage remained the same at 99.856% when pulling cad8aaf on DavidMeu:fix_dependency_conflict into 1c5047a on openwisp:master.

Copy link
Member

@pandafy pandafy left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution @DavidMeu!

Deferring merge to @nemesisdesign 😄

@nemesifier nemesifier merged commit 5a89d3e into openwisp:master Jan 4, 2022
@DavidMeu DavidMeu deleted the fix_dependency_conflict branch January 5, 2022 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

[deps] Conflict swapper module between utils and ipam repos
4 participants