-
Notifications
You must be signed in to change notification settings - Fork 5
Matplotlib (and *-osx-dynamic tests) #51
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
Open
m-kuhn
wants to merge
14
commits into
main
Choose a base branch
from
matplotlib
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
4eb9197
Fix matplotlib
m-kuhn 82313a9
matplotlib tests
m-kuhn 05b404d
Bump py-tomli
m-kuhn 4a27945
python path
m-kuhn 2d85b97
debug
m-kuhn fa00ab8
gitignore
m-kuhn 6bd1ea7
set cflags
m-kuhn 728133f
v db
m-kuhn 2433107
Use vcpkg python
m-kuhn 019019e
vdb
m-kuhn 0fd0f1b
disable matplotlib ci for macos
m-kuhn 8170996
Add macos-dynamic tests
m-kuhn aeac734
Align tests
m-kuhn 328ebf2
rpath fixes
m-kuhn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| --- | ||
| name: 🍎 MacOS Dynamic | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| pull_request: | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| build-osx-dynamic: | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - os: macos-13 | ||
| triplet: x64-osx-dynamic | ||
| - os: macos-14 | ||
| triplet: arm64-osx-dynamic | ||
| env: | ||
| buildtrees: /Users/runner/vcpkg-build | ||
| name: build (macos) | ||
| runs-on: ${{ matrix.os }} | ||
|
|
||
| steps: | ||
| - name: 🐣 Checkout | ||
| uses: actions/checkout@v4 | ||
|
|
||
| - name: 🐩 Install CMake and Ninja | ||
| uses: lukka/get-cmake@latest | ||
|
|
||
| - name: 🧽 Developer Command Prompt for Microsoft Visual C++ | ||
| uses: ilammy/msvc-dev-cmd@v1 | ||
|
|
||
| - name: 🔨 Prepare build env | ||
| run: | | ||
| brew install autoconf automake autoconf-archive libtool | ||
|
|
||
| - name: 🐕 Checkout vcpkg | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: microsoft/vcpkg | ||
| ref: e60236ee051183f1122066bee8c54a0b47c43a60 # TODO: can we have a canonical baseline for tests? | ||
| path: vcpkg | ||
| fetch-depth: 1 | ||
|
|
||
| - name: 🐾 Bootstrap vcpkg | ||
| shell: bash | ||
| run: | | ||
| wget https://raw.githubusercontent.com/microsoft/vcpkg/f9dfb066d02fa62015e5c27acb4801cb482d5890/scripts/cmake/z_vcpkg_fixup_rpath_macho.cmake -O vcpkg/scripts/cmake/z_vcpkg_fixup_rpath_macho.cmake | ||
| PKG_SOURCE_USER=$(echo $GITHUB_REPOSITORY | cut -d '/' -f 1) | ||
| ./vcpkg/bootstrap-vcpkg.sh | ||
| NUGET_EXE=$(./vcpkg/vcpkg fetch nuget | grep '^\/.*nuget.exe$') | ||
| echo "Downloaded $NUGET_EXE" | ||
| mono $NUGET_EXE sources add -Name ghpkg -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" -UserName "$PKG_SOURCE_USER" -Password "${{ secrets.GITHUB_TOKEN }}" -StorePasswordInClearText | ||
| mono $NUGET_EXE setapikey "${{ secrets.GITHUB_TOKEN }}" -Source "https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json" | ||
| echo "VCPKG_BINARY_SOURCES=clear;nuget,https://nuget.pkg.github.com/$PKG_SOURCE_USER/index.json,readwrite" >> $GITHUB_ENV | ||
| VCPKG_ROOT=$(pwd)/vcpkg | ||
| echo "PATH=$VCPKG_ROOT;$PATH" >> $GITHUB_ENV | ||
| echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV | ||
|
|
||
| - name: 🌋 Build | ||
| run: | | ||
| VCPKG_OPTIONS="--overlay-ports="${{ github.workspace }}/ports" --host-triplet=${{ matrix.triplet }} --triplet=${{ matrix.triplet }} --x-buildtrees-root=${{ env.buildtrees }}" | ||
| ./vcpkg/vcpkg install $VCPKG_OPTIONS py-pip \ | ||
| py-sip \ | ||
| py-numpy \ | ||
| py-psycopg2 \ | ||
| py-urllib3 \ | ||
| py-markupsafe \ | ||
| py-matplotlib \ | ||
| py-requests \ | ||
| py-isort \ | ||
| py-autopep8 \ | ||
| py-pyqt6 | ||
|
|
||
| - name: 📑 Upload logs | ||
| uses: actions/upload-artifact@v4 | ||
| if: failure() | ||
| with: | ||
| name: logs-${{ matrix.triplet }} | ||
| path: ${{ env.buildtrees }}/**/*.log |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| *.orig |
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| # Overwrite builtin scripts | ||
| include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-tool-meson/vcpkg-port-config.cmake") | ||
| include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake") | ||
| include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_mesonpy_prepare_build_options.cmake") |
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,15 @@ | ||
| { | ||
| "name": "vcpkg-python-scripts", | ||
| "version-date": "2024-05-12", | ||
| "port-version": 2, | ||
| "port-version": 4, | ||
| "documentation": "https://vcpkg.io/en/docs/README.html", | ||
| "license": "MIT", | ||
| "supports": "native", | ||
| "dependencies": [ | ||
| "python3" | ||
| "python3", | ||
| { | ||
| "name": "vcpkg-cmake-get-vars", | ||
| "host": true | ||
| } | ||
| ] | ||
| } |
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
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Neumann-A what was your intent with
z_vcpkg_python_func_python? Should this be the system python or something provided through vcpkg?In the current state of this repository, it happens to be system python. In this case I think we'll need to acquire build dependencies (e.g.
gpep517) similar to thepy-mesonapproach abovehttps://github.com/open-vcpkg/python-registry/pull/51/files#diff-84817e4d8adab62c915c43e6a931b961f018d05eca77fc90b42fc62d032e8298R27
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The idea was to have a single place which handles which python gets used instead of having to change all vcpkg_execute_required_process calls
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
where would this ideally be defined? in vcpkg-python-scripts/vcpkg-port-config.cmake ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it doesn't matter if the port-config or the scripts defined them. Thy will be in close proximity any way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PYTHON3is set byvcpkg-tool-meson/vcpkg-port-config.cmakegpep517)x_vcpkg_get_python_packagesto acquire missing packages, we need to replacePYTHON3with a python from the venv with the packages installedpy-matplotlib) in this case, but I don't see how this could replacePYTHON3early enoughOptions:
a) Use python from a host vcpkg port and specify build deps in
vcpkg.jsonb) Make it possible to inject build deps into
vcpkg-python-scriptsand create a venv in there