gui: use existing icons_rc.py #4711
Conversation
|
Also, contrary to what this statement, installing using
This PR fixes it. |
electrum/gui/qt/__init__.py
Outdated
| path = str(Path(__file__).parent.joinpath("icons/icons_rc.py")) | ||
| spec = importlib.util.spec_from_file_location("icons_rc", path) | ||
| module = importlib.util.module_from_spec(spec) | ||
| spec.loader.exec_module(module) |
There was a problem hiding this comment.
By adding __init__.py into the icons submodule it would become a python package and could be imported using a simple import statement. Also, pyinstaller would then automatically pick up that file. If I leave this as is then the *.spec files would need some adjustment. I prefer the icons package solution. What do you think?
There was a problem hiding this comment.
@bauerj any opinion on this?
There was a problem hiding this comment.
Although a package containing only a single module looks wrong I think it does make sense in this context.
setup.py
Outdated
| @@ -88,6 +69,7 @@ def run(self): | |||
| 'electrum': [ | |||
| 'wordlist/*.txt', | |||
| 'locale/*/LC_MESSAGES/electrum.mo', | |||
| 'gui/qt/icons/icons_rc.py', | |||
There was a problem hiding this comment.
This hack can be removed if icons becomes a python package.
electrum/gui/qt/__init__.py
Outdated
| print("Please run 'pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py'") | ||
| print("If you're running electrum from the repo then please make sure that") | ||
| print("the submdules are initialized.") | ||
| print("git submodule init") |
There was a problem hiding this comment.
I think git submodule update is necessary in this situation too.
There was a problem hiding this comment.
I will change it to git submodule update --init.
This cleans up all sorts of custom build steps or manual user action and is fully compatible with pip install git+https. The pyrcc5 command now only needs to be used by developers that wish to update the icons_rc.py file. Let's stop pretending that icons_rc.py is not available because since the move to submodules it is ;)
|
I have now repointed the icons submodule to point to commit from https:/spesmilo/electrum-icons/pull/2. I'm mostly offline for the next two weeks. If further work on this PR is required then I'm happy to address it when I'm back online. |
|
This would mean the icons submodule needs to be kept up to date with this repo. This is potentially extra maintenance work. With this PR, I guess we should update it every time Currently the electrum-icons repository is only updated just before there is a release. It's only there to make the binaries reproducible. If we could make the built |
I don't see this to be a hard requirement. You can still keep your workflow as before.
I like that idea too 👍 |
|
@SomberNight, @bauerj so how do we proceed here? |
…pkgrel to 2, removal undocumented subroutines https://bugs.archlinux.org/task/43502
This cleans up all sorts of custom build steps or manual user action and is fully compatible with
The
pyrcc5command now only needs to be used by developers that wish to update theicons_rc.pyfile.
Let's stop pretending that
icons_rc.pyis not available because since the move to submodulesit is 😉
Contributed by FDF.