From 6af9012568d7694bf98418b285770222d084c765 Mon Sep 17 00:00:00 2001 From: MScatolin Date: Wed, 27 Nov 2024 14:00:09 -0800 Subject: [PATCH 1/9] lock req versions + release number --- setup.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index c069c5ce..f9fcaa2c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = farm_ng_core -version = 2.3.2-dev +version = 2.3.2 description = long_description = file: README.md long_description_content_type = text/markdown @@ -22,8 +22,9 @@ classifiers = [options] python_requires = >=3.8 install_requires = - protobuf==5.27.2 - grpcio==1.64.1 + grpcio==1.56.2 + grpcio-tools==1.56.2 + protobuf==4.23.4 psutil numpy From 28f0485a536e0d83819dfdaa95be4aeea4fc9629 Mon Sep 17 00:00:00 2001 From: Marcelo Scatolin Queiroz Date: Wed, 27 Nov 2024 17:01:29 -0800 Subject: [PATCH 2/9] remove reqs from pproject.toml --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f0b21502..3ac3d15f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,8 +3,5 @@ requires = [ "setuptools", "farm-ng-package", "pybind11", - "wheel", - "grpcio==1.64.1", - "grpcio-tools==1.64.1", ] build-backend = "setuptools.build_meta" From b6b0072c263c4ade19ef1416bd881c3dac4741f5 Mon Sep 17 00:00:00 2001 From: Marcelo Scatolin Queiroz Date: Wed, 27 Nov 2024 17:06:51 -0800 Subject: [PATCH 3/9] add wheel as req --- setup.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index f9fcaa2c..22676732 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,8 @@ classifiers = [options] python_requires = >=3.8 +setup_requires = + wheel install_requires = grpcio==1.56.2 grpcio-tools==1.56.2 From 1b8e0a1c9d307c2981c461c73fad851c79bf8271 Mon Sep 17 00:00:00 2001 From: Marcelo Scatolin Queiroz Date: Wed, 11 Dec 2024 15:05:38 -0800 Subject: [PATCH 4/9] setup.cfg match test versions --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 22676732..30dbbb42 100644 --- a/setup.cfg +++ b/setup.cfg @@ -44,7 +44,7 @@ test = pylint-protobuf anyio types-protobuf - grpcio-tools==1.64.1 + grpcio-tools==1.56.2 dev = %(test)s From cecf03c126db2b872bebc28d47936d2bf59264ca Mon Sep 17 00:00:00 2001 From: Marcelo Scatolin Queiroz Date: Fri, 13 Dec 2024 09:51:33 -0800 Subject: [PATCH 5/9] Update setup.cfg remove vesion lock fro grpcio --- setup.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 30dbbb42..58f6c456 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,9 +24,9 @@ python_requires = >=3.8 setup_requires = wheel install_requires = - grpcio==1.56.2 - grpcio-tools==1.56.2 - protobuf==4.23.4 + grpcio + grpcio-tools + protobuf==5.27.5 psutil numpy @@ -44,7 +44,7 @@ test = pylint-protobuf anyio types-protobuf - grpcio-tools==1.56.2 + grpcio-tools dev = %(test)s From db3cf7bbc8c19ebfc51bd79a71d699966e3c39bb Mon Sep 17 00:00:00 2001 From: Marcelo Scatolin Queiroz Date: Fri, 13 Dec 2024 10:08:06 -0800 Subject: [PATCH 6/9] protobuf version lock --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 58f6c456..dfeb5a46 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,8 @@ setup_requires = install_requires = grpcio grpcio-tools - protobuf==5.27.5 + # temporary until seg fault issue with protobuf>=5.28 is resolved in Brain's Image + protobuf<=5.27.5 psutil numpy From bc7f569f620ac5c27ba870516006199e45dd3aac Mon Sep 17 00:00:00 2001 From: Patrick Mihelich Date: Thu, 19 Dec 2024 11:58:18 -0600 Subject: [PATCH 7/9] Update version constant in setup.py. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ed556dfe..d36e6d6e 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,8 @@ from pybind11.setup_helpers import ParallelCompile, Pybind11Extension, build_ext from setuptools import setup -__version__ = "2.3.2-dev" +# This must match the version in setup.cfg. +__version__ = "2.3.2" platform_cxx_flags = [] From 32cc52fc52a5b276aebcbff5728012907ac9e059 Mon Sep 17 00:00:00 2001 From: Patrick Mihelich Date: Fri, 20 Dec 2024 13:13:34 -0600 Subject: [PATCH 8/9] Ensure a Python 3.12 compatible Cython. --- pyproject.toml | 5 +++++ setup.cfg | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3ac3d15f..17914965 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,5 +3,10 @@ requires = [ "setuptools", "farm-ng-package", "pybind11", + "wheel", + # Ensure a Cython compatible with Python 3.12: + # https://github.com/cython/cython/issues/5285 + "Cython>=0.29.37", + ] build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index dfeb5a46..5ad97f8b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,8 +21,6 @@ classifiers = [options] python_requires = >=3.8 -setup_requires = - wheel install_requires = grpcio grpcio-tools From abdd9fc0440df84a42564196540c99794fc5d342 Mon Sep 17 00:00:00 2001 From: Patrick Mihelich Date: Fri, 20 Dec 2024 14:31:28 -0600 Subject: [PATCH 9/9] Try forcing grpcio-tools 1.64.1 for proto code gen. Hoping this threads the needle between: * protoc compatible with protobuf 5.27.5. * Cython-generated code compatible with python 3.12. --- pyproject.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 17914965..0066512b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,13 @@ [build-system] requires = [ "setuptools", - "farm-ng-package", "pybind11", "wheel", - # Ensure a Cython compatible with Python 3.12: - # https://github.com/cython/cython/issues/5285 - "Cython>=0.29.37", - + # farm-ng-package v0.1.4 locks protobuf/grpcio versions to those on Brain. + # However, grpcio 1.56.2 contains Cython-generated code that is incompatible + # with Python 3.12. + # If this works, then we should yank v0.1.4 or update. + "farm-ng-package==0.1.3", + "grpcio-tools==1.64.1", ] build-backend = "setuptools.build_meta"