Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
892b855
Update musllinux installs
AlenkaF Oct 28, 2025
603f75b
Use default args
AlenkaF Oct 30, 2025
b6d5b69
Update windows wheels dockerfiles to use MSIX
AlenkaF Nov 5, 2025
ddc9ae0
Remove free threaded win wheels from services (only build, not test -…
AlenkaF Nov 5, 2025
c901361
Bring bach win free-threaded service and only use the same dockerfile
AlenkaF Nov 5, 2025
c1ac11d
Update windows test wheels dockerfiles to use MSIX
AlenkaF Nov 5, 2025
d6ffdd3
Try moving install of MSIX to base dockerfile
AlenkaF Nov 5, 2025
836718a
Add MSIX to the test base dockerfile also
AlenkaF Nov 6, 2025
b773837
Use proper powershell syntax
AlenkaF Nov 6, 2025
8dbd304
Try if curl works
AlenkaF Nov 6, 2025
e9d67d5
Move curl command outside Poweshell
AlenkaF Nov 6, 2025
ecda84d
Change url and decouple choco and pymanager install
AlenkaF Nov 7, 2025
bf5c373
Revert "Update windows test wheels dockerfiles to use MSIX"
AlenkaF Nov 7, 2025
d13d7dd
Remove pymanager install from base test dockerfile
AlenkaF Nov 7, 2025
730729f
Revert unnecessary changes on the choco install in base test
AlenkaF Nov 7, 2025
59dce60
Fix wrong tab
AlenkaF Nov 7, 2025
834d8cb
Update ci/docker/python-wheel-windows-vs2022-base.dockerfile
AlenkaF Nov 10, 2025
080f9a4
Remove duplicated rows
AlenkaF Nov 10, 2025
258bf1e
Try removing defaults already parametered
AlenkaF Dec 3, 2025
52ac61e
Remove mapping to patch versions
AlenkaF Dec 3, 2025
0450baf
Include python_variant suggestion
AlenkaF Dec 3, 2025
2c9e532
Add build_date arg
AlenkaF Dec 4, 2025
b0d30cb
Fix win dockerfile
AlenkaF Dec 5, 2025
b4b42fb
Fix error - win test still using choco not pymanager
AlenkaF Dec 5, 2025
a356a46
Fix typo
AlenkaF Dec 5, 2025
cf0c169
Remove old comment
AlenkaF Dec 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Include python_variant suggestion
  • Loading branch information
AlenkaF committed Dec 18, 2025
commit 0450baff092154b932c8fbf7a24b55f8ef331014
10 changes: 3 additions & 7 deletions ci/docker/python-wheel-windows-vs2022.dockerfile
Copy link
Member

Choose a reason for hiding this comment

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

Should we do similar changes for python-wheel-windows-test-vs2022.dockerfile and friends?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wasn't able to make it work for the test group. Looks like a different underlying image might not be able to support this kind of pymanager install, but have no experience really =)

More info on what issues I had:

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, fair enough. Can you open an issue so that it can be investigated later?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done: #48469

Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,9 @@ FROM ${base}
ARG python=3.10

# Use python_abi_tag env var to select regular or free-threaded Python
ARG freethreaded=0
ENV PYTHON_MODE=${freethreaded}
RUN if "%PYTHON_MODE%"=="1" ( \
pymanager install --version %PYTHON_VERSION% --variant freethreaded \
) else ( \
pymanager install --version %PYTHON_VERSION% \
)
ARG python_variant=default
ENV PYTHON_VARIANT=${python_variant}
RUN pymanager install --version %PYTHON_VERSION% --variant %PYTHON_VARIANT%

RUN %PYTHON_CMD% -m pip install -U pip setuptools

Expand Down
4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1388,7 +1388,7 @@ services:
args:
base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
python: ${PYTHON}
freethreaded: 0
python_variant: default
context: .
dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
# This should make the pushed images reusable, but the image gets rebuilt.
Expand All @@ -1405,7 +1405,7 @@ services:
args:
base: ${REPO}:python-wheel-windows-vs2022-base-vcpkg-${VCPKG}-${PYTHON_WHEEL_WINDOWS_IMAGE_REVISION}
python: ${PYTHON}
freethreaded: 1
python_variant: freethreaded
context: .
dockerfile: ci/docker/python-wheel-windows-vs2022.dockerfile
# This should make the pushed images reusable, but the image gets rebuilt.
Expand Down