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

If LICENSE is missing from the plugin path but available in the parent path when packaging, include that #307

Merged
merged 2 commits into from
Aug 2, 2024

Conversation

nirvn
Copy link
Member

@nirvn nirvn commented Aug 1, 2024

@m-kuhn , @suricactus , as discussed to fix qfieldsync releases.

@nirvn
Copy link
Member Author

nirvn commented Aug 1, 2024

Fixes #255

Copy link
Collaborator

@Gustry Gustry left a comment

Choose a reason for hiding this comment

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

Nice, thanks.

Can you just add a check in the test ? Similar to https://github.com/opengisch/qgis-plugin-ci/blob/master/test/test_release.py#L198

Just that the file exists for instance, as the LICENSE exists in the parent folder.

qgispluginci/release.py Outdated Show resolved Hide resolved
qgispluginci/release.py Outdated Show resolved Hide resolved
@nirvn
Copy link
Member Author

nirvn commented Aug 1, 2024

@Gustry , @Guts , comments addressed.

test/test_release.py Outdated Show resolved Hide resolved
@Gustry
Copy link
Collaborator

Gustry commented Aug 1, 2024

It seems the test is failing on the LICENCE file now :

https://github.com/opengisch/qgis-plugin-ci/actions/runs/10196486393/job/28207357970?pr=307#step:7:465

For the false positive about transifex, for next time, you can push your work branch on the main git repo opengisch, it will launch the test suite without any issue in the PR.

Copy link
Collaborator

@Guts Guts 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 for fulfilling the task that I should have done.

Just for the beauté du geste, recently I try to work only with pathlib to deal with files and reserve shutil (or other lower-level libs) for special cases. And it's possible to use pathlib to move a file (rename) or copy one touch + write_text in oneliner.

@nirvn
Copy link
Member Author

nirvn commented Aug 1, 2024

@Gustry , I'll seek to gain push permission into this repository :)

@nirvn
Copy link
Member Author

nirvn commented Aug 1, 2024

@Gustry , license test failure fixed.

@nirvn
Copy link
Member Author

nirvn commented Aug 2, 2024

@Gustry , @Guts , OK to merge?

@Guts Guts merged commit 90f3a7d into opengisch:master Aug 2, 2024
2 of 3 checks passed
@m-kuhn
Copy link
Member

m-kuhn commented Aug 7, 2024

Shall we do a new release?

@Gustry
Copy link
Collaborator

Gustry commented Aug 7, 2024

CI is running for 2.8.9 ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants