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

Drop Amulet support #618

Merged
merged 5 commits into from
Jul 29, 2021
Merged

Drop Amulet support #618

merged 5 commits into from
Jul 29, 2021

Conversation

lourot
Copy link
Contributor

@lourot lourot commented Jul 12, 2021

Amulet has been replaced by Zaza.

https://launchpad.net/bugs/1828424

@lourot
Drop Amulet support
edf8cca 
Amulet has been replaced by Zaza.

https://launchpad.net/bugs/1828424
@ajkavanagh
Copy link
Collaborator

The only problem with dropping it from charm-helpers is that maybe, somewhere, someone else is using it. We should probably put a deprecation notice in this cycle and then remove it the next. Thoughts?

@lourot lourot mentioned this pull request Jul 28, 2021
Merged
@lourot
Copy link
Contributor Author

lourot commented Jul 28, 2021

Actually there is urgency to remove this code as it's making use of distro-info which makes the new pip resolver clash, see #621

@ChrisMacNaughton
Copy link
Contributor

Could we just drop the OpenStack related paths?

@lourot
Copy link
Contributor Author

lourot commented Jul 28, 2021

distro_info is used in get_ubuntu_releases(), which isn't OpenStack-related. Or what do you mean?

@ChrisMacNaughton
Copy link
Contributor

Is ‘get_ubuntu_releases’ really only used for amulet? That’s quite surprising to me

@lourot
Copy link
Contributor Author

lourot commented Jul 28, 2021

Yes. Please grep the repo recursively for get_ubuntu_releases and you'll see what I'm talking about.

@ajkavanagh
Copy link
Collaborator

Actually there is urgency to remove this code as it's making use of distro-info which makes the new pip resolver clash, see #621

No I totally agree; let's get rid it of it.

@fnordahl
Copy link
Contributor

+1, I was about to merge this but I did not find that the PR removes the offending distro-info package from test-requirements.txt?

It is worth noting that while the distro-info package has value in the distribution, it is absolutely useless as an independent Python wheel. I guess the best way to consume it across a virtualenv boundary would be to execute the distro-info binary.

lourot and others added 3 commits July 29, 2021 10:07
@lourot
Merge branch 'master' into lourot/rm-amulet
b8fb047 
Change-Id: Ib53fe4766c69fd25c3046121f7e338bf9d78b505
@lourot
Remove now unused dependencies
816a7e5 
Change-Id: I6a5298e7d45c0851a7330e6b3d898c54bee4591e
@lourot @ajkavanagh
Nail pip 20.2.3
20ea44e 
Since 2021-07-20 something has changed in the
tox/pip stack and this has become necessary.

See:
openstack-charmers/zaza-openstack-tests#608
openstack-charmers/release-tools#151

Co-authored-by: Alex Kavanagh <alex.kavanagh@canonical.com>
@lourot lourot marked this pull request as draft July 29, 2021 08:47
fnordahl
fnordahl previously approved these changes Jul 29, 2021
View reviewed changes
Copy link
Contributor

@fnordahl fnordahl left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@lourot
Don't 'pip install install'
32d8b12 
Change-Id: Ie2692c9bdea1037fcdf603e43543fa07402cbf7c
@lourot lourot marked this pull request as ready for review July 29, 2021 08:55
fnordahl
fnordahl approved these changes Jul 29, 2021
View reviewed changes
Copy link
Contributor

@fnordahl fnordahl left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@fnordahl fnordahl merged commit b2af130 into master Jul 29, 2021
@lourot lourot deleted the lourot/rm-amulet branch July 29, 2021 09:03
@ajkavanagh ajkavanagh mentioned this pull request Jul 30, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fnordahl fnordahl fnordahl 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.

None yet
4 participants
@lourot @ajkavanagh @ChrisMacNaughton @fnordahl