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.

Sign up for GitHub

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

Jump to bottom

fix: python version in wheels #31

Merged
merged 26 commits into from
Oct 2, 2024
Merged

fix: python version in wheels #31

merged 26 commits into from
Oct 2, 2024

Conversation

dolfim-ibm
Copy link
Contributor

@dolfim-ibm dolfim-ibm commented Oct 1, 2024 •
edited
Loading

  • Fix the duplicate publish of sdist
  • Fix wheels containing wrong python modules
  • Python 3.9 CI is disabled, since there is no pairing docling version for it
  • More tests
    • Validate that poetry using the right python version
    • Validate that the .so is contained in the wheels
    • Validate that the wheels contain the expected python version
    • Try using docling-parse with the latest docling

@dolfim-ibm
fix: avoid failure when sdist is already pushed
ea993d8 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
add failure if python version is not matching
bf55785 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
verbose print
e1b3453 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
print simple grep
a0545d5 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
grep proper variable
b72a01f 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
test that the compiled modules are in the wheels
643faf2 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
test the wheel with docling
0f7dee9 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
fix grep for python cache_tag
2ae51de 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
nicer print while checking
d32732e 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
fix env set by setup-python
2153125 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
fix poetry init and use set MPS watermark
fc9ee19 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
install poetry with pipx
f1ab652 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
verbose print python version
e4e4e7d 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
use explicit python-path output
4238961 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
use findpython3 and promote venv
1b205dd 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
let pybind11 find Python and use PYTHON_EXECUTABLE
eba76d3 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
add useful print
53be288 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
remove python3.9 from CI
d60f085 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
Merge remote-tracking branch 'origin/main' into fix-wheels
9ee4c94
@dolfim-ibm
check wheels
f85d53e 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
add check_wheel.py script
f67c882 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
fix check wheels
01597fe 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
fix creation of venv
32a9cb1 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
fix test with proper arch
475f34a 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
check host arch
cacbf27 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm
remove integration test
994018e 
Signed-off-by: Michele Dolfi <dol@zurich.ibm.com>
@dolfim-ibm dolfim-ibm marked this pull request as ready for review October 2, 2024 08:04
PeterStaar-IBM
PeterStaar-IBM approved these changes Oct 2, 2024
View reviewed changes
Copy link
Contributor

@PeterStaar-IBM PeterStaar-IBM left a comment

Choose a reason for hiding this comment

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

Let's go!

@dolfim-ibm dolfim-ibm merged commit 8d903ba into main Oct 2, 2024
23 checks passed
@dolfim-ibm dolfim-ibm deleted the fix-wheels branch October 2, 2024 08:43
PeterStaar-IBM added a commit that referenced this pull request Oct 7, 2024
@PeterStaar-IBM @dolfim-ibm
@github-actions @rmdg88
fix merge conflicts with main (#38)
8c957ec 
* 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>
cau-git pushed a commit that referenced this pull request Oct 7, 2024
@PeterStaar-IBM @dolfim-ibm
@github-actions @rmdg88 @cau-git
fix merge conflicts with main (#38)
3b347bf 
* 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
Reviewers

@PeterStaar-IBM PeterStaar-IBM PeterStaar-IBM approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dolfim-ibm @PeterStaar-IBM