Bump default python to 3.10 (#1273)

* use python 3.10 for gateway/ray deployments Signed-off-by: Paul S. Schweigert <[email protected]> * helm lint python version Signed-off-by: Paul S. Schweigert <[email protected]> * more places Signed-off-by: Paul S. Schweigert <[email protected]> * use python 3.10 in docker build action Signed-off-by: Paul S. Schweigert <[email protected]> * fix build containers test Signed-off-by: Paul S. Schweigert <[email protected]> * more changes Signed-off-by: Paul S. Schweigert <[email protected]> --------- Signed-off-by: Paul S. Schweigert <[email protected]>
Qiskit · Apr 10, 2024 · 5ea210d · 5ea210d
1 parent 10f6b19
commit 5ea210d
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 26 deletions.
diff --git a/.github/actions/helm-lint/action.yaml b/.github/actions/helm-lint/action.yaml
@@ -13,7 +13,7 @@ runs:
     # yamllint (https://github.com/adrienverge/yamllint) which require Python
     - uses: actions/setup-python@v4
       with:
-        python-version: '3.9'
+        python-version: '3.10'
         check-latest: true
 
     - name: Set up chart-testing

diff --git a/.github/workflows/build-containers-test.yaml b/.github/workflows/build-containers-test.yaml
@@ -18,15 +18,12 @@ jobs:
           - Dockerfile-ray-node
           - gateway/Dockerfile
         python:
-          - "3.8"
           - "3.9"
           - "3.10"
         exclude:
-          # gateway is only built using python 3.9
+          # gateway is only built using python 3.10
           - dockerfile: gateway/Dockerfile
-            python: "3.8"
-          - dockerfile: gateway/Dockerfile
-            python: "3.10"
+            python: "3.9"
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/client-pypi-release.yaml b/.github/workflows/client-pypi-release.yaml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   release:
     types: [published]
-    
+
 
 jobs:
   release-package:
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-python@v4
         name: Install Python
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install Deps
         run: pip install -U twine wheel
       - name: Build Artifacts

diff --git a/.github/workflows/client-verify.yaml b/.github/workflows/client-verify.yaml
@@ -12,7 +12,6 @@ jobs:
       fail-fast: false # keep running if one leg fails
       matrix:
         python-version:
-          - '3.8'
           - '3.9'
           - '3.10'
 

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -19,7 +19,7 @@ jobs:
         run: sleep 90
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: install dependencies
         shell: bash
         run: pip install client/

diff --git a/.github/workflows/docker-verify.yaml b/.github/workflows/docker-verify.yaml
@@ -59,7 +59,7 @@ jobs:
         include:
           - image: "quantum-serverless-gateway:latest"
             dockerfile: "./gateway/Dockerfile"
-            pyversion: "3.9"
+            pyversion: "3.10"
           - image: "quantum-serverless-ray-node:latest-py39"
             dockerfile: "Dockerfile-ray-node"
             pyversion: "py39"

diff --git a/.github/workflows/docs-verify.yaml b/.github/workflows/docs-verify.yaml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/notebook-local-verify.yaml b/.github/workflows/notebook-local-verify.yaml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: patch notebooks
         shell: bash
         run: |

diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/release-pull-request.yaml b/.github/workflows/release-pull-request.yaml
@@ -18,7 +18,7 @@ jobs:
         include:
           - image: "quantum-serverless-gateway:latest"
             dockerfile: "./gateway/Dockerfile"
-            pyversion: "3.9"
+            pyversion: "3.10"
           - image: "quantum-serverless-ray-node:latest-py39"
             dockerfile: "Dockerfile-ray-node"
             pyversion: "py39"

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -203,8 +203,8 @@ Add a new feature.
 The new feature will provide the possibility to do something awesome.
 ```
 
-From time to time, you want to check if your `main` branch is still up-to-date. If not, you will need to 
-[rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) 
+From time to time, you want to check if your `main` branch is still up-to-date. If not, you will need to
+[rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase)
 (or [merge](https://www.atlassian.com/git/tutorials/using-branches/git-merge)), then continue working:
 
 ```sh
@@ -218,8 +218,8 @@ 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 -epy39`.
+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`.
 Note if you run this command from quantum-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).
 
@@ -290,7 +290,7 @@ a core contributor.
 
 ## Code style
 
-Code in this repository should conform to [PEP8](https://peps.python.org/pep-0008/) standards. 
+Code in this repository should conform to [PEP8](https://peps.python.org/pep-0008/) standards.
 Style/lint checks are run to validate this. Line length must be limited to no more than 88 characters.
 
 **Readability** is what we value most. We expect reviewers to pay special attention on readability

diff --git a/Dockerfile-ray-node b/Dockerfile-ray-node
@@ -1,4 +1,4 @@
-ARG IMAGE_PY_VERSION=py39
+ARG IMAGE_PY_VERSION=py310
 
 FROM rayproject/ray:2.9.3-$IMAGE_PY_VERSION AS ray-node-amd64
 

diff --git a/charts/quantum-serverless/values.yaml b/charts/quantum-serverless/values.yaml
@@ -59,7 +59,7 @@ gateway:
       type: ClusterIP
       port: 8000
     ray:
-      nodeImage: "icr.io/quantum-public/quantum-serverless-ray-node:0.9.0-py39"
+      nodeImage: "icr.io/quantum-public/quantum-serverless-ray-node:0.9.0-py310"
       opensslImage: registry.access.redhat.com/ubi8/openssl:8.8-9
       kubectlImage: alpine/k8s:1.29.2@sha256:a51aa37f0a34ff827c7f2f9cb7f6fbb8f0e290fa625341be14c2fcc4b1880f60
     limits:

diff --git 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/quantum-serverless-ray-node:latest-py39
+    image: icr.io/quantum-public/quantum-serverless-ray-node:latest-py310
     entrypoint: [
       "ray", "start", "--head", "--port=6379",
       "--dashboard-host=0.0.0.0", "--block"

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -2,7 +2,7 @@
 services:
   ray-head:
     container_name: ray-head
-    image: icr.io/quantum-public/quantum-serverless-ray-node:${VERSION:-0.9.0}-py39
+    image: icr.io/quantum-public/quantum-serverless-ray-node:${VERSION:-0.9.0}-py310
     entrypoint: [
       "ray", "start", "--head", "--port=6379",
       "--dashboard-host=0.0.0.0", "--block"

diff --git a/gateway/Dockerfile b/gateway/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.16-slim-buster
+FROM python:3.10.12-slim-buster
 
 WORKDIR /usr/src/app
 

diff --git a/gateway/main/settings.py b/gateway/main/settings.py
@@ -315,7 +315,7 @@
     ),
 }
 RAY_NODE_IMAGE = os.environ.get(
-    "RAY_NODE_IMAGE", "icr.io/quantum-public/quantum-serverless-ray-node:0.7.1-py39"
+    "RAY_NODE_IMAGE", "icr.io/quantum-public/quantum-serverless-ray-node:0.9.0-py310"
 )
 RAY_NODE_IMAGES_MAP = {
     "default": RAY_NODE_IMAGE,
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ jobs: @@
           fail-fast: false # keep running if one leg fails
           matrix:
             python-version:
-              - '3.8'
               - '3.9'
               - '3.10'
@@ Expand Down @@