This is an automated email from the ASF dual-hosted git repository. anandinguva pushed a commit to branch revert-30919-fix in repository https://gitbox.apache.org/repos/asf/beam.git
commit 9c435637b62d0db31d80fa8f79b93fefb5af638f Author: Anand Inguva <[email protected]> AuthorDate: Thu Apr 11 18:33:39 2024 -0400 Revert "Update sqlalchemy requirement from >=1.3,<2.0 to >=1.3,<3.0 in /sdks/…" This reverts commit a6903628e77761e3bdce6ebff0bdc347f29793d2. --- ....json => beam_PostCommit_Python_Examples_Direct.json} | 0 .../apache_beam/io/external/xlang_jdbcio_it_test.py | 16 ++++++---------- sdks/python/container/py310/base_image_requirements.txt | 2 +- sdks/python/container/py311/base_image_requirements.txt | 3 ++- sdks/python/container/py38/base_image_requirements.txt | 2 +- sdks/python/container/py39/base_image_requirements.txt | 2 +- sdks/python/setup.py | 2 +- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/trigger_files/beam_PostCommit_Python.json b/.github/trigger_files/beam_PostCommit_Python_Examples_Direct.json similarity index 100% rename from .github/trigger_files/beam_PostCommit_Python.json rename to .github/trigger_files/beam_PostCommit_Python_Examples_Direct.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 38a405c2d33..54a473d1b52 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,16 +129,12 @@ class CrossLanguageJdbcIOTest(unittest.TestCase): else: binary_type = ('BINARY(10)', 'VARBINARY(10)') - 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))")) - + 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))") 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 57cd7fcb68f..6e5a105387a 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==2.0.29 +SQLAlchemy==1.4.52 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 faf93fe59e0..1c260637975 100644 --- a/sdks/python/container/py311/base_image_requirements.txt +++ b/sdks/python/container/py311/base_image_requirements.txt @@ -22,6 +22,7 @@ # 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 @@ -139,7 +140,7 @@ shapely==2.0.3 six==1.16.0 sortedcontainers==2.4.0 soupsieve==2.5 -SQLAlchemy==2.0.29 +SQLAlchemy==1.4.52 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 a2484f356c7..3359f11e187 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==2.0.29 +SQLAlchemy==1.4.52 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 876c6e6bdf6..e82d228b016 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==2.0.29 +SQLAlchemy==1.4.52 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 36ecedae543..400083e0a0a 100644 --- a/sdks/python/setup.py +++ b/sdks/python/setup.py @@ -428,7 +428,7 @@ if __name__ == '__main__': 'pytest-xdist>=2.5.0,<4', 'pytest-timeout>=2.1.0,<3', 'scikit-learn>=0.20.0', - 'sqlalchemy>=1.3,<3.0', + 'sqlalchemy>=1.3,<2.0', 'psycopg2-binary>=2.8.5,<3.0.0', 'testcontainers[mysql]>=3.0.3,<4.0.0', 'cryptography>=41.0.2',
