From f4302dcf94576d657fdbd0c825533b7cd5cc9922 Mon Sep 17 00:00:00 2001 From: Neelasha Sen Date: Thu, 27 Jun 2024 04:35:17 +0530 Subject: [PATCH] test ci (#1017) * test ci * lint * lint * sqlalchemy version * pymysql * pymysql * pymysql * image * pymysql revert * remove test * fix json tests * snippet tests * duckdb version --- CHANGELOG.md | 2 ++ setup.py | 2 +- src/sql/_testing.py | 2 +- src/tests/test_magic.py | 22 +++++++++++----------- src/tests/test_plot.py | 8 ++++---- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c231fd6f8..5a73bbd55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.10.11dev +* [Feature] Test CI + ## 0.10.10 (2024-02-07) * [Feature] Adds `ploomber-extension` as a dependency diff --git a/setup.py b/setup.py index 2c97e7232..b72c7752d 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ "twine", # tests # DuckDB 0.10.1 breaking Sqlalchemy v1 tests: https://github.com/ploomber/jupysql/issues/1001 # noqa - "duckdb<0.10.1", + "duckdb", "duckdb-engine", "pyodbc", # sql.plot module tests diff --git a/src/sql/_testing.py b/src/sql/_testing.py index 041994e28..5c0418186 100644 --- a/src/sql/_testing.py +++ b/src/sql/_testing.py @@ -121,7 +121,7 @@ def get_tmp_dir(): "alias": "mySQLTest", "docker_ct": { "name": "mysql", - "image": "mysql", + "image": "mysql:8.0", "ports": {3306: 33306}, }, "query": {}, diff --git a/src/tests/test_magic.py b/src/tests/test_magic.py index cebacca04..0b0c0af93 100644 --- a/src/tests/test_magic.py +++ b/src/tests/test_magic.py @@ -2296,11 +2296,11 @@ def test_get_query_type(query, query_type): [ ( "%sql select '{\"a\": 1}'::json -> 'a';", - "1", + 1, ), ( '%sql select \'[{"b": "c"}]\'::json -> 0;', - '{"b":"c"}', + {"b": "c"}, ), ( "%sql select '{\"a\": 1}'::json ->> 'a';", @@ -2314,13 +2314,13 @@ def test_get_query_type(query, query_type): """%%sql select '{\"a\": 1}'::json -> 'a';""", - "1", + 1, ), ( """%%sql select '[{\"b\": \"c\"}]'::json -> 0;""", - '{"b":"c"}', + {"b": "c"}, ), ( """%%sql select '{\"a\": 1}'::json @@ -2338,15 +2338,15 @@ def test_get_query_type(query, query_type): ), ( "%sql SELECT '{\"a\": 1}'::json -> 'a';", - "1", + 1, ), ( "%sql SELect '{\"a\": 1}'::json -> 'a';", - "1", + 1, ), ( "%sql SELECT json('{\"a\": 1}') -> 'a';", - "1", + 1, ), ], ids=[ @@ -2377,7 +2377,7 @@ def test_json_arrow_operators(ip, query, expected): """%%sql --save snippet select '{\"a\": 1}'::json -> 'a';""", "%sql select * from snippet", - "1", + 1, ), ( """%sql --save snippet select '[{\"b\": \"c\"}]'::json ->> 0;""", @@ -2390,7 +2390,7 @@ def test_json_arrow_operators(ip, query, expected): -> 2 as number""", "%sql select number from snippet", - "3", + 3, ), ], ids=["cell-magic-key", "line-magic-index", "cell-magic-multi-line-as-column"], @@ -2737,11 +2737,11 @@ def test_var_substitution_section(ip_empty, tmp_empty): [ ( '%sql select json(\'[{"a":1}, {"b":2}]\')', - '[{"a":1},{"b":2}]', + "[{'a': 1}, {'b': 2}]", ), ( '%sql select \'[{"a":1}, {"b":2}]\'::json', - '[{"a":1}, {"b":2}]', + "[{'a': 1}, {'b': 2}]", ), ], ) diff --git a/src/tests/test_plot.py b/src/tests/test_plot.py index cf5a8fe28..12e1c0cbd 100644 --- a/src/tests/test_plot.py +++ b/src/tests/test_plot.py @@ -47,7 +47,7 @@ def __repr__(self) -> str: def test_boxplot_stats(chinook_db, ip_empty): - # there's some werid behavior in duckdb-engine that will cause the + # there's some weird behavior in duckdb-engine that will cause the # table not to be found if we call commit ip_empty.run_cell("%config SqlMagic.autocommit=False") ip_empty.run_cell("%sql duckdb://") @@ -65,7 +65,7 @@ def test_boxplot_stats(chinook_db, ip_empty): def test_boxplot_stats_exception(chinook_db, ip_empty): - # there's some werid behavior in duckdb-engine that will cause the + # there's some weird behavior in duckdb-engine that will cause the # table not to be found if we call commit ip_empty.run_cell("%config SqlMagic.autocommit=False") ip_empty.run_cell("%sql duckdb://") @@ -101,7 +101,7 @@ def test_summary_stats(chinook_db, ip_empty, tmp_empty): """ ) - # there's some werid behavior in duckdb-engine that will cause the + # there's some weird behavior in duckdb-engine that will cause the # table not to be found if we call commit ip_empty.run_cell("%config SqlMagic.autocommit=False") ip_empty.run_cell("%sql duckdb://") @@ -114,7 +114,7 @@ def test_summary_stats(chinook_db, ip_empty, tmp_empty): def test_summary_stats_missing_file(chinook_db, ip_empty): - # there's some werid behavior in duckdb-engine that will cause the + # there's some weird behavior in duckdb-engine that will cause the # table not to be found if we call commit ip_empty.run_cell("%config SqlMagic.autocommit=False") ip_empty.run_cell("%sql duckdb://")