From a8a7ed2fea4116652db64fcb1a5317eaf6c15d95 Mon Sep 17 00:00:00 2001 From: phoebusm Date: Mon, 25 Nov 2024 13:41:00 +0000 Subject: [PATCH 1/8] Add pypi python 3.13 build to the pipeline --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0043661b54..6928b902e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -130,7 +130,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11]')}} + python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -163,7 +163,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12, 13]')}} include: - python_deps_ids: [""] matrix_override: ${{fromJson(needs.common_config.outputs.linux_matrix)}} @@ -211,7 +211,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12, 13]')}} name: 3.${{matrix.python3}} Windows uses: ./.github/workflows/build_steps.yml secrets: inherit @@ -231,7 +231,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -253,7 +253,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11]')}} + python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] From 51c70cf2de3a265e3798df65aa2859f75359653c Mon Sep 17 00:00:00 2001 From: phoebusm Date: Thu, 19 Dec 2024 19:06:43 +0000 Subject: [PATCH 2/8] Update grpcio for protobuf version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 64a500c4b0..093c0df786 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def _log_and_run(*cmd, **kwargs): class CompileProto(Command): # When adding new protobuf versions, also update: setup.cfg, python/arcticdb/__init__.py - _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.49", "5": ">=1.64"} + _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.49", "5": ">=1.68.1"} description = '"protoc" generate code _pb2.py from .proto files' user_options = [ From 44bf9c9ca75c748c67a651040c8b88664142594b Mon Sep 17 00:00:00 2001 From: phoebusm Date: Fri, 20 Dec 2024 11:56:20 +0000 Subject: [PATCH 3/8] Upgrade grpc pin --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 093c0df786..13d0c58f2c 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def _log_and_run(*cmd, **kwargs): class CompileProto(Command): # When adding new protobuf versions, also update: setup.cfg, python/arcticdb/__init__.py - _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.49", "5": ">=1.68.1"} + _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.68.1", "5": ">=1.68.1"} description = '"protoc" generate code _pb2.py from .proto files' user_options = [ From c02732524b3e484312f6a00b88e7187233a4e809 Mon Sep 17 00:00:00 2001 From: phoebusm Date: Fri, 20 Dec 2024 12:03:57 +0000 Subject: [PATCH 4/8] update pin --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 13d0c58f2c..83e93a778d 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def _log_and_run(*cmd, **kwargs): class CompileProto(Command): # When adding new protobuf versions, also update: setup.cfg, python/arcticdb/__init__.py - _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.68.1", "5": ">=1.68.1"} + _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.66.2", "5": ">=1.68.1"} description = '"protoc" generate code _pb2.py from .proto files' user_options = [ From fbccd5ac87157e2890cb8d02f574f6a7d32b5ede Mon Sep 17 00:00:00 2001 From: phoebusm Date: Fri, 20 Dec 2024 12:21:12 +0000 Subject: [PATCH 5/8] Update requirement --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 83e93a778d..b95edf3bc8 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ def _log_and_run(*cmd, **kwargs): class CompileProto(Command): # When adding new protobuf versions, also update: setup.cfg, python/arcticdb/__init__.py - _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.66.2", "5": ">=1.68.1"} + _PROTOBUF_TO_GRPC_VERSION = {"3": "<1.31", "4": ">=1.49", "5": ">=1.68.1"} description = '"protoc" generate code _pb2.py from .proto files' user_options = [ @@ -74,6 +74,10 @@ def run(self): # Not compatible with Python<=3.7 as # GRPCIO >= 1.64.0 is not available on Python<=3.7 https://pypi.org/project/grpcio-tools/1.64.0/#files print(f"Python protobuf {proto_ver} does not run on Python {python}. Skipping...") + elif not ARCTICDB_USING_CONDA and python >= (3, 13) and proto_ver < "5": + # Not compatible with protobuf<5.26.1 as + # Python 3.13 requires GRPCIO >= 1.66.2, which requires protobuf >=5.26.1 https://github.com/grpc/grpc/blob/6fa8043bf9befb070b846993b59a3348248e6566/requirements.txt#L4 + print(f"Python protobuf {proto_ver} does not run on Python {python}. Skipping...") else: self._compile_one_version(proto_ver, os.path.join(output_dir, proto_ver)) From d1880f3e7a5d02811a26e35f3c84fc924af916e2 Mon Sep 17 00:00:00 2001 From: phoebusm Date: Fri, 20 Dec 2024 16:09:40 +0000 Subject: [PATCH 6/8] Update how to select cp313 --- .github/workflows/build_steps.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index 423c4cd9a5..0b8bff5eb2 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -303,7 +303,13 @@ jobs: - name: Select Python (Linux) if: matrix.os == 'linux' - run: echo /opt/python/${{env.python_impl_name}}*/bin >> $GITHUB_PATH + run: | + #there are cp313 and cp313t + if [[ "${{env.python_impl_name}}" == "cp313" ]]; then + echo /opt/python/cp313-cp313/bin >> $GITHUB_PATH; + else + echo /opt/python/${{env.python_impl_name}}*/bin >> $GITHUB_PATH; + fi - name: Select Python (Windows) if: matrix.os == 'windows' From 4e9bbec626757f86bf29b49894f2811f8c998f33 Mon Sep 17 00:00:00 2001 From: phoebusm Date: Tue, 24 Dec 2024 19:16:17 +0000 Subject: [PATCH 7/8] Add missing version --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6928b902e0..14e31b6c7b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -231,7 +231,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] From 130c96c5f3a906a95b4332bc1cbac7b738e8b195 Mon Sep 17 00:00:00 2001 From: phoebusm Date: Wed, 15 Jan 2025 15:59:01 +0000 Subject: [PATCH 8/8] Remove py312 related changes --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14e31b6c7b..818b8db00c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -130,7 +130,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -231,7 +231,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -253,7 +253,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}} + python3: ${{fromJson(vars.WINDOWS_PYTHON_VERSIONS || '[7, 8, 9, 10, 11]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""]