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

Add flatpak module #51993

Merged
merged 17 commits into from
Apr 25, 2019
Merged

Add flatpak module #51993

merged 17 commits into from
Apr 25, 2019

Conversation

steveno
Copy link
Contributor

@steveno steveno commented Mar 6, 2019

What does this PR do?

Add support for flatpak

Tests written?

No

Commits signed with GPG?

Yes

steveno added 2 commits March 5, 2019 20:50
* Install now installs packages and runtimes
* Correct error in how is_installed parsed output
@steveno
Copy link
Contributor Author

steveno commented Mar 6, 2019

A lot of inspiration was taken from #51625

@steveno steveno changed the title WIP Add flatpak Add flatpak module Mar 6, 2019
@steveno
Copy link
Contributor Author

steveno commented Mar 7, 2019

I don't understand why the pr/docs job failed. If someone would be willing to explain to me what's going on there I'm sure I could push a fix pretty quickly.

@steveno
Copy link
Contributor Author

steveno commented Mar 11, 2019

Gentle ping.

@steveno
Copy link
Contributor Author

steveno commented Mar 18, 2019

@rallytime This PR is ready for review

salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/modules/flatpak.py Show resolved Hide resolved
salt/modules/flatpak.py Show resolved Hide resolved
salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
@twangboy
Copy link
Contributor

Hey, @steveno, thanks for the PR! Could you write some tests for these two new modules?

@steveno
Copy link
Contributor Author

steveno commented Mar 24, 2019

@twangboy I have made the requested corrections.

I did not, however, add the tests you requested. I have nothing against adding tests for this, but honestly, I don't know how.

Copy link
Contributor

@twangboy twangboy left a comment

Choose a reason for hiding this comment

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

Just a few more minor things

salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/modules/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
salt/states/flatpak.py Outdated Show resolved Hide resolved
@steveno
Copy link
Contributor Author

steveno commented Mar 28, 2019

@twangboy I have updated the docstrings as you requested.

@twangboy
Copy link
Contributor

twangboy commented Mar 28, 2019

@steveno Looks like there's some lint:

salt.modules.flatpak.py:11, PyLint, Priority: Normal
--
Unused import subprocess


salt.states.flatpak.py:65, PyLint, Priority: High
--
Undefined variable 'install'


salt.states.flatpak.py:164, PyLint, Priority: High
--
Undefined variable 'install'

@steveno
Copy link
Contributor Author

steveno commented Mar 29, 2019

@twangboy I corrected the lint errors.

Thank you for your patience!

@twangboy
Copy link
Contributor

Sorry, one more thing and then I think we're good. The docs test failed. The suggestion should take care of it. Thanks for your commitment to quality code!

@steveno
Copy link
Contributor Author

steveno commented Apr 2, 2019

@twangboy I made the suggested edits to the docs.

@twangboy
Copy link
Contributor

twangboy commented Apr 8, 2019

@steveno We're still seeing an issue with the docs. It's saying that it's an unexpected indentation in the add_remote docstring. Here's the actual error:

09:44:05 /var/jenkins/workspace/pr-doc_PR-51993-NSZVPOPKEFAWZQJEFY6OXP5GGETQE5ZOYGKZRVLHMUZW34NHQMRQ/salt/modules/flatpak.py:docstring of salt.modules.flatpak.add_remote:13:Unexpected indentation.

I'm not seeing it. Maybe you have a tab somewhere.

@steveno
Copy link
Contributor Author

steveno commented Apr 10, 2019

@twangboy I can't find anything either. There are no tabs.

salt/modules/flatpak.py Show resolved Hide resolved
@steveno
Copy link
Contributor Author

steveno commented Apr 14, 2019

The docs job is infuriating. Can someone help me understand how to fix this issue?

13:44:40 Warning, treated as error:
13:44:40 /var/jenkins/workspace/pr-doc_PR-51993-NSZVPOPKEFAWZQJEFY6OXP5GGETQE5ZOYGKZRVLHMUZW34NHQMRQ/salt/states/flatpak.py:docstring of salt.states.flatpak.add_remote:1:duplicate object description of salt.states.flatpak.add_remote, other instance in /var/jenkins/workspace/pr-doc_PR-51993-NSZVPOPKEFAWZQJEFY6OXP5GGETQE5ZOYGKZRVLHMUZW34NHQMRQ/doc/ref/states/all/salt.modules.flatpak.rst, use :noindex: for one of them

I don't want to abuse the CI job with 10 commits just trying to figure this out.

@waynew
Copy link
Contributor

waynew commented Apr 15, 2019

@steveno Do you have sphinx & whatnot locally to build the docs? I'm giving it a shot myself to see if I can figure out what's going on, but that might be helpful.

@steveno
Copy link
Contributor Author

steveno commented Apr 15, 2019

@waynew I do not. I had not seen that page on how to do it, though. I'll give it a try myself.

@steveno
Copy link
Contributor Author

steveno commented Apr 15, 2019

I obviously don't know what I'm doing because the only message I get trying to build the docs is

Makefile:72: recipe for target 'html' failed
make: *** [html] Segmentation fault (core dumped)

In fact, I get that segfault every time I try any of the make commands. pip installed sphinx 1.8.5

@waynew
Copy link
Contributor

waynew commented Apr 15, 2019

@steveno That's super weird. I have a vague recollection of someone having that error before, but I'm not getting it myself. Did you pip install sphinx with python2 or python3? I'm using 3 on mac OSX, FWIW.

@steveno
Copy link
Contributor Author

steveno commented Apr 17, 2019

I blew away my virtualenv and created a new one exclusively using pip3 and now sphinx seems to be working for me locally. Thanks for the help @waynew !

@steveno
Copy link
Contributor Author

steveno commented Apr 18, 2019

I managed to fix the docs job!! 🎊

I think this fixes all of the review comments. I once again appreciate all of the help I got with this merge!

@waynew
Copy link
Contributor

waynew commented Apr 18, 2019

🎉 Awesome!

We're still tweaking our settings with codeclimate - it's reporting some (potential) issues, though I don't know how much I agree that those are problems, at least not problems that we can do anything about 🤷‍♂️

@waynew waynew merged commit 211589a into saltstack:develop Apr 25, 2019
@steveno steveno deleted the add_flatpak branch April 27, 2019 18:18
alexey-zhukovin pushed a commit to alexey-zhukovin/salt that referenced this pull request Apr 27, 2020
@alexey-zhukovin alexey-zhukovin added the has master-port port to master has been created label Apr 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has master-port port to master has been created
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants