movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge pull request #288207 from dotlambda/ibis-framework-8.0.0

Browse source 
python311Packages.ibis-framework: 7.1.0 -> 8.0.0
This commit is contained in:
Robert Schütz 2024-02-28 00:54:20 +00:00 • committed by GitHub
commit 8473101237
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 40 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/graphviz/default.nix
View file

@ -5,7 +5,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, substituteAll , substituteAll
, graphviz , graphviz-nox
, xdg-utils , xdg-utils
, makeFontsConf , makeFontsConf
, freefont_ttf , freefont_ttf
@ -34,7 +34,7 @@ buildPythonPackage rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./paths.patch; src = ./paths.patch;
inherit graphviz; graphviz = graphviz-nox;
xdgutils = xdg-utils; xdgutils = xdg-utils;
}) })
# https://github.com/xflr6/graphviz/issues/209 # https://github.com/xflr6/graphviz/issues/209

79
pkgs/development/python-modules/ibis-framework/default.nix
View file

@ -17,7 +17,7 @@
, geopandas , geopandas
, google-cloud-bigquery , google-cloud-bigquery
, google-cloud-bigquery-storage , google-cloud-bigquery-storage
, graphviz-nox , graphviz
, hypothesis , hypothesis
, multipledispatch , multipledispatch
, numpy , numpy
@ -25,15 +25,17 @@
, packaging , packaging
, pandas , pandas
, parsy , parsy
, pins
, poetry-core , poetry-core
, poetry-dynamic-versioning , poetry-dynamic-versioning
, polars , polars
, pooch
, psycopg2 , psycopg2
, pyarrow , pyarrow
, pyarrow-hotfix
, pydata-google-auth , pydata-google-auth
, pydruid , pydruid
, pymysql , pymysql
, pyodbc
, pyspark , pyspark
, pytest-benchmark , pytest-benchmark
, pytest-httpserver , pytest-httpserver
@ -63,7 +65,7 @@ let
name = "ibis-testing-data"; name = "ibis-testing-data";
owner = "ibis-project"; owner = "ibis-project";
repo = "testing-data"; repo = "testing-data";
# https://github.com/ibis-project/ibis/blob/7.1.0/nix/overlay.nix#L20-L26 # https://github.com/ibis-project/ibis/blob/8.0.0/nix/overlay.nix#L20-L26
rev = "2c6a4bb5d5d525058d8d5b2312a9fee5dafc5476"; rev = "2c6a4bb5d5d525058d8d5b2312a9fee5dafc5476";
hash = "sha256-Lq503bqh9ESZJSk6yVq/uZwkAubzmSmoTBZSsqMm0DY="; hash = "sha256-Lq503bqh9ESZJSk6yVq/uZwkAubzmSmoTBZSsqMm0DY=";
}; };
@ -71,8 +73,8 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "ibis-framework"; pname = "ibis-framework";
version = "7.1.0"; version = "8.0.0";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -81,7 +83,7 @@ buildPythonPackage rec {
repo = "ibis"; repo = "ibis";
owner = "ibis-project"; owner = "ibis-project";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-E7jryoidw6+CjTIex4wcTXcU+8Kg8LDwg7wJvcwj+7Q="; hash = "sha256-KcNZslqmSbu8uPYKpkyvd7d8Fsf0nQt80y0auXsI8fs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -94,25 +96,24 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
atpublic atpublic
bidict bidict
filelock
multipledispatch multipledispatch
numpy numpy
pandas pandas
parsy parsy
pooch
pyarrow pyarrow
pyarrow-hotfix
python-dateutil python-dateutil
pytz pytz
rich rich
sqlglot sqlglot
toolz toolz
typing-extensions typing-extensions
] ];
++ pooch.optional-dependencies.progress
++ pooch.optional-dependencies.xxhash;
nativeCheckInputs = [ nativeCheckInputs = [
pytestCheckHook pytestCheckHook
black
filelock
hypothesis hypothesis
pytest-benchmark pytest-benchmark
pytest-httpserver pytest-httpserver
@ -126,35 +127,28 @@ buildPythonPackage rec {
"--dist=loadgroup" "--dist=loadgroup"
"-m" "-m"
"'${lib.concatStringsSep " or " testBackends} or core'" "'${lib.concatStringsSep " or " testBackends} or core'"
];
disabledTests = [
# breakage from sqlalchemy2 truediv changes # breakage from sqlalchemy2 truediv changes
"--deselect=ibis/tests/sql/test_sqlalchemy.py::test_tpc_h17" "test_tpc_h17"
# tries to download duckdb extensions # tries to download duckdb extensions
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite" "test_register_sqlite"
"--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite" "test_read_sqlite"
# duckdb does not respect sample_size=2 (reads 3 lines of csv). # duckdb does not respect sample_size=2 (reads 3 lines of csv).
"--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema" "test_csv_reregister_schema"
# duckdb fails with: # duckdb fails with:
# "This function can not be called with an active transaction!, commit or abort the existing one first" # "This function can not be called with an active transaction!, commit or abort the existing one first"
"--deselect=ibis/backends/tests/test_udf.py::test_vectorized_udf" "test_vectorized_udf"
"--deselect=ibis/backends/tests/test_udf.py::test_map_merge_udf" "test_s3_403_fallback"
"--deselect=ibis/backends/tests/test_udf.py::test_udf" "test_map_merge_udf"
"--deselect=ibis/backends/tests/test_udf.py::test_map_udf" "test_udf"
"test_map_udf"
# pyarrow13 is not supported yet. # DataFusion error
"--deselect=ibis/backends/tests/test_temporal.py::test_date_truncate" "datafusion"
"--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" # pluggy.PluggyTeardownRaisedWarning
"--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" "test_repr_png_is_not_none_in_not_interactive"
"--deselect=ibis/backends/tests/test_temporal.py::test_interval_add_cast_column" "test_interval_arithmetic"
"--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp"
"--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp"
"--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp"
"--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp"
"--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_filter_before_window"
"--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf"
"--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf"
"--deselect=ibis/backends/tests/test_aggregation.py::test_aggregate_grouped"
]; ];
# patch out tests that check formatting with black # patch out tests that check formatting with black
@ -162,7 +156,6 @@ buildPythonPackage rec {
find ibis/tests -type f -name '*.py' -exec sed -i \ find ibis/tests -type f -name '*.py' -exec sed -i \
-e '/^ *assert_decompile_roundtrip/d' \ -e '/^ *assert_decompile_roundtrip/d' \
-e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} + -e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} +
substituteInPlace pyproject.toml --replace 'sqlglot = ">=10.4.3,<12"' 'sqlglot = "*"'
''; '';
preCheck = '' preCheck = ''
@ -188,20 +181,22 @@ buildPythonPackage rec {
dask = [ dask regex ]; dask = [ dask regex ];
datafusion = [ datafusion ]; datafusion = [ datafusion ];
druid = [ pydruid sqlalchemy ]; druid = [ pydruid sqlalchemy ];
duckdb = [ duckdb duckdb-engine packaging sqlalchemy sqlalchemy-views ]; duckdb = [ duckdb duckdb-engine sqlalchemy sqlalchemy-views ];
flink = [ ]; flink = [ ];
geospatial = [ geoalchemy2 geopandas shapely ]; geospatial = [ geoalchemy2 geopandas shapely ];
mssql = [ sqlalchemy pyodbc sqlalchemy-views ];
mysql = [ sqlalchemy pymysql sqlalchemy-views ]; mysql = [ sqlalchemy pymysql sqlalchemy-views ];
oracle = [ sqlalchemy oracledb packaging sqlalchemy-views ]; oracle = [ sqlalchemy oracledb packaging sqlalchemy-views ];
pandas = [ regex ]; pandas = [ regex ];
polars = [ polars ]; polars = [ polars packaging ];
postgres = [ psycopg2 sqlalchemy sqlalchemy-views ]; postgres = [ psycopg2 sqlalchemy sqlalchemy-views ];
pyspark = [ pyspark sqlalchemy ]; pyspark = [ pyspark sqlalchemy packaging ];
snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views ]; snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views packaging ];
sqlite = [ regex sqlalchemy sqlite sqlalchemy-views ]; sqlite = [ regex sqlalchemy sqlalchemy-views ];
trino = [ trino-python-client sqlalchemy sqlalchemy-views ]; trino = [ trino-python-client sqlalchemy sqlalchemy-views ];
visualization = [ graphviz-nox ]; visualization = [ graphviz ];
decompiler = [ black ]; decompiler = [ black ];
examples = [ pins ] ++ pins.optional-dependencies.gcs;
}; };
}; };

4
pkgs/top-level/python-packages.nix
View file

@ -4965,9 +4965,7 @@ self: super: with self; {
graphtage = callPackage ../development/python-modules/graphtage { }; graphtage = callPackage ../development/python-modules/graphtage { };
graphviz = callPackage ../development/python-modules/graphviz { graphviz = callPackage ../development/python-modules/graphviz { };
inherit (pkgs) graphviz;
};
grappelli-safe = callPackage ../development/python-modules/grappelli-safe { }; grappelli-safe = callPackage ../development/python-modules/grappelli-safe { };