Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): lock file maintenance #8056

Merged
merged 6 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .conventionalcommits.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const releaseConfig = require("./.releaserc.js");
function extractConventionalCommitsConfig(config) {
return config.plugins
.filter(
([plugin, _]) => plugin == "@semantic-release/release-notes-generator",
([plugin, _]) => plugin == "@semantic-release/release-notes-generator"
)
.map(([_, config]) => config)[0].presetConfig.types;
}
Expand All @@ -14,7 +14,7 @@ module.exports = {
options: {
preset: {
name: "conventionalcommits",
types: extractConventionalCommitsConfig(releaseConfig),
},
},
types: extractConventionalCommitsConfig(releaseConfig)
}
}
};
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ docs/overrides/*.html
docs/release_notes.md
docs/_freeze
docs/_publish.yml
docs/_extensions
docs/.quarto
docs/_output
ibis
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ semi = true
singleQuote = false
arrowParens = "avoid"
useTabs = false
trailingComma = "all"
trailingComma = "none"
44 changes: 22 additions & 22 deletions .releaserc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ module.exports = {
{
// deprecations are patch releases
releaseRules: [{ type: "depr", release: "patch" }],
preset: "conventionalcommits",
},
preset: "conventionalcommits"
}
],
[
"@semantic-release/release-notes-generator",
Expand All @@ -27,17 +27,17 @@ module.exports = {
{ type: "refactor", section: "Refactors" },
{ type: "perf", section: "Performance" },
{ type: "test", hidden: true },
{ type: "depr", section: "Deprecations" },
],
},
},
{ type: "depr", section: "Deprecations" }
]
}
}
],
[
"@semantic-release/changelog",
{
changelogTitle: "Release notes\n---",
changelogFile: "docs/release_notes.md",
},
changelogFile: "docs/release_notes.md"
}
],
[
"semantic-release-replace-plugin",
Expand All @@ -52,13 +52,13 @@ module.exports = {
file: "ibis/__init__.py",
hasChanged: true,
numMatches: 1,
numReplacements: 1,
},
numReplacements: 1
}
],
countMatches: true,
},
],
},
countMatches: true
}
]
}
],
[
"@semantic-release/exec",
Expand All @@ -67,22 +67,22 @@ module.exports = {
"ci/release/verify_conditions.sh ${options.dryRun}",
verifyReleaseCmd: "ci/release/verify_release.sh ${nextRelease.version}",
prepareCmd: "ci/release/prepare.sh ${nextRelease.version}",
publishCmd: "ci/release/publish.sh",
},
publishCmd: "ci/release/publish.sh"
}
],
[
"@semantic-release/github",
{
successComment: false,
assets: ["dist/*.whl"],
},
assets: ["dist/*.whl"]
}
],
[
"@semantic-release/git",
{
assets: ["pyproject.toml", "docs/release_notes.md", "ibis/__init__.py"],
message: "chore(release): ${nextRelease.version}",
},
],
],
message: "chore(release): ${nextRelease.version}"
}
]
]
};
10 changes: 5 additions & 5 deletions docs/styles.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
section#parameters {
/* scroll when child contents overflow the width */
overflow-x: auto;
/* scroll when child contents overflow the width */
overflow-x: auto;
}

section[id^="parameters-"] {
/* scroll when child contents overflow the width */
overflow-x: auto;
/* scroll when child contents overflow the width */
overflow-x: auto;
}

.bi-zulip::before {
display: inline-block;
content: url("./zulip.svg");
vertical-align: -.125em;
vertical-align: -0.125em;
width: 1em;
}
2 changes: 1 addition & 1 deletion docs/theme-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ $code-color: #c2d94c;
$code-bg: #2b2b2b;

thead.tableFloatingHeaderOriginal {
background-color: rgb(47, 47, 47);
background-color: rgb(47, 47, 47);
}
4 changes: 2 additions & 2 deletions docs/theme-light.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*-- scss:rules --*/
.quarto-title-banner .quarto-title .title {
color: #ccd1d5;
color: #ccd1d5;
}

thead.tableFloatingHeaderOriginal {
background-color: #ffffff;
background-color: #ffffff;
}
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ibis/backends/pandas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def to_pyarrow(
# cudf.pandas adds a column with the name `__index_level_0__` (and maybe
# other index level columns) but these aren't part of the known schema
# so we drop them
output = output.drop_columns(
output = output.drop(
filter(lambda col: col.startswith("__index_level_"), output.column_names)
)
table = PyArrowData.convert_table(output, table_expr.schema())
Expand Down
7 changes: 5 additions & 2 deletions ibis/backends/polars/compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,10 @@ def count_star(op, **kw):
condition = translate(where, **kw)
result = condition.sum()
else:
result = pl.count()
try:
result = pl.len()
except AttributeError:
result = pl.count()
return result.cast(dtype_to_polars(op.dtype))


Expand Down Expand Up @@ -845,7 +848,7 @@ def timestamp_from_unix(op, **kw):
if unit == "s":
arg = arg.cast(pl.Int64) * 1_000
unit = "ms"
return arg.cast(pl.Datetime).dt.with_time_unit(unit)
return arg.cast(pl.Datetime(time_unit=unit))


@translate.register(ops.IntervalFromInteger)
Expand Down
22 changes: 0 additions & 22 deletions ibis/tests/expr/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import pytest

import ibis
import ibis.common.exceptions as com
from ibis.tests.expr.mocks import MockBackend


Expand Down Expand Up @@ -80,24 +79,3 @@ def functional_alltypes(con):
@pytest.fixture
def lineitem(con):
return con.table("tpch_lineitem")


@pytest.hookimpl(hookwrapper=True)
def pytest_pyfunc_call(pyfuncitem):
"""Dynamically add an xfail marker for specific backends."""
outcome = yield
try:
outcome.get_result()
except (
com.OperationNotDefinedError,
com.UnsupportedOperationError,
com.UnsupportedBackendType,
NotImplementedError,
) as e:
markers = list(pyfuncitem.iter_markers(name="xfail_unsupported"))
if not markers:
raise
assert (
len(markers) == 1
), f"More than one xfail_unsupported marker found on test {pyfuncitem}"
pytest.xfail(reason=repr(e))
Loading
Loading