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

relative paths for icon and version in spec file #3333 #3444

Merged
merged 8 commits into from
Feb 27, 2019
Merged

relative paths for icon and version in spec file #3333 #3444

merged 8 commits into from
Feb 27, 2019

Conversation

tallforasmurf
Copy link
Contributor

The code changes are I believe complete for this issue. There are problems with the manual, but I don't want to put doc changes into this pull request. After it is accepted I will open a new issue specifically to better document these various command parameters and their related spec file values.

@htgoebel
Copy link
Member

htgoebel commented Apr 8, 2018

Thanks for the pull-request.

All test-runs are failing. I'm afraid, there is a small but serious error in the code, see https://travis-ci.org/pyinstaller/pyinstaller/jobs/362774665#L3061

@tallforasmurf
Copy link
Contributor Author

I am mystified. I didn't change anything in the PYZ section, only EXE. And it was working fine in my tests.

Well, wait, one change I did make that could possibly be related is, each class had its own copy of from ..config import CONF and I moved that up to the top with the other global imports. Perhaps that gets it too early, before "workpath" has been defined? (But it definitely has "specpath" defined when EXE runs...) OK, I will put the imports back the way they were and hope.

commit: https://github.com/tallforasmurf/pyinstaller/commit/a86349e2fdb523bc6d416fdb3bd0df1a7bfeadb3

@htgoebel
Copy link
Member

htgoebel commented Apr 8, 2018

Perhaps that gets it too early, before "workpath" has been defined?

PyInstaller.config.CONF gets monkeypatched in the tests.

@tallforasmurf
Copy link
Contributor Author

tallforasmurf commented Apr 8, 2018

Wait, don't test yet. I just remembered why I made that change, it wasn't merely for tidyness. Must check.

EDIT: yes, because the existing from ..config import CONF is in the __init__ and I needed it also in the assemble() method.

Copy link
Member

@htgoebel htgoebel left a comment

Choose a reason for hiding this comment

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

I assume, this is ready for review now :-) I have some minor comments.

May I also ask you to

Thanks.

PyInstaller/utils/win32/icon.py Outdated Show resolved Hide resolved
PyInstaller/utils/win32/icon.py Show resolved Hide resolved
PyInstaller/utils/win32/icon.py Show resolved Hide resolved
PyInstaller/utils/win32/icon.py Show resolved Hide resolved
PyInstaller/building/api.py Outdated Show resolved Hide resolved
@htgoebel htgoebel self-assigned this Jun 27, 2018
@htgoebel htgoebel added this to the PyInstaller 3.4 milestone Jun 27, 2018
@htgoebel htgoebel changed the title Issue3333 relative paths for icon and version in spec file +3333 Sep 2, 2018
@htgoebel htgoebel changed the title relative paths for icon and version in spec file +3333 relative paths for icon and version in spec file #3333 Sep 2, 2018
@htgoebel
Copy link
Member

htgoebel commented Oct 2, 2018

@tallforasmurf May I ask you to clean up the pull-request and fix the open coding issues. I would like to merge this soon. Thanks.

Please reword your commit messages to comply to our Commit Message Rules - basically remove the issue number, which was required by an now outdated rule.

You also need to submit a changelog entry so our users can learn about your change. (This is a new requirement since last Septembe to speed up releasing.)

@htgoebel htgoebel added pr:commit-message commit message needs revision pr:changelog-entry Changelog entry missing or needs revision labels Oct 2, 2018
@htgoebel
Copy link
Member

@tallforasmurf pinging

@htgoebel
Copy link
Member

@tallforasmurf :-(((((

@htgoebel htgoebel removed pr:changelog-entry Changelog entry missing or needs revision pr:commit-message commit message needs revision labels Feb 26, 2019
@htgoebel
Copy link
Member

@tallforasmurf So I did this work for you to get this finished at last. Please check the changelog-entries wither the description is correct.

@htgoebel htgoebel merged commit 40cdaf0 into pyinstaller:develop Feb 27, 2019
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 16, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants