From df6e0a68d458ca84f99e73f839215f26fdb81f39 Mon Sep 17 00:00:00 2001 From: Josh Cole Date: Fri, 23 Feb 2024 09:51:06 -0500 Subject: [PATCH 1/6] update dependencies to support py3.12 --- requirements.txt | 11 ++++++----- setup.py | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4afa2bb..56e7165 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ -grpcio==1.54.0 -grpcio-tools==1.47.0 -protobuf==3.20.3 -pyarrow==10.0.1 -requests-toolbelt==1.0.0 \ No newline at end of file +grpcio==1.60.1 +grpcio-tools==1.60.1 +protobuf==4.25.3 +pandas==2.2.0 +pyarrow==15.0.0 +requests-toolbelt==1.0.0 diff --git a/setup.py b/setup.py index 8bb7548..16b801b 100644 --- a/setup.py +++ b/setup.py @@ -33,9 +33,10 @@ ], description="The RelationalAI Software Development Kit for Python", install_requires=[ - "pyarrow==10.0.1", + "pandas==2.2.0", + "pyarrow==15.0.0", "requests-toolbelt==1.0.0", - "protobuf==3.20.3"], + "protobuf==4.25.3"], license="http://www.apache.org/licenses/LICENSE-2.0", long_description="Enables access to the RelationalAI REST APIs from Python", long_description_content_type="text/markdown", From a8c88e3811bd53bcb33dd69b8a8973bd55cc80ca Mon Sep 17 00:00:00 2001 From: Josh Cole Date: Fri, 23 Feb 2024 10:25:10 -0500 Subject: [PATCH 2/6] bump version --- railib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railib/__init__.py b/railib/__init__.py index 6b2557f..ed48436 100644 --- a/railib/__init__.py +++ b/railib/__init__.py @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version_info__ = (0, 6, 20) +__version_info__ = (0, 7, 0) __version__ = ".".join(map(str, __version_info__)) From 764d7275b85723a2b508b04d49ce03ac9cea2bb9 Mon Sep 17 00:00:00 2001 From: Josh Cole Date: Fri, 23 Feb 2024 10:37:55 -0500 Subject: [PATCH 3/6] update version constraints to be more lenient to still allow py 3.7 and 3.8 support --- requirements.txt | 10 +++++----- setup.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index 56e7165..94d5258 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -grpcio==1.60.1 -grpcio-tools==1.60.1 -protobuf==4.25.3 -pandas==2.2.0 -pyarrow==15.0.0 +grpcio>=1.54.0,<=1.60.1 +grpcio-tools>=1.47.0,<=1.60.1 +protobuf>=3.20.3,<5.0.0 +pandas>=2.0.0,<3.0.0 +pyarrow>=10.0.0,<16.0.0 requests-toolbelt==1.0.0 diff --git a/setup.py b/setup.py index 16b801b..173b06d 100644 --- a/setup.py +++ b/setup.py @@ -33,10 +33,10 @@ ], description="The RelationalAI Software Development Kit for Python", install_requires=[ - "pandas==2.2.0", - "pyarrow==15.0.0", + "pandas>=2.0.0,<3.0.0", + "pyarrow>=10.0.0,<16.0.0", "requests-toolbelt==1.0.0", - "protobuf==4.25.3"], + "protobuf>=3.20.3,<5.0.0"], license="http://www.apache.org/licenses/LICENSE-2.0", long_description="Enables access to the RelationalAI REST APIs from Python", long_description_content_type="text/markdown", From 70705b8dafdcff8dfd430a7f227bba08f30bd249 Mon Sep 17 00:00:00 2001 From: Josh Cole Date: Fri, 23 Feb 2024 10:50:08 -0500 Subject: [PATCH 4/6] relax pandas requirement / make conditional on support --- requirements.txt | 2 +- setup.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 94d5258..52672a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ grpcio>=1.54.0,<=1.60.1 grpcio-tools>=1.47.0,<=1.60.1 protobuf>=3.20.3,<5.0.0 -pandas>=2.0.0,<3.0.0 +pandas<3.0.0 pyarrow>=10.0.0,<16.0.0 requests-toolbelt==1.0.0 diff --git a/setup.py b/setup.py index 173b06d..dc9b079 100644 --- a/setup.py +++ b/setup.py @@ -30,10 +30,13 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], description="The RelationalAI Software Development Kit for Python", install_requires=[ - "pandas>=2.0.0,<3.0.0", + "pandas>=2.0.0,<3.0.0;python_version>'3.8'", "pyarrow>=10.0.0,<16.0.0", "requests-toolbelt==1.0.0", "protobuf>=3.20.3,<5.0.0"], From a9efefbf33f4619e1fda9da3299558412a0a4af0 Mon Sep 17 00:00:00 2001 From: Josh Cole Date: Fri, 23 Feb 2024 10:57:35 -0500 Subject: [PATCH 5/6] add newly supported python versions to build matrix --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index beeb46a..992dbda 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, 3.10, 3.11, 3.12] fail-fast: false steps: From 02f2c9df03cfe716486978bea16db0b2cba653a5 Mon Sep 17 00:00:00 2001 From: Josh Cole Date: Fri, 23 Feb 2024 11:01:58 -0500 Subject: [PATCH 6/6] quote 3.10 so it doesnt get collapsed into 3.1 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 992dbda..c81d3d1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9, 3.10, 3.11, 3.12] + python-version: [3.7, 3.8, 3.9, '3.10', 3.11, 3.12] fail-fast: false steps: