From e3ece4834fe6b3a68e02b6fefccaef8f5dc66223 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:03:16 -0400 Subject: [PATCH] update-version-0.15.0 (#1446) * [create-pull-request] automated change * Updated some refs from last ray image changes * Update .github/workflows/update-component-versions.yaml Co-authored-by: Paul Schweigert * Remove version from test * Update helm publish gha --------- Co-authored-by: Tansito <9059044+Tansito@users.noreply.github.com> Co-authored-by: Paul Schweigert --- .github/workflows/publish-helm.yaml | 2 +- .github/workflows/update-component-versions.yaml | 2 +- CONTRIBUTING.md | 2 +- charts/qiskit-serverless/Chart.lock | 6 +++--- charts/qiskit-serverless/Chart.yaml | 6 +++--- charts/qiskit-serverless/charts/gateway/Chart.yaml | 4 ++-- charts/qiskit-serverless/charts/gateway/values.yaml | 4 ++-- charts/qiskit-serverless/values.yaml | 6 +++--- client/qiskit_serverless/VERSION.txt | 2 +- client/tests/README.md | 2 +- client/tests/resources/test-compose.yaml | 2 +- docker-compose.yaml | 6 +++--- docs/deployment/cloud.rst | 4 ++-- docs/deployment/custom_function/Sample-Dockerfile | 2 +- docs/deployment/deploying_custom_image_function.rst | 2 +- docs/deployment/example_custom_image_function.rst | 2 +- gateway/main/settings.py | 2 +- proxy/tox.ini | 2 +- tests/basic/function/Sample-Docker | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/publish-helm.yaml b/.github/workflows/publish-helm.yaml index de19d9c7a..57244dbbb 100644 --- a/.github/workflows/publish-helm.yaml +++ b/.github/workflows/publish-helm.yaml @@ -5,7 +5,7 @@ on: types: [published] permissions: - contents: read + contents: write jobs: package: diff --git a/.github/workflows/update-component-versions.yaml b/.github/workflows/update-component-versions.yaml index e6d9224da..54ead635f 100644 --- a/.github/workflows/update-component-versions.yaml +++ b/.github/workflows/update-component-versions.yaml @@ -60,7 +60,7 @@ jobs: shell: bash run: | sed -i "s/${OLDNUM}/${NEWNUM}/g" docs/deployment/cloud.rst - sed -i "s/${OLDNUM}-py310/${NEWNUM}-py310/g" docs/deployment/deploying_custom_image_function.rst + sed -i "s/${OLDNUM}-py310/${NEWNUM}/g" docs/deployment/deploying_custom_image_function.rst - name: Create PR id: cpr uses: peter-evans/create-pull-request@cd5c7e4b8bff84befe9c12e7cffbecfda02c7ce9 #6.1.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a44e8d563..df30b217c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -217,7 +217,7 @@ git rebase main issue-1234-new-feature ### Adding tests Our team upholds the philosophy that a healthy codebase will include the proper amount of testing. -From the project you are working on, you can run tests with `tox -epy310`. +From the project you are working on, you can run tests with `tox -epy311`. Note if you run this command from qiskit-serverless top directory, it will build the project documentation. For detailed testing guidelines using tox environments, please refer to [this documentation](./client/tests/README.md). diff --git a/charts/qiskit-serverless/Chart.lock b/charts/qiskit-serverless/Chart.lock index bfc617f12..17ec67351 100644 --- a/charts/qiskit-serverless/Chart.lock +++ b/charts/qiskit-serverless/Chart.lock @@ -1,7 +1,7 @@ dependencies: - name: gateway repository: "" - version: 0.14.2 + version: 0.15.0 - name: nginx-ingress-controller repository: https://charts.bitnami.com/bitnami version: 9.11.0 @@ -11,5 +11,5 @@ dependencies: - name: kuberay-operator repository: https://ray-project.github.io/kuberay-helm version: 1.1.1 -digest: sha256:31e0c7ee15c26725bd1b559f24fa30fbdab506de77afc0311c6657ddf890ed2c -generated: "2024-08-01T16:29:27.215746-04:00" +digest: sha256:ae36b6484ca8d81355ba63f079abad6f1c9e0677be890d63e3c47ca3ccbe73b8 +generated: "2024-08-06T22:24:25.007524029Z" diff --git a/charts/qiskit-serverless/Chart.yaml b/charts/qiskit-serverless/Chart.yaml index bf35ee888..75b588a34 100644 --- a/charts/qiskit-serverless/Chart.yaml +++ b/charts/qiskit-serverless/Chart.yaml @@ -4,13 +4,13 @@ description: Qiskit-Serverless helm chart that contains different dependencies. type: application -version: 0.14.2 -appVersion: "0.14.2" +version: 0.15.0 +appVersion: "0.15.0" dependencies: - name: gateway condition: gatewayEnable - version: 0.14.2 + version: 0.15.0 - name: nginx-ingress-controller condition: nginxIngressControllerEnable version: 9.11.0 diff --git a/charts/qiskit-serverless/charts/gateway/Chart.yaml b/charts/qiskit-serverless/charts/gateway/Chart.yaml index cdd35740e..e5c2ce350 100644 --- a/charts/qiskit-serverless/charts/gateway/Chart.yaml +++ b/charts/qiskit-serverless/charts/gateway/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.14.2 +version: 0.15.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.14.2" +appVersion: "0.15.0" diff --git a/charts/qiskit-serverless/charts/gateway/values.yaml b/charts/qiskit-serverless/charts/gateway/values.yaml index 4af216831..757ed72ee 100644 --- a/charts/qiskit-serverless/charts/gateway/values.yaml +++ b/charts/qiskit-serverless/charts/gateway/values.yaml @@ -18,7 +18,7 @@ application: superuser: enable: true ray: - nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2" + nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0" cpu: 2 memory: 2 replicas: 1 @@ -26,7 +26,7 @@ application: maxReplicas: 4 opensslImage: registry.access.redhat.com/ubi8/openssl:8.8-9 kubectlImage: alpine/k8s:1.29.2@sha256:a51aa37f0a34ff827c7f2f9cb7f6fbb8f0e290fa625341be14c2fcc4b1880f60 - proxyImage: "icr.io/quantum-public/qiskit-serverless/proxy:0.14.2" + proxyImage: "icr.io/quantum-public/qiskit-serverless/proxy:0.15.0" scrapeWithPrometheus: true openTelemetry: false openTelemetryCollector: diff --git a/charts/qiskit-serverless/values.yaml b/charts/qiskit-serverless/values.yaml index 26c3a9a00..e624403e8 100644 --- a/charts/qiskit-serverless/values.yaml +++ b/charts/qiskit-serverless/values.yaml @@ -2,7 +2,7 @@ # Qiskit Serverless Info # =================== global: - version: 0.14.2 + version: 0.15.0 # =================== # Qiskit Serverless configs @@ -47,7 +47,7 @@ gateway: image: repository: "icr.io/quantum-public/qiskit-serverless/gateway" pullPolicy: IfNotPresent - tag: "0.14.2" + tag: "0.15.0" application: siteHost: "http://gateway:8000" rayHost: "http://kuberay-head-svc:8265" @@ -59,7 +59,7 @@ gateway: type: ClusterIP port: 8000 ray: - nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2" + nodeImage: "icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0" opensslImage: registry.access.redhat.com/ubi8/openssl:8.8-9 kubectlImage: alpine/k8s:1.29.2@sha256:a51aa37f0a34ff827c7f2f9cb7f6fbb8f0e290fa625341be14c2fcc4b1880f60 limits: diff --git a/client/qiskit_serverless/VERSION.txt b/client/qiskit_serverless/VERSION.txt index 1c16bd1a4..7092c7c46 100644 --- a/client/qiskit_serverless/VERSION.txt +++ b/client/qiskit_serverless/VERSION.txt @@ -1 +1 @@ -0.14.2 \ No newline at end of file +0.15.0 \ No newline at end of file diff --git a/client/tests/README.md b/client/tests/README.md index 0e8e0ea2e..a29f82f11 100644 --- a/client/tests/README.md +++ b/client/tests/README.md @@ -39,7 +39,7 @@ The command `tox -eblack` will reformat all files in the repository according to The `py##` environments are the main test environments. tox defines one for each version of Python. For instance, the following command will run the tests on Python 3.9 and Python 3.10: ```sh -$ tox -epy39,py310 +$ tox -epy311 ``` First, these environments execute all tests using [pytest], which supports its own simple style of tests, in addition to [unittest]-style tests and [doctests] located throughout the project's docstrings. diff --git a/client/tests/resources/test-compose.yaml b/client/tests/resources/test-compose.yaml index 618f440d8..9cbfac5b0 100644 --- a/client/tests/resources/test-compose.yaml +++ b/client/tests/resources/test-compose.yaml @@ -1,7 +1,7 @@ services: testrayhead: container_name: testrayhead - image: icr.io/quantum-public/qiskit-serverless/ray-node:latest-py310 + image: icr.io/quantum-public/qiskit-serverless/ray-node:latest entrypoint: [ "ray", "start", "--head", "--port=6379", "--dashboard-host=0.0.0.0", "--block" diff --git a/docker-compose.yaml b/docker-compose.yaml index de811b19b..f03b94327 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ services: ray-head: user: "0" container_name: ray-head - image: icr.io/quantum-public/qiskit-serverless/ray-node:${VERSION:-0.14.2}-py310 + image: icr.io/quantum-public/qiskit-serverless/ray-node:${VERSION:-0.15.0} entrypoint: [ "ray", "start", "--head", "--port=6379", "--dashboard-host=0.0.0.0", "--block" @@ -28,7 +28,7 @@ services: always gateway: container_name: gateway - image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.2} + image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.15.0} command: gunicorn main.wsgi:application --bind 0.0.0.0:8000 --workers=4 ports: - 8000:8000 @@ -53,7 +53,7 @@ services: - postgres scheduler: container_name: scheduler - image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.14.2} + image: icr.io/quantum-public/qiskit-serverless/gateway:${VERSION:-0.15.0} entrypoint: "./scripts/scheduler.sh" environment: - DEBUG=0 diff --git a/docs/deployment/cloud.rst b/docs/deployment/cloud.rst index d60638184..65dbb883c 100644 --- a/docs/deployment/cloud.rst +++ b/docs/deployment/cloud.rst @@ -84,7 +84,7 @@ Once your cluster is ready, the installation is relatively straightforward with and run the next commands: .. code-block:: - :caption: run this commands with the release version like 0.14.2 in x.y.z (2 places) + :caption: run this commands with the release version like 0.15.0 in x.y.z (2 places) $ helm -n install qiskit-serverless --create-namespace https://github.com/Qiskit/qiskit-serverless/releases/download/vx.y.z/qiskit-serverless-x.y.z.tgz @@ -119,6 +119,6 @@ with the configuration of your domain and provider. Optionally, you can install an observability package to handle logging and monitoring on your cluster by running the following command: .. code-block:: - :caption: run this commands with the release version like 0.14.2 in x.y.z (2 places) using the same namespace as in the previous helm command + :caption: run this commands with the release version like 0.15.0 in x.y.z (2 places) using the same namespace as in the previous helm command $ helm -n install qs-observability https://github.com/Qiskit/qiskit-serverless/releases/download/vx.y.z/qs-observability-x.y.z.tgz diff --git a/docs/deployment/custom_function/Sample-Dockerfile b/docs/deployment/custom_function/Sample-Dockerfile index 01c411637..437adcd68 100644 --- a/docs/deployment/custom_function/Sample-Dockerfile +++ b/docs/deployment/custom_function/Sample-Dockerfile @@ -1,4 +1,4 @@ -FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2-py310@sha256:e012a6f7159b2660dd87af15bf85029fe62bec22e6bef7d99e54ca0cfa4f3aa6 +FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0 # install all necessary dependencies for your custom image diff --git a/docs/deployment/deploying_custom_image_function.rst b/docs/deployment/deploying_custom_image_function.rst index e710c6be9..30812c7ca 100644 --- a/docs/deployment/deploying_custom_image_function.rst +++ b/docs/deployment/deploying_custom_image_function.rst @@ -50,7 +50,7 @@ In our simple case it will look something like this: .. code-block:: :caption: Dockerfile for custom image function. - FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2-py310 + FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0 # install all necessary dependencies for your custom image diff --git a/docs/deployment/example_custom_image_function.rst b/docs/deployment/example_custom_image_function.rst index 67b8ef0c9..2fac0dd2c 100644 --- a/docs/deployment/example_custom_image_function.rst +++ b/docs/deployment/example_custom_image_function.rst @@ -49,7 +49,7 @@ Dockerfile .. code-block:: :caption: Dockerfile - FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2-py310 + FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0 # install all necessary dependencies for your custom image diff --git a/gateway/main/settings.py b/gateway/main/settings.py index c5a8f9808..65010fd47 100644 --- a/gateway/main/settings.py +++ b/gateway/main/settings.py @@ -320,7 +320,7 @@ ), } RAY_NODE_IMAGE = os.environ.get( - "RAY_NODE_IMAGE", "icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2" + "RAY_NODE_IMAGE", "icr.io/quantum-public/qiskit-serverless/ray-node:0.15.0" ) RAY_CLUSTER_WORKER_REPLICAS = int(os.environ.get("RAY_CLUSTER_WORKER_REPLICAS", "1")) RAY_CLUSTER_WORKER_REPLICAS_MAX = int( diff --git a/proxy/tox.ini b/proxy/tox.ini index 9da147a04..5a1ed1aa1 100644 --- a/proxy/tox.ini +++ b/proxy/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.1 -envlist = py39, py310, lint, coverage +envlist = py311, lint, coverage # CI: skip-next-line skipsdist = true # CI: skip-next-line diff --git a/tests/basic/function/Sample-Docker b/tests/basic/function/Sample-Docker index cd4381090..f3d80c4ea 100644 --- a/tests/basic/function/Sample-Docker +++ b/tests/basic/function/Sample-Docker @@ -1,4 +1,4 @@ -FROM icr.io/quantum-public/qiskit-serverless/ray-node:0.14.2-py310 +FROM icr.io/quantum-public/qiskit-serverless/ray-node:latest # install all necessary dependencies for your custom image