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

fix: use correct image index in word backend #442

Merged
merged 5 commits into from
Nov 27, 2024

Conversation

Manuel030
Copy link
Contributor

@Manuel030 Manuel030 commented Nov 26, 2024

Issue resolved by this Pull Request:
Resolves #441

Checklist:

  • Documentation has been updated, if necessary.
  • Examples have been added, if necessary.
  • Tests have been added, if necessary.

Copy link

mergify bot commented Nov 26, 2024

Merge Protections

Your pull request matches the following merge protections and will not be merged until they are valid.

🟢 Enforce conventional commit

Wonderful, this rule succeeded.

Make sure that we follow https://www.conventionalcommits.org/en/v1.0.0/

  • title ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:

@cau-git cau-git requested a review from maxmnemonic November 26, 2024 14:23
@cau-git
Copy link
Contributor

cau-git commented Nov 26, 2024

@Manuel030 Thanks for this, we will review. To get the checks green, can you please re-sign all commits with DCO (it doesn't help if only the last one is signed).
Easiest way as suggested by Github:

git rebase HEAD~3 --signoff
git push --force

@maxmnemonic
Copy link
Contributor

@Manuel030 thanks for this! I'll run it through some extra docs just to be sure it works cleanly

maxmnemonic
maxmnemonic previously approved these changes Nov 27, 2024
@maxmnemonic
Copy link
Contributor

@Manuel030 code looks fine, and indeed corrects the position of image appearance, can you please sign off your commits for this PR, as @cau-git mentioned:

git rebase HEAD~3 --signoff
git push --force

then we could merge it

@Manuel030 Manuel030 force-pushed the fix-image-location branch 2 times, most recently from 972e27d to c02bbc8 Compare November 27, 2024 11:03
Manuel030 and others added 4 commits November 27, 2024 12:05
* fixes for referencing drawing blip in wordx

Signed-off-by: Maksym Lysak <[email protected]>

* Added safety try-except when trying to load pillow image from a docx blob. Added explicit dependency on lxml.

Signed-off-by: Maksym Lysak <[email protected]>

* Added test for word file with embedded emf images, re-generated full tests for docx, eased up dependency on lxml

Signed-off-by: Maksym Lysak <[email protected]>

* Updated lxml dependency version

Signed-off-by: Maksym Lysak <[email protected]>

---------

Signed-off-by: Maksym Lysak <[email protected]>
Co-authored-by: Maksym Lysak <[email protected]>
Signed-off-by: Manuel030 <[email protected]>
Signed-off-by: Manuel030 <[email protected]>
Signed-off-by: Manuel030 <[email protected]>
Signed-off-by: Manuel030 <[email protected]>
@Manuel030
Copy link
Contributor Author

Got it 👍 And sorry for the Git confusion :)

@cau-git cau-git requested a review from maxmnemonic November 27, 2024 12:37
Copy link
Contributor

@cau-git cau-git left a comment

Choose a reason for hiding this comment

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

LGTM

@maxmnemonic maxmnemonic merged commit 767563b into DS4SD:main Nov 27, 2024
7 checks passed
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.

Image location in Word Document is wrong
4 participants