From a6903628e77761e3bdce6ebff0bdc347f29793d2 Mon Sep 17 00:00:00 2001 From: Dip Patel <37777672+Dippatel98@users.noreply.github.com> Date: Thu, 11 Apr 2024 18:24:50 -0400 Subject: [PATCH] Update sqlalchemy requirement from >=1.3,<2.0 to >=1.3,<3.0 in /sdks/python (#30919) * Revert "Updating access modifiers for utility methods" This reverts commit 99eb9260b7ee2f700affc25df68115e8ffa7521d. * Update sqlalchemy requirement from >=1.3,<2.0 to >=1.3,<3.0 in /sdks/python * Update sqlalchemy requirement from >=1.3,<2.0 to >=1.3,<3.0 in /sdks/python * Update requirements * Revert "Updating access modifiers for utility methods" This reverts commit 99eb9260b7ee2f700affc25df68115e8ffa7521d. * Update sqlalchemy requirement from >=1.3,<2.0 to >=1.3,<3.0 in /sdks/python * update dependencies * Revert "Updating access modifiers for utility methods" This reverts commit 99eb9260b7ee2f700affc25df68115e8ffa7521d. * Update sqlalchemy requirement from >=1.3,<2.0 to >=1.3,<3.0 in /sdks/python * Fix playground typo breaking rendering (#30930) * Remove comma that breaks formatting (#30931) * [yaml] Fix Beam YAML blog links (#30932) Signed-off-by: Jeffrey Kinard * Fixup iceberg GitHub Action workflow * Bump transformers from 4.36.0 to 4.38.0 in /sdks/python/apache_beam/examples/inference/runinference_metrics (#30924) Bumps [transformers](https://github.com/huggingface/transformers) from 4.36.0 to 4.38.0. - [Release notes](https://github.com/huggingface/transformers/releases) - [Commits](https://github.com/huggingface/transformers/compare/v4.36.0...v4.38.0) --- updated-dependencies: - dependency-name: transformers dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: Jeffrey Kinard Signed-off-by: dependabot[bot] Co-authored-by: Anand Inguva Co-authored-by: Danny McCormick Co-authored-by: Jeff Kinard Co-authored-by: Kenneth Knowles Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- ...s_Direct.json => beam_PostCommit_Python.json} | 0 .../io/external/xlang_jdbcio_it_test.py | 16 ++++++++++------ .../container/py310/base_image_requirements.txt | 2 +- .../container/py311/base_image_requirements.txt | 3 +-- .../container/py38/base_image_requirements.txt | 2 +- .../container/py39/base_image_requirements.txt | 2 +- sdks/python/setup.py | 2 +- 7 files changed, 15 insertions(+), 12 deletions(-) rename .github/trigger_files/{beam_PostCommit_Python_Examples_Direct.json => beam_PostCommit_Python.json} (100%) diff --git a/.github/trigger_files/beam_PostCommit_Python_Examples_Direct.json b/.github/trigger_files/beam_PostCommit_Python.json similarity index 100% rename from .github/trigger_files/beam_PostCommit_Python_Examples_Direct.json rename to .github/trigger_files/beam_PostCommit_Python.json diff --git a/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py b/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py index 54a473d1b52b..38a405c2d331 100644 --- a/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py +++ b/sdks/python/apache_beam/io/external/xlang_jdbcio_it_test.py @@ -129,12 +129,16 @@ def test_xlang_jdbc_write_read(self, database): else: binary_type = ('BINARY(10)', 'VARBINARY(10)') - self.engine.execute( - "CREATE TABLE IF NOT EXISTS {}".format(table_name) + "(f_id INTEGER, " + - "f_float DOUBLE PRECISION, " + "f_char CHAR(10), " + - "f_varchar VARCHAR(10), " + f"f_bytes {binary_type[0]}, " + - f"f_varbytes {binary_type[1]}, " + "f_timestamp TIMESTAMP(3), " + - "f_decimal DECIMAL(10, 2), " + "f_date DATE, " + "f_time TIME(3))") + with self.engine.begin() as connection: + connection.execute( + sqlalchemy.text( + "CREATE TABLE IF NOT EXISTS {}".format(table_name) + + "(f_id INTEGER, " + "f_float DOUBLE PRECISION, " + + "f_char CHAR(10), " + "f_varchar VARCHAR(10), " + + f"f_bytes {binary_type[0]}, " + f"f_varbytes {binary_type[1]}, " + + "f_timestamp TIMESTAMP(3), " + "f_decimal DECIMAL(10, 2), " + + "f_date DATE, " + "f_time TIME(3))")) + inserted_rows = [ JdbcTestRow( i, diff --git a/sdks/python/container/py310/base_image_requirements.txt b/sdks/python/container/py310/base_image_requirements.txt index 6e5a105387a9..57cd7fcb68fc 100644 --- a/sdks/python/container/py310/base_image_requirements.txt +++ b/sdks/python/container/py310/base_image_requirements.txt @@ -141,7 +141,7 @@ shapely==2.0.3 six==1.16.0 sortedcontainers==2.4.0 soupsieve==2.5 -SQLAlchemy==1.4.52 +SQLAlchemy==2.0.29 sqlparse==0.4.4 tenacity==8.2.3 testcontainers==3.7.1 diff --git a/sdks/python/container/py311/base_image_requirements.txt b/sdks/python/container/py311/base_image_requirements.txt index 1c2606379758..faf93fe59e07 100644 --- a/sdks/python/container/py311/base_image_requirements.txt +++ b/sdks/python/container/py311/base_image_requirements.txt @@ -22,7 +22,6 @@ # Reach out to a committer if you need help. annotated-types==0.6.0 -async-timeout==4.0.3 attrs==23.2.0 beautifulsoup4==4.12.3 bs4==0.0.2 @@ -140,7 +139,7 @@ shapely==2.0.3 six==1.16.0 sortedcontainers==2.4.0 soupsieve==2.5 -SQLAlchemy==1.4.52 +SQLAlchemy==2.0.29 sqlparse==0.4.4 tenacity==8.2.3 testcontainers==3.7.1 diff --git a/sdks/python/container/py38/base_image_requirements.txt b/sdks/python/container/py38/base_image_requirements.txt index 3359f11e187e..a2484f356c73 100644 --- a/sdks/python/container/py38/base_image_requirements.txt +++ b/sdks/python/container/py38/base_image_requirements.txt @@ -145,7 +145,7 @@ shapely==2.0.3 six==1.16.0 sortedcontainers==2.4.0 soupsieve==2.5 -SQLAlchemy==1.4.52 +SQLAlchemy==2.0.29 sqlparse==0.4.4 tenacity==8.2.3 testcontainers==3.7.1 diff --git a/sdks/python/container/py39/base_image_requirements.txt b/sdks/python/container/py39/base_image_requirements.txt index e82d228b0161..876c6e6bdf69 100644 --- a/sdks/python/container/py39/base_image_requirements.txt +++ b/sdks/python/container/py39/base_image_requirements.txt @@ -142,7 +142,7 @@ shapely==2.0.3 six==1.16.0 sortedcontainers==2.4.0 soupsieve==2.5 -SQLAlchemy==1.4.52 +SQLAlchemy==2.0.29 sqlparse==0.4.4 tenacity==8.2.3 testcontainers==3.7.1 diff --git a/sdks/python/setup.py b/sdks/python/setup.py index 400083e0a0ac..36ecedae543c 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -428,7 +428,7 @@ def get_portability_package_data(): 'pytest-xdist>=2.5.0,<4', 'pytest-timeout>=2.1.0,<3', 'scikit-learn>=0.20.0', - 'sqlalchemy>=1.3,<2.0', + 'sqlalchemy>=1.3,<3.0', 'psycopg2-binary>=2.8.5,<3.0.0', 'testcontainers[mysql]>=3.0.3,<4.0.0', 'cryptography>=41.0.2',