From 34f016537d9beeb8aeb11486da9e7567ee881168 Mon Sep 17 00:00:00 2001
From: barshaul <barshaul@amazon.com>
Date: Mon, 25 Nov 2024 15:18:04 +0200
Subject: [PATCH] remov container from matrix

Signed-off-by: barshaul <barshaul@amazon.com>
Signed-off-by: avifenesh <aviarchi1994@gmail.com>
---
 .github/json_matrices/build-matrix.json |  3 +--
 .github/workflows/pypi-cd.yml           | 18 ++++++++----------
 python/pyproject.toml                   |  6 +++---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.github/json_matrices/build-matrix.json b/.github/json_matrices/build-matrix.json
index 8d79aa95bf..0d0e7c10bb 100644
--- a/.github/json_matrices/build-matrix.json
+++ b/.github/json_matrices/build-matrix.json
@@ -16,8 +16,7 @@
         "ARCH": "arm64",
         "TARGET": "aarch64-unknown-linux-gnu",
         "PACKAGE_MANAGERS": ["pypi", "npm", "maven"],
-        "languages": ["python", "node", "java", "go", "dotnet"],
-        "CONTAINER": "2_28"
+        "languages": ["python", "node", "java", "go", "dotnet"]
     },
     {
         "OS": "macos",
diff --git a/.github/workflows/pypi-cd.yml b/.github/workflows/pypi-cd.yml
index 11d2cc9378..1cd2f0267b 100644
--- a/.github/workflows/pypi-cd.yml
+++ b/.github/workflows/pypi-cd.yml
@@ -117,7 +117,6 @@ jobs:
               uses: actions/setup-python@v5
               with:
                   python-version: |
-                    3.8
                     3.9
                     3.10
                     3.11
@@ -152,9 +151,9 @@ jobs:
               with:
                   working-directory: ./python
                   target: ${{ matrix.build.TARGET }}
-                  args: --release --strip --out wheels -i ${{ github.event_name != 'pull_request' && 'python3.8 python3.9 python3.10 python3.11 python3.12 python3.13' || 'python3.12' }}
+                  args: --release --strip --out wheels -i ${{ github.event_name != 'pull_request' && 'python3.9 python3.10 python3.11 python3.12 python3.13' || 'python3.13' }}
                   manylinux: auto
-                  container: ${{ matrix.build.CONTAINER != '' && matrix.build.CONTAINER || '2014' }}
+                  container: ${{ contains(matrix.build.RUNNER, 'self-hosted') && '2_28' || '2014' }}
                   before-script-linux: |
                       # Install protobuf compiler
                       if [[ $(`which apt`) != '' ]]
@@ -180,10 +179,10 @@ jobs:
               if: startsWith(matrix.build.NAMED_OS, 'darwin')
               uses: PyO3/maturin-action@v1
               with:
-                  maturin-version: "0.14.14" # Due to a bug in later versions
+                  maturin-version: latest                 
                   working-directory: ./python
                   target: ${{ matrix.build.TARGET }}
-                  args: --release --strip --out wheels -i  ${{ github.event_name != 'pull_request' && 'python3.8 python3.9 python3.10 python3.11 python3.12 python3.13' || 'python3.12' }}
+                  args: --release --strip --out wheels -i  ${{ github.event_name != 'pull_request' && 'python3.9 python3.10 python3.11 python3.12 python3.13' || 'python3.13' }}
 
             - name: Upload Python wheels
               if: github.event_name != 'pull_request'
@@ -229,7 +228,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.12
+                  python-version: 3.13
 
             - name: Install engine
               uses: ./.github/workflows/install-engine
@@ -242,12 +241,11 @@ jobs:
                   if [[ "${GITHUB_REF:11}" == *"rc"* ]]
                   then
                     echo "This is a release candidate"
-                    export pip_pre="--pre"
+                    echo "DISTRIBUTION_TAG=--pre" >> $GITHUB_ENV
                   else
                     echo "This is a stable release"
-                    export pip_pre=""
+                    echo "DISTRIBUTION_TAG=" >> $GITHUB_ENV
                   fi
-                  echo "PIP_PRE=${pip_pre}" >> $GITHUB_ENV
 
             - name: Run the tests
               shell: bash
@@ -256,7 +254,7 @@ jobs:
                   python -m venv venv
                   source venv/bin/activate
                   pip install -U pip
-                  pip install ${PIP_PRE} valkey-glide
+                  pip install ${DISTRIBUTION_TAG} valkey-glide
                   python rc_test.py
 
             # Reset the repository to make sure we get the clean checkout of the action later in other actions.
diff --git a/python/pyproject.toml b/python/pyproject.toml
index fdb83bc99e..67c0981979 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -8,7 +8,7 @@ requires-python = ">=3.8"
 dependencies = [
     "async-timeout>=4.0.2; python_version < '3.11'",
     "typing-extensions>=4.8.0; python_version < '3.11'",
-    "protobuf>=3.20"
+    "protobuf>=3.20",
 ]
 classifiers = [
     "Topic :: Database",
@@ -30,7 +30,7 @@ max-line-length = 127
 extend-ignore = ['E203']
 
 [tool.black]
-target-version = ['py38', 'py39', 'py310', 'py311', 'py312']
+target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 
 [tool.mypy]
-exclude = [ 'submodules', 'utils/release-candidate-testing' ]
+exclude = ['submodules', 'utils/release-candidate-testing']