fix merge conflicts with main #38
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* missing sdist in pypi index * installing pybind11 as a build time python package dependency * add missing windows pyd files --------- Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
[skip ci] --------- Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
--------- Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
Signed-off-by: rmdg88 <rmdg88@gmail.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
Signed-off-by: Peter Staar <taa@zurich.ibm.com>
PeterStaar-IBM
merged commit 8c957ec
into
dev/add-docling-parse-v2
23 of 24 checks passed
cau-git
pushed a commit
that referenced
this pull request
Oct 7, 2024
* fix: sdist and wheels content (#28) * missing sdist in pypi index * installing pybind11 as a build time python package dependency * add missing windows pyd files --------- Signed-off-by: Michele Dolfi <dol@zurich.ibm.com> * chore: bump version to 1.3.1 [skip ci] * chore: remove security issue (#34) Signed-off-by: Peter Staar <taa@zurich.ibm.com> * fix: python version in wheels (#31) [skip ci] --------- Signed-off-by: Michele Dolfi <dol@zurich.ibm.com> * feat: build using system deps (#33) --------- Signed-off-by: Michele Dolfi <dol@zurich.ibm.com> * chore: bump version to 1.4.0 [skip ci] * fix: windows build properly linking to system libraries (#36) Signed-off-by: rmdg88 <rmdg88@gmail.com> * chore: bump version to 1.4.1 [skip ci] * updated the cxxopts cmake to deal with system-dependencies Signed-off-by: Peter Staar <taa@zurich.ibm.com> * fixed the includes Signed-off-by: Peter Staar <taa@zurich.ibm.com> * it compiles finally Signed-off-by: Peter Staar <taa@zurich.ibm.com> * fixed the poetry.lock Signed-off-by: Peter Staar <taa@zurich.ibm.com> * trying to fix the rhel build script Signed-off-by: Peter Staar <taa@zurich.ibm.com> * trying to fix the rhel build script (2) Signed-off-by: Peter Staar <taa@zurich.ibm.com> * trying to fix the rhel build script (3) Signed-off-by: Peter Staar <taa@zurich.ibm.com> * revert to cxxopts v2.2.0 Signed-off-by: Peter Staar <taa@zurich.ibm.com> * updating to cxxopts v3.2.0 Signed-off-by: Peter Staar <taa@zurich.ibm.com> --------- Signed-off-by: Michele Dolfi <dol@zurich.ibm.com> Signed-off-by: Peter Staar <taa@zurich.ibm.com> Signed-off-by: rmdg88 <rmdg88@gmail.com> Co-authored-by: Michele Dolfi <97102151+dolfim-ibm@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Rui Dias Gomes <66125272+rmdg88@users.noreply.github.com> Signed-off-by: Christoph Auer <cau@zurich.ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.