From 4d0541998ebd2a6e8d985d3b4aee599d4700bd4b Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 13 Jul 2024 20:16:26 -0400 Subject: [PATCH 1/4] Skip lots to go fast --- recipe/build.sh | 8 +++++++- recipe/meta.yaml | 19 +++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index a1e042c7..fbc1433e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,6 +2,12 @@ set -ex +XVFB_RUN="" +if test `uname` = "Linux" +then + XVFB_RUN="xvfb-run -s '-screen 0 640x480x24'" +fi + # hmaarrfk -- 2023/11/17 # Qt seems to look for the VULKAN_SDK environment variable when detecting vulkan support export VULKAN_SDK=${PREFIX} @@ -56,7 +62,7 @@ cmake -LAH -G "Ninja" ${CMAKE_ARGS} \ -B build_shiboken -S sources/shiboken6 cmake --build build_shiboken --target install -mkdir ${SP_DIR}/shiboken6-${PKG_VERSION}.dist-info +rm -rf ${SP_DIR}/shiboken6-${PKG_VERSION}.dist-info && mkdir -p ${SP_DIR}/shiboken6-${PKG_VERSION}.dist-info cp ${RECIPE_DIR}/METADATA.shiboken6.in ${SP_DIR}/shiboken6-${PKG_VERSION}.dist-info/METADATA echo "Version: ${PKG_VERSION}" >> ${SP_DIR}/shiboken6-${PKG_VERSION}.dist-info/METADATA diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 057be662..75670f98 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -25,7 +25,12 @@ source: - patches/tools.patch build: - number: 0 + number: 1 + skip: true # [py<39] + skip: true # [py!=312] + skip: true # [not linux] + skip: true # [aarch64] + skip: true # [ppc64le] entry_points: - pyside6-rcc = PySide6.scripts.pyside_tool:rcc - pyside6-uic = PySide6.scripts.pyside_tool:uic @@ -70,11 +75,13 @@ requirements: - setuptools - libxslt - libxml2 - - qt6-main {{ maj_min_patch }} - - qt6-3d - - qt6-charts - - qt6-datavis3d - - qt6-graphs + - qt6-main {{ version }} + # - qt6-3d + # - qt6-charts + # - qt6-datavis3d + # - qt6-graphs + # - qt6-multimedia + # - qt6-quick3d - qt6-wayland # [linux] # Provides QtMultimediaWidgets and QtSpatialAudio - qt6-multimedia From 985d46fffdd8e45dc55ce5dd0a3eaa62bd952924 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sat, 13 Jul 2024 20:35:05 -0400 Subject: [PATCH 2/4] Add patch --- recipe/meta.yaml | 8 +- ...o-expose-wayland-features-to-pyside6.patch | 92 +++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 recipe/patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 75670f98..211e26f4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,6 +24,10 @@ source: # change tools module location - patches/tools.patch + # Expose wayland native interface + # https://bugreports.qt.io/browse/PYSIDE-2787 + # - patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch + build: number: 1 skip: true # [py<39] @@ -75,7 +79,7 @@ requirements: - setuptools - libxslt - libxml2 - - qt6-main {{ version }} + - qt6-main {{ maj_min_patch }} # - qt6-3d # - qt6-charts # - qt6-datavis3d @@ -84,8 +88,6 @@ requirements: # - qt6-quick3d - qt6-wayland # [linux] # Provides QtMultimediaWidgets and QtSpatialAudio - - qt6-multimedia - - qt6-quick3d - llvmdev - clangdev >=9 - libclang diff --git a/recipe/patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch b/recipe/patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch new file mode 100644 index 00000000..048006bb --- /dev/null +++ b/recipe/patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch @@ -0,0 +1,92 @@ +From c2d7c71533cfa4c5f9a6c301ef8a9a29182f5657 Mon Sep 17 00:00:00 2001 +From: Mark Harfouche +Date: Sat, 13 Jul 2024 20:33:59 -0400 +Subject: [PATCH] Add patch to expose wayland features to pyside6 + +--- + sources/pyside6/PySide6/QtGui/CMakeLists.txt | 9 ++++++++- + .../PySide6/QtGui/typesystem_gui_common.xml | 18 ++++++++++++++++++ + sources/pyside6/PySide6/glue/qtgui.cpp | 11 +++++++++++ + 3 files changed, 37 insertions(+), 1 deletion(-) + +diff --git a/sources/pyside6/PySide6/QtGui/CMakeLists.txt b/sources/pyside6/PySide6/QtGui/CMakeLists.txt +index 7cd7871..57f318a 100644 +--- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt ++++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt +@@ -287,7 +287,14 @@ get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui + if("xcb" IN_LIST QtGui_enabled_features) + list(APPEND QtGui_SRC + ${QtGui_GEN_DIR}/qnativeinterface_qx11application_wrapper.cpp) +-elseif(WIN32) ++endif() ++ ++if("wayland" IN_LIST QtGui_enabled_features) ++ list(APPEND QtGui_SRC ++ ${QtGui_GEN_DIR}/qnativeinterface_qwaylandapplication_wrapper.cpp) ++endif() ++ ++if(WIN32) + list(APPEND QtGui_SRC + ${QtGui_GEN_DIR}/qnativeinterface_qwindowsscreen_wrapper.cpp) + endif() +diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +index dd17952..5b36d41 100644 +--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml ++++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +@@ -2667,6 +2667,24 @@ + snippet="qx11application-resource-ptr"/> + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +diff --git a/sources/pyside6/PySide6/glue/qtgui.cpp b/sources/pyside6/PySide6/glue/qtgui.cpp +index 130de11..02d52a2 100644 +--- a/sources/pyside6/PySide6/glue/qtgui.cpp ++++ b/sources/pyside6/PySide6/glue/qtgui.cpp +@@ -791,6 +791,12 @@ if (auto *x11App = %CPPSELF.nativeInterface() + %PYARG_0 = %CONVERTTOPYTHON[QNativeInterface::QX11Application*](x11App); + } + #endif ++#if QT_CONFIG(wayland) ++if (auto *waylandApp = %CPPSELF.nativeInterface()) { ++ hasNativeApp = true; ++ %PYARG_0 = %CONVERTTOPYTHON[QNativeInterface::QWaylandApplication*](waylandApp); ++} ++#endif + if (!hasNativeApp) { + Py_INCREF(Py_None); + %PYARG_0 = Py_None; +@@ -821,6 +827,11 @@ if (!hasNativeScreen) { + auto *resource = %CPPSELF.%FUNCTION_NAME(); + %PYARG_0 = PyLong_FromVoidPtr(resource); + // @snippet qx11application-resource-ptr ++// ++// @snippet qwaylandapplication-resource-ptr ++auto *waylandResource = %CPPSELF.%FUNCTION_NAME(); ++%PYARG_0 = PyLong_FromVoidPtr(waylandResource); ++// @snippet qwaylandapplication-resource-ptr + + // @snippet qwindow-fromWinId + WId id = %1; +-- +2.43.2 + From 5f860ae64943a68a83e1eebbef782b02aeff76ba Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 5 Jan 2025 23:02:48 -0500 Subject: [PATCH 3/4] MNT: Re-rendered with conda-build 24.11.2, conda-smithy 3.45.1, and conda-forge-pinning 2025.01.03.14.12.46 --- .azure-pipelines/azure-pipelines-linux.yml | 36 ---- .azure-pipelines/azure-pipelines-osx.yml | 64 ------- .azure-pipelines/azure-pipelines-win.yml | 50 ------ .../linux_64_python3.10.____cpython.yaml | 33 ---- .../linux_64_python3.11.____cpython.yaml | 33 ---- .../linux_64_python3.13.____cp313.yaml | 33 ---- .../linux_64_python3.9.____cpython.yaml | 33 ---- .../linux_aarch64_python3.10.____cpython.yaml | 33 ---- .../linux_aarch64_python3.11.____cpython.yaml | 33 ---- .../linux_aarch64_python3.12.____cpython.yaml | 33 ---- .../linux_aarch64_python3.13.____cp313.yaml | 33 ---- .../linux_aarch64_python3.9.____cpython.yaml | 33 ---- .../osx_64_python3.10.____cpython.yaml | 35 ---- .../osx_64_python3.11.____cpython.yaml | 35 ---- .../osx_64_python3.12.____cpython.yaml | 35 ---- .ci_support/osx_64_python3.13.____cp313.yaml | 35 ---- .ci_support/osx_64_python3.9.____cpython.yaml | 35 ---- .../osx_arm64_python3.10.____cpython.yaml | 35 ---- .../osx_arm64_python3.11.____cpython.yaml | 35 ---- .../osx_arm64_python3.12.____cpython.yaml | 35 ---- .../osx_arm64_python3.13.____cp313.yaml | 35 ---- .../osx_arm64_python3.9.____cpython.yaml | 35 ---- .../win_64_python3.10.____cpython.yaml | 20 --- .../win_64_python3.11.____cpython.yaml | 20 --- .../win_64_python3.12.____cpython.yaml | 20 --- .ci_support/win_64_python3.13.____cp313.yaml | 20 --- .ci_support/win_64_python3.9.____cpython.yaml | 20 --- .scripts/run_osx_build.sh | 120 ------------- .scripts/run_win_build.bat | 149 ---------------- README.md | 168 ------------------ azure-pipelines.yml | 4 +- 31 files changed, 1 insertion(+), 1337 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-osx.yml delete mode 100755 .azure-pipelines/azure-pipelines-win.yml delete mode 100644 .ci_support/linux_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_64_python3.13.____cp313.yaml delete mode 100644 .ci_support/linux_64_python3.9.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.10.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.11.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.12.____cpython.yaml delete mode 100644 .ci_support/linux_aarch64_python3.13.____cp313.yaml delete mode 100644 .ci_support/linux_aarch64_python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.11.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.12.____cpython.yaml delete mode 100644 .ci_support/osx_64_python3.13.____cp313.yaml delete mode 100644 .ci_support/osx_64_python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_python3.10.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_python3.11.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_python3.12.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_python3.13.____cp313.yaml delete mode 100644 .ci_support/osx_arm64_python3.9.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.10.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.11.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.12.____cpython.yaml delete mode 100644 .ci_support/win_64_python3.13.____cp313.yaml delete mode 100644 .ci_support/win_64_python3.9.____cpython.yaml delete mode 100755 .scripts/run_osx_build.sh delete mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 6ade5cfd..9c0a7d96 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,46 +8,10 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_64_python3.12.____cpython: CONFIG: linux_64_python3.12.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_python3.13.____cp313: - CONFIG: linux_64_python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_python3.10.____cpython: - CONFIG: linux_aarch64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_python3.11.____cpython: - CONFIG: linux_aarch64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_python3.12.____cpython: - CONFIG: linux_aarch64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_python3.13.____cp313: - CONFIG: linux_aarch64_python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_aarch64_python3.9.____cpython: - CONFIG: linux_aarch64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml deleted file mode 100755 index 8f009304..00000000 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,64 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: osx - pool: - vmImage: macOS-13 - strategy: - matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.12.____cpython: - CONFIG: osx_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_python3.13.____cp313: - CONFIG: osx_64_python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.10.____cpython: - CONFIG: osx_arm64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.11.____cpython: - CONFIG: osx_arm64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.12.____cpython: - CONFIG: osx_arm64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.13.____cp313: - CONFIG: osx_arm64_python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: {} - - steps: - # TODO: Fast finish on azure pipelines? - - script: | - export CI=azure - export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) - export remote_url=$(Build.Repository.Uri) - export sha=$(Build.SourceVersion) - export OSX_FORCE_SDK_DOWNLOAD="1" - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - ./.scripts/run_osx_build.sh - displayName: Run OSX build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 1985588f..00000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_python3.10.____cpython: - CONFIG: win_64_python3.10.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.11.____cpython: - CONFIG: win_64_python3.11.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.12.____cpython: - CONFIG: win_64_python3.12.____cpython - UPLOAD_PACKAGES: 'True' - win_64_python3.13.____cp313: - CONFIG: win_64_python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - win_64_python3.9.____cpython: - CONFIG: win_64_python3.9.____cpython - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: - CONDA_BLD_PATH: D:\\bld\\ - MINIFORGE_HOME: D:\Miniforge - UPLOAD_TEMP: D:\\tmp - - steps: - - - script: | - call ".scripts\run_win_build.bat" - displayName: Run Windows build - env: - MINIFORGE_HOME: $(MINIFORGE_HOME) - CONDA_BLD_PATH: $(CONDA_BLD_PATH) - PYTHONUNBUFFERED: 1 - CONFIG: $(CONFIG) - CI: azure - flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) - remote_url: $(Build.Repository.Uri) - sha: $(Build.SourceVersion) - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml deleted file mode 100644 index 78ce14a1..00000000 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml deleted file mode 100644 index 3df0aafb..00000000 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_64_python3.13.____cp313.yaml b/.ci_support/linux_64_python3.13.____cp313.yaml deleted file mode 100644 index 3577e1eb..00000000 --- a/.ci_support/linux_64_python3.13.____cp313.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml deleted file mode 100644 index addd00c6..00000000 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml deleted file mode 100644 index b03c6883..00000000 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml deleted file mode 100644 index 5d9235ee..00000000 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_python3.12.____cpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpython.yaml deleted file mode 100644 index f61f35fb..00000000 --- a/.ci_support/linux_aarch64_python3.12.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_python3.13.____cp313.yaml b/.ci_support/linux_aarch64_python3.13.____cp313.yaml deleted file mode 100644 index 419de667..00000000 --- a/.ci_support/linux_aarch64_python3.13.____cp313.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml deleted file mode 100644 index 11b80351..00000000 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml deleted file mode 100644 index 4d4f877e..00000000 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml deleted file mode 100644 index b7a7e03c..00000000 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.12.____cpython.yaml b/.ci_support/osx_64_python3.12.____cpython.yaml deleted file mode 100644 index 70a85ca3..00000000 --- a/.ci_support/osx_64_python3.12.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.13.____cp313.yaml b/.ci_support/osx_64_python3.13.____cp313.yaml deleted file mode 100644 index a1022c90..00000000 --- a/.ci_support/osx_64_python3.13.____cp313.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml deleted file mode 100644 index c49e02ee..00000000 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml deleted file mode 100644 index 71859836..00000000 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml deleted file mode 100644 index 71d87a34..00000000 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml deleted file mode 100644 index 62ab5eb2..00000000 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.13.____cp313.yaml b/.ci_support/osx_arm64_python3.13.____cp313.yaml deleted file mode 100644 index 91b0e426..00000000 --- a/.ci_support/osx_arm64_python3.13.____cp313.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml deleted file mode 100644 index e1deace6..00000000 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ /dev/null @@ -1,35 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '12.3' -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -libxml2: -- '2' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml deleted file mode 100644 index 732c2385..00000000 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml deleted file mode 100644 index ee003d75..00000000 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml deleted file mode 100644 index 3c2a02ff..00000000 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.13.____cp313.yaml b/.ci_support/win_64_python3.13.____cp313.yaml deleted file mode 100644 index af576015..00000000 --- a/.ci_support/win_64_python3.13.____cp313.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -target_platform: -- win-64 diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml deleted file mode 100644 index c6eeafee..00000000 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ /dev/null @@ -1,20 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -libxml2: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -target_platform: -- win-64 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh deleted file mode 100755 index 0e3c3942..00000000 --- a/.scripts/run_osx_build.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env bash - -# -*- mode: jinja-shell -*- - -source .scripts/logging_utils.sh - -set -xe - -MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" -MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash -export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" - -( startgroup "Provisioning base env with micromamba" ) 2> /dev/null -MICROMAMBA_VERSION="1.5.10-0" -if [[ "$(uname -m)" == "arm64" ]]; then - osx_arch="osx-arm64" -else - osx_arch="osx-64" -fi -MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" -MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" -echo "Downloading micromamba ${MICROMAMBA_VERSION}" -micromamba_exe="$(mktemp -d)/micromamba" -curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" -chmod +x "${micromamba_exe}" -echo "Creating environment" -"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ - --channel conda-forge \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" -mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" -echo "Cleaning up micromamba" -rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true -( endgroup "Provisioning base env with micromamba" ) 2> /dev/null - -( startgroup "Configuring conda" ) 2> /dev/null -echo "Activating environment" -source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" -conda activate base -export CONDA_SOLVER="libmamba" -export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - - - - - -echo -e "\n\nSetting up the condarc and mangling the compiler." -setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ "${CI:-}" != "" ]]; then - mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -fi - -if [[ "${CI:-}" != "" ]]; then - echo -e "\n\nMangling homebrew in the CI to avoid conflicts." - /usr/bin/sudo mangle_homebrew - /usr/bin/sudo -k -else - echo -e "\n\nNot mangling homebrew as we are not running in CI" -fi - -if [[ "${sha:-}" == "" ]]; then - sha=$(git rev-parse HEAD) -fi - -echo -e "\n\nRunning the build setup script." -source run_conda_forge_build_setup - - - -( endgroup "Configuring conda" ) 2> /dev/null - -echo -e "\n\nMaking the build clobber file" -make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ -f LICENSE.txt ]]; then - cp LICENSE.txt "recipe/recipe-scripts-license.txt" -fi - -if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" - fi - conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - # Drop into an interactive shell - /bin/bash -else - - if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" - fi - - conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ - --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" - - ( startgroup "Inspecting artifacts" ) 2> /dev/null - - # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" - - ( endgroup "Inspecting artifacts" ) 2> /dev/null - ( startgroup "Validating outputs" ) 2> /dev/null - - validate_recipe_outputs "${FEEDSTOCK_NAME}" - - ( endgroup "Validating outputs" ) 2> /dev/null - - ( startgroup "Uploading packages" ) 2> /dev/null - - if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml - fi - - ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat deleted file mode 100755 index f0ead3d9..00000000 --- a/.scripts/run_win_build.bat +++ /dev/null @@ -1,149 +0,0 @@ -:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -:: benefit from the improvement. - -:: INPUTS (required environment variables) -:: CONFIG: name of the .ci_support/*.yaml file for this job -:: CI: azure, github_actions, or unset -:: MINIFORGE_HOME: where to install the base conda environment -:: UPLOAD_PACKAGES: true or false -:: UPLOAD_ON_BRANCH: true or false - -setlocal enableextensions enabledelayedexpansion - -FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" -if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" -:: Remove trailing backslash, if present -if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" -call :start_group "Provisioning base env with micromamba" -set "MAMBA_ROOT_PREFIX=%MINIFORGE_HOME%-micromamba-%RANDOM%" -set "MICROMAMBA_VERSION=1.5.10-0" -set "MICROMAMBA_URL=https://github.com/mamba-org/micromamba-releases/releases/download/%MICROMAMBA_VERSION%/micromamba-win-64" -set "MICROMAMBA_TMPDIR=%TMP%\micromamba-%RANDOM%" -set "MICROMAMBA_EXE=%MICROMAMBA_TMPDIR%\micromamba.exe" - -echo Downloading micromamba %MICROMAMBA_VERSION% -if not exist "%MICROMAMBA_TMPDIR%" mkdir "%MICROMAMBA_TMPDIR%" -certutil -urlcache -split -f "%MICROMAMBA_URL%" "%MICROMAMBA_EXE%" -if !errorlevel! neq 0 exit /b !errorlevel! - -echo Creating environment -call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefix "%MINIFORGE_HOME%" ^ - --channel conda-forge ^ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -if !errorlevel! neq 0 exit /b !errorlevel! -echo Removing %MAMBA_ROOT_PREFIX% -del /S /Q "%MAMBA_ROOT_PREFIX%" >nul -del /S /Q "%MICROMAMBA_TMPDIR%" >nul -call :end_group - -call :start_group "Configuring conda" - -:: Activate the base conda environment -echo Activating environment -call "%MINIFORGE_HOME%\Scripts\activate.bat" -:: Configure the solver -set "CONDA_SOLVER=libmamba" -if !errorlevel! neq 0 exit /b !errorlevel! -set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" - -:: Set basic configuration -echo Setting up configuration -setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml -if !errorlevel! neq 0 exit /b !errorlevel! -echo Running build setup -CALL run_conda_forge_build_setup - - -if !errorlevel! neq 0 exit /b !errorlevel! - -if EXIST LICENSE.txt ( - echo Copying feedstock license - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" -) -if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" -) - -if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" -) - -call :end_group - -:: Build the recipe -echo Building recipe -conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% -if !errorlevel! neq 0 exit /b !errorlevel! - -call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts --recipe-dir ".\recipe" -m .ci_support\%CONFIG%.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" -call :end_group - -:: Prepare some environment variables for the upload step -if /i "%CI%" == "github_actions" ( - set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" - set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" - if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( - set "IS_PR_BUILD=True" - ) else ( - set "IS_PR_BUILD=False" - ) - set "TEMP=%RUNNER_TEMP%" -) -if /i "%CI%" == "azure" ( - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - if /i "%BUILD_REASON%" == "PullRequest" ( - set "IS_PR_BUILD=True" - ) else ( - set "IS_PR_BUILD=False" - ) - set "TEMP=%UPLOAD_TEMP%" -) - -:: Validate -call :start_group "Validating outputs" -validate_recipe_outputs "%FEEDSTOCK_NAME%" -if !errorlevel! neq 0 exit /b !errorlevel! -call :end_group - -if /i "%UPLOAD_PACKAGES%" == "true" ( - if /i "%IS_PR_BUILD%" == "false" ( - call :start_group "Uploading packages" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - if !errorlevel! neq 0 exit /b !errorlevel! - call :end_group - ) -) - -exit - -:: Logging subroutines - -:start_group -if /i "%CI%" == "github_actions" ( - echo ::group::%~1 - exit /b -) -if /i "%CI%" == "azure" ( - echo ##[group]%~1 - exit /b -) -echo %~1 -exit /b - -:end_group -if /i "%CI%" == "github_actions" ( - echo ::endgroup:: - exit /b -) -if /i "%CI%" == "azure" ( - echo ##[endgroup] - exit /b -) -exit /b \ No newline at end of file diff --git a/README.md b/README.md index e131eab9..85ecf6f5 100644 --- a/README.md +++ b/README.md @@ -27,180 +27,12 @@ Current build status - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_python3.10.____cpython - - variant - -
linux_64_python3.11.____cpython - - variant - -
linux_64_python3.12.____cpython variant
linux_64_python3.13.____cp313 - - variant - -
linux_64_python3.9.____cpython - - variant - -
linux_aarch64_python3.10.____cpython - - variant - -
linux_aarch64_python3.11.____cpython - - variant - -
linux_aarch64_python3.12.____cpython - - variant - -
linux_aarch64_python3.13.____cp313 - - variant - -
linux_aarch64_python3.9.____cpython - - variant - -
osx_64_python3.10.____cpython - - variant - -
osx_64_python3.11.____cpython - - variant - -
osx_64_python3.12.____cpython - - variant - -
osx_64_python3.13.____cp313 - - variant - -
osx_64_python3.9.____cpython - - variant - -
osx_arm64_python3.10.____cpython - - variant - -
osx_arm64_python3.11.____cpython - - variant - -
osx_arm64_python3.12.____cpython - - variant - -
osx_arm64_python3.13.____cp313 - - variant - -
osx_arm64_python3.9.____cpython - - variant - -
win_64_python3.10.____cpython - - variant - -
win_64_python3.11.____cpython - - variant - -
win_64_python3.12.____cpython - - variant - -
win_64_python3.13.____cp313 - - variant - -
win_64_python3.9.____cpython - - variant - -
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eff4ad66..d309e84b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,6 +28,4 @@ stages: condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) dependsOn: Check jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-linux.yml \ No newline at end of file From eaee9e8b62ab7ef78006c7cc0e7975e1a15923c9 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 5 Jan 2025 23:35:10 -0500 Subject: [PATCH 4/4] Update patch. seems like it works??? --- recipe/meta.yaml | 2 +- ...=> 0001-Try-to-add-qt-wayland-shims.patch} | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) rename recipe/patches/{0001-Add-patch-to-expose-wayland-features-to-pyside6.patch => 0001-Try-to-add-qt-wayland-shims.patch} (87%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 211e26f4..9b88f448 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,7 @@ source: # Expose wayland native interface # https://bugreports.qt.io/browse/PYSIDE-2787 - # - patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch + - patches/0001-Try-to-add-qt-wayland-shims.patch build: number: 1 diff --git a/recipe/patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch b/recipe/patches/0001-Try-to-add-qt-wayland-shims.patch similarity index 87% rename from recipe/patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch rename to recipe/patches/0001-Try-to-add-qt-wayland-shims.patch index 048006bb..427b79a8 100644 --- a/recipe/patches/0001-Add-patch-to-expose-wayland-features-to-pyside6.patch +++ b/recipe/patches/0001-Try-to-add-qt-wayland-shims.patch @@ -1,7 +1,7 @@ -From c2d7c71533cfa4c5f9a6c301ef8a9a29182f5657 Mon Sep 17 00:00:00 2001 +From 67b846f2284851071c9d492101af2d57820c9aab Mon Sep 17 00:00:00 2001 From: Mark Harfouche -Date: Sat, 13 Jul 2024 20:33:59 -0400 -Subject: [PATCH] Add patch to expose wayland features to pyside6 +Date: Sun, 5 Jan 2025 23:27:47 -0500 +Subject: [PATCH] Try to add qt wayland shims --- sources/pyside6/PySide6/QtGui/CMakeLists.txt | 9 ++++++++- @@ -10,10 +10,10 @@ Subject: [PATCH] Add patch to expose wayland features to pyside6 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/sources/pyside6/PySide6/QtGui/CMakeLists.txt b/sources/pyside6/PySide6/QtGui/CMakeLists.txt -index 7cd7871..57f318a 100644 +index 33f5c0d88..b6b6c6896 100644 --- a/sources/pyside6/PySide6/QtGui/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtGui/CMakeLists.txt -@@ -287,7 +287,14 @@ get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui +@@ -291,7 +291,14 @@ get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui if("xcb" IN_LIST QtGui_enabled_features) list(APPEND QtGui_SRC ${QtGui_GEN_DIR}/qnativeinterface_qx11application_wrapper.cpp) @@ -30,10 +30,10 @@ index 7cd7871..57f318a 100644 ${QtGui_GEN_DIR}/qnativeinterface_qwindowsscreen_wrapper.cpp) endif() diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml -index dd17952..5b36d41 100644 +index 6a38cd5ee..b2e0605c3 100644 --- a/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml +++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_common.xml -@@ -2667,6 +2667,24 @@ +@@ -2677,6 +2677,24 @@ snippet="qx11application-resource-ptr"/> @@ -59,10 +59,10 @@ index dd17952..5b36d41 100644 force-abstract="yes"> diff --git a/sources/pyside6/PySide6/glue/qtgui.cpp b/sources/pyside6/PySide6/glue/qtgui.cpp -index 130de11..02d52a2 100644 +index a91478c55..ffb596199 100644 --- a/sources/pyside6/PySide6/glue/qtgui.cpp +++ b/sources/pyside6/PySide6/glue/qtgui.cpp -@@ -791,6 +791,12 @@ if (auto *x11App = %CPPSELF.nativeInterface() +@@ -792,6 +792,12 @@ if (auto *x11App = %CPPSELF.nativeInterface() %PYARG_0 = %CONVERTTOPYTHON[QNativeInterface::QX11Application*](x11App); } #endif @@ -75,18 +75,18 @@ index 130de11..02d52a2 100644 if (!hasNativeApp) { Py_INCREF(Py_None); %PYARG_0 = Py_None; -@@ -821,6 +827,11 @@ if (!hasNativeScreen) { - auto *resource = %CPPSELF.%FUNCTION_NAME(); +@@ -823,6 +829,11 @@ if (!hasNativeScreen) { %PYARG_0 = PyLong_FromVoidPtr(resource); // @snippet qx11application-resource-ptr -+// + +// @snippet qwaylandapplication-resource-ptr +auto *waylandResource = %CPPSELF.%FUNCTION_NAME(); +%PYARG_0 = PyLong_FromVoidPtr(waylandResource); +// @snippet qwaylandapplication-resource-ptr - ++ // @snippet qwindow-fromWinId WId id = %1; + %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(id); -- -2.43.2 +2.47.1