remov container from matrix

Signed-off-by: barshaul <[email protected]> Signed-off-by: avifenesh <[email protected]>
valkey-io · Nov 26, 2024 · 7651926 · 7651926
1 parent 7a6e0ea
commit 7651926
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 27 deletions.
diff --git 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/json_matrices/supported-languages-versions.json b/.github/json_matrices/supported-languages-versions.json
@@ -6,8 +6,8 @@
     },
     {
         "language": "python",
-        "versions": ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
-        "always-run-versions": ["3.8", "3.13"]
+        "versions": ["3.9", "3.10", "3.11", "3.12", "3.13"],
+        "always-run-versions": ["3.9", "3.13"]
     },
     {
         "language": "node",

diff --git 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/Pipfile b/python/Pipfile
@@ -8,4 +8,4 @@ name = "pypi"
 [dev-packages]
 
 [requires]
-python_version = "3.8"
+python_version = "3.9"
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["maturin>=1.0,<2.0"]
+requires = ["maturin==0.15.2"]
 build-backend = "maturin"
 
 [project]
@@ -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']
diff --git a/python/python/glide/async_commands/standalone_commands.py b/python/python/glide/async_commands/standalone_commands.py
@@ -2,19 +2,17 @@
 
 from __future__ import annotations
 
-from typing import Any, Dict, List, Mapping, Optional, Set, Union, cast
+from typing import Dict, List, Mapping, Optional, Union, cast
 
-from glide.async_commands.command_args import Limit, ObjectType, OrderBy
+from glide.async_commands.command_args import ObjectType
 from glide.async_commands.core import (
     CoreCommands,
     FlushMode,
     FunctionRestorePolicy,
     InfoSection,
-    _build_sort_args,
 )
 from glide.async_commands.transaction import Transaction
 from glide.constants import (
-    OK,
     TOK,
     TEncodable,
     TFunctionListResponse,
@@ -23,7 +21,7 @@
 )
 from glide.protobuf.command_request_pb2 import RequestType
 
-from ..glide import ClusterScanCursor, Script
+from ..glide import Script
 
 
 class StandaloneCommands(CoreCommands):

diff --git a/python/python/tests/conftest.py b/python/python/tests/conftest.py
@@ -12,7 +12,7 @@
     ReadFrom,
     ServerCredentials,
 )
-from glide.exceptions import ClosingError, RequestError
+from glide.exceptions import ClosingError
 from glide.glide_client import GlideClient, GlideClusterClient, TGlideClient
 from glide.logger import Level as logLevel
 from glide.logger import Logger

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,8 +1,7 @@
 async-timeout==4.0.2;python_version<"3.11"
-maturin>=0.13.0
+maturin==0.15.2 # higher version break the needs structure changes, the name of the project is not the same as the package name, and the naming both glide create a circular dependency - TODO: fix this 
 protobuf==3.20.*
 pytest
 pytest-asyncio
 typing_extensions==4.8.0;python_version<"3.11"
 pytest-html
-pyrsistent