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

Factorize font path computation #83

Merged
merged 3 commits into from Jan 9, 2023
Merged

Conversation

avalentino
Copy link
Contributor

This PR does not fix any issue and do not provide any new feature.
It simply factorize the computation of the DejaVuSerif.ttf font path in a single point and uses the computed variable where needed.
It is a purely aesthetic change, but it makes life a little bit easier to packager that need to patch the font path.

Please note that test failures are unrelated to this change.
They are due to an incompatibility with Pillow v9.4 described in #82.

  • Tests passed
  • Passes git diff origin/main **/*py | flake8 --diff

Copy link
Member

@djhoese djhoese left a comment

Choose a reason for hiding this comment

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

Nice job! Thanks. Let me take a look at the test failures and see if I can come up with a quick fix.

Copy link
Member

@mraspaud mraspaud left a comment

Choose a reason for hiding this comment

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

LGTM

@djhoese
Copy link
Member

djhoese commented Jan 9, 2023

I merged @mraspaud's PR into main and tried merging it into your branch. I think I made all the necessary fixes for the conflicts...oops pre-commit is failing. I guess not.

@coveralls
Copy link

Coverage Status

Coverage: 95.051% (-0.02%) from 95.07% when pulling c2f9e43 on avalentino:fontpath into 1e530ff on pytroll:main.

@djhoese djhoese merged commit 8589e6d into pytroll:main Jan 9, 2023
@djhoese
Copy link
Member

djhoese commented Jan 9, 2023

@avalentino Do you need a release with these recent changes (pillow 9.4 and font path) to make your life easier?

@avalentino avalentino deleted the fontpath branch January 9, 2023 19:41
@avalentino
Copy link
Contributor Author

@avalentino Do you need a release with these recent changes (pillow 9.4 and font path) to make your life easier?

If I understand correctly the actual code was already OK, only the test code have been changes since the last release.
For the test code I already have a workaround in place so a new delivery is not urgent for me.
When you will make a new release I will remove debian specific patches to workaround test issues.

Thanks a lot @djhoese and @mraspaud

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

Successfully merging this pull request may close these issues.

None yet

4 participants