Skip to content

Commit 2592eb6

Browse files
committed
Merge remote-tracking branch 'origin/main' into use-zstd-layers
2 parents d6d3c0c + fa9f1c3 commit 2592eb6

31 files changed

+3101
-1442
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ jobs:
234234
strategy:
235235
matrix:
236236
platform: [amd64, arm64]
237-
python_version: ['3.10', '3.13']
237+
python_version: ['3.11', '3.13']
238238
cuda_version: ["11.8", "12.0"]
239239
fail-fast: false
240240
uses: ./.github/workflows/python_wheels.yml
@@ -255,7 +255,7 @@ jobs:
255255
uses: ./.github/workflows/python_metapackages.yml
256256
with:
257257
cudaq_version: ${{ needs.python_wheels.outputs.cudaq_version }}
258-
python_versions: "['3.10', '3.13']"
258+
python_versions: "['3.11', '3.13']"
259259
cuda_versions: "['', '11.8', '12.0']"
260260
wheel_artifacts: 'pycudaq-*'
261261

.github/workflows/config/validation_config.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"operating_systems":
77
[
88
"ubuntu:22.04",
9-
"fedora:39"
9+
"fedora:41"
1010
]
1111
},
1212
{
@@ -15,7 +15,7 @@
1515
[
1616
"ubuntu:22.04",
1717
"debian:12",
18-
"fedora:38",
18+
"fedora:41",
1919
"redhat/ubi9:9.2"
2020
]
2121
},
@@ -24,15 +24,15 @@
2424
"operating_systems":
2525
[
2626
"ubuntu:24.04",
27-
"fedora:39",
27+
"fedora:41",
2828
"redhat/ubi9:9.2"
2929
]
3030
},
3131
{
3232
"version": "3.13",
3333
"operating_systems":
3434
[
35-
"fedora:39"
35+
"fedora:41"
3636
]
3737
}
3838
],
@@ -47,7 +47,7 @@
4747
"debian:12",
4848
"redhat/ubi9:9.2",
4949
"opensuse/leap:15.5",
50-
"fedora:39"
50+
"fedora:41"
5151
],
5252
"ubuntu:22.04":
5353
{
@@ -73,11 +73,11 @@
7373
"cudart_version": "12.0",
7474
"cuda_distribution": "opensuse15"
7575
},
76-
"fedora:39":
76+
"fedora:41":
7777
{
7878
"libcdev_package": "glibc-devel",
7979
"cudart_version": "12.4",
80-
"cuda_distribution": "fedora39"
80+
"cuda_distribution": "fedora41"
8181
}
8282
},
8383
{
@@ -88,7 +88,7 @@
8888
"ubuntu:22.04",
8989
"redhat/ubi8:8.0",
9090
"opensuse/leap:15.5",
91-
"fedora:38"
91+
"fedora:41"
9292
],
9393
"ubuntu:22.04":
9494
{
@@ -108,7 +108,7 @@
108108
"cudart_version": "11.8",
109109
"cuda_distribution": "opensuse15"
110110
},
111-
"fedora:38":
111+
"fedora:41":
112112
{
113113
"libcdev_package": "glibc-devel",
114114
"cudart_version": "11.8",
@@ -143,7 +143,7 @@
143143
[
144144
"ubuntu:22.04",
145145
"redhat/ubi8:8.0",
146-
"fedora:38"
146+
"fedora:41"
147147
],
148148
"ubuntu:22.04":
149149
{
@@ -157,7 +157,7 @@
157157
"cudart_version": "11.8",
158158
"cuda_distribution": "rhel9"
159159
},
160-
"fedora:38":
160+
"fedora:41":
161161
{
162162
"libcdev_package": "glibc-devel",
163163
"cudart_version": "11.8",

docker/test/wheels/fedora.Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# the terms of the Apache License 2.0 which accompanies this distribution. #
77
# ============================================================================ #
88

9-
ARG base_image=fedora:38
9+
ARG base_image=fedora:41
1010
FROM ${base_image}
1111

1212
ARG python_version=3.10
@@ -15,9 +15,7 @@ ARG preinstalled_modules="numpy pytest nvidia-cublas-cu12"
1515

1616
ARG DEBIAN_FRONTEND=noninteractive
1717

18-
# Some Python versions need the latest version of libexpat on Fedora, and the
19-
# base fedora:38 image doesn't have the latest version installed.
20-
RUN dnf update -y --nobest expat \
18+
RUN dnf install -y --refresh --setopt=install_weak_deps=False expat \
2119
&& dnf install -y --nobest --setopt=install_weak_deps=False wget \
2220
python$(echo $python_version | tr -d .) \
2321
&& python${python_version} -m ensurepip --upgrade

docs/sphinx/examples/python/dynamics/cavity_qed.py

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)