@@ -15,8 +15,8 @@ if [ "$(uname -m)" == "aarch64" ]; then
  PIP_INSTALL_COMMAND="$PY_VERSION -m pip install --no-cache-dir -q"
  PYTHON_COMMAND="$PY_VERSION"
 else
- declare -A python_map=( ["3.7"]="cp37-cp37m" ["3.8"]="cp38-cp38" ["3.9"]="cp39-cp39" ["3.10"]="cp310-cp310")
- declare -A python_include=( ["3.7"]="3.7m" ["3.8"]="3.8" ["3.9"]="3.9" ["3.10"]="3.10")
+ declare -A python_map=( ["3.7"]="cp37-cp37m" ["3.8"]="cp38-cp38" ["3.9"]="cp39-cp39" ["3.10"]="cp310-cp310" ["3.11"]="cp311-cp311")
+ declare -A python_include=( ["3.7"]="3.7m" ["3.8"]="3.8" ["3.9"]="3.9" ["3.10"]="3.10" ["3.11"]="3.11")
  PY_VER=${python_map[$PY_VERSION]}
  PIP_INSTALL_COMMAND="/opt/python/${PY_VER}/bin/pip install --no-cache-dir -q"
  PYTHON_COMMAND="/opt/python/${PY_VER}/bin/python"
 
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         # the different python versions for building wheels
-        python-version: [cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310]
+        python-version: [cp37-cp37m, cp38-cp38, cp39-cp39, cp310-cp310, cp311-cp311]
     env:
       # setting up python and docker image
       py: /opt/python/${{ matrix.python-version }}/bin/python
@@ -112,6 +112,7 @@ jobs:
           deactivate'
 
     - name: Verify ONNX with ONNX Runtime PyPI package
+      if: matrix.python-version != 'cp311-cp311'
       run: |
          docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
           ${{ env.img }} \
 
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         architecture: ['x64']
 
     steps:
@@ -87,6 +87,7 @@ jobs:
         pytest
 
     - name: Verify ONNX with ONNX Runtime PyPI package
+      if: matrix.python-version != '3.11'
       run: |
         python -m pip install -q onnxruntime
         python onnx/test/test_with_ort.py
@@ -20,7 +20,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         host-architecture: ['x64']
         target-architecture: ['x86_64', 'universal2']
 
@@ -103,6 +103,7 @@ jobs:
         pytest
 
     - name: Verify ONNX with ONNX Runtime PyPI package
+      if: matrix.python-version != '3.11'
       run: |
         python -m pip install -q onnxruntime
         python onnx/test/test_with_ort.py
 
@@ -16,8 +16,9 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        # TODO: Freeze as 3.10.5 for now; Follow-up this issue by https://github.com/actions/setup-python/issues/481
-        python-version: ['3.7', '3.8', '3.9', '3.10.5']
+        # TODO: Freeze as 3.10.5 for now and use the latest 3.10 after future numpy upgrade in ONNX;
+        # related issue: https://github.com/actions/setup-python/issues/481
+        python-version: ['3.7', '3.8', '3.9', '3.10.5', '3.11']
         architecture: ['x64', 'x86']
     steps:        
     - name: Checkout ONNX
@@ -93,12 +94,16 @@ jobs:
         python -m pip uninstall -y numpy onnx && python -m pip install numpy
         Get-ChildItem -Path dist/*.whl | foreach {python -m pip install --upgrade $_.fullname}
         pytest
-
+    # TODO: Remove one if condition after using consistent NumPy version for all Python versions
     - name: Verify ONNX with the minimum supported numpy  (from requirements.txt)
       if: ${{ always() }}
       run: |
         cd onnx
-        python -m pip uninstall -y numpy onnx && python -m pip install numpy==1.16.6
+        if ('${{ matrix.python-version }}' -eq '3.11') {
+          python -m pip uninstall -y numpy onnx && python -m pip install numpy==1.23.2
+        } else {
+          python -m pip uninstall -y numpy onnx && python -m pip install numpy==1.16.6
+        }
         Get-ChildItem -Path dist/*.whl | foreach {python -m pip install --upgrade $_.fullname}
         pytest
 
@@ -119,6 +124,7 @@ jobs:
         pytest
 
     - name: Verify ONNX with ONNX Runtime PyPI package
+      if: matrix.python-version != '3.11'
       run: |
         python -m pip install -q onnxruntime
         python onnx\onnx\test\test_with_ort.py
@@ -11,7 +11,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         architecture: ['x64']
     steps:
     - name: Checkout ONNX
 
@@ -1,4 +1,6 @@
-numpy == 1.21.5
+
+numpy==1.23.2; python_version >= "3.11"
+numpy==1.21.5; python_version < "3.11"
 protobuf == 3.20.2
 pytest
 nbval