Skip to content

Commit

Permalink
Merge branch 'main' into patch-5
Browse files Browse the repository at this point in the history
  • Loading branch information
deepyaman authored Feb 12, 2024
2 parents 2a6fe31 + 3f24b89 commit e22bf46
Show file tree
Hide file tree
Showing 54 changed files with 2,491 additions and 4,822 deletions.
1 change: 1 addition & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
skip = *.lock,.direnv,.git,./docs/_freeze,./docs/_output/**,./docs/_inv/**,docs/_freeze/**,*.svg,*.css,*.html,*.js
ignore-regex = \b(i[if]f|I[IF]F|AFE)\b
builtin = clear,rare,names
ignore-words-list = tim
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)
}
}
};
3 changes: 3 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"features": {
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {
"version": "1.4.549"
},
"ghcr.io/eitsupi/devcontainer-features/duckdb-cli:1": {
"extensions": "httpfs,sqlite,postgres,spatial,substrait,parquet,json,arrow,mysql"
}
}
}
2 changes: 1 addition & 1 deletion .devcontainer/updateContent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# install ibis
python3 -m pip install ipython
python3 -m pip install -e '.[duckdb,examples]'
python3 -m pip install -e '.[duckdb,clickhouse,examples]'
106 changes: 0 additions & 106 deletions .github/workflows/conda-lock.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/ibis-backends-cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
- ".envrc"
branches:
- main
pull_request_target:
types:
- labeled

permissions:
# this allows extractions/setup-just to list releases for `just` at a higher
Expand All @@ -35,6 +38,7 @@ jobs:
group: ${{ matrix.backend.name }}-${{ matrix.python-version }}
cancel-in-progress: false
runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.label.name == 'ci-run-cloud'
strategy:
fail-fast: false
matrix:
Expand All @@ -49,6 +53,27 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
if: github.event.label.name != 'ci-run-cloud'

- name: checkout
if: github.event.label.name == 'ci-run-cloud'
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}

- uses: tibdex/github-app-token@v2
id: generate_token
with:
app_id: ${{ secrets.DOCS_BOT_APP_ID }}
private_key: ${{ secrets.DOCS_BOT_APP_PRIVATE_KEY }}

- name: reset cloud ci run label
uses: actions-ecosystem/action-remove-labels@v1
if: github.event.label.name == 'ci-run-cloud'
with:
labels: ci-run-cloud
github_token: ${{ steps.generate_token.outputs.token }}

- name: install poetry
run: pipx install 'poetry==1.7.1'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ repos:
types_or:
- python
- pyi
args: ["check", "--force-exclude", "--show-source", "--fix"]
args: ["check", "--force-exclude", "--output-format=full", "--fix"]
require_serial: true
minimum_pre_commit_version: "2.9.2"
- repo: local
Expand Down
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}"
}
]
]
};
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,14 @@ Ibis acts as a universal frontend to the following systems:

- [Apache Arrow DataFusion](https://ibis-project.org/backends/datafusion/) (experimental)
- [Apache Druid](https://ibis-project.org/backends/druid/) (experimental)
- [Apache Flink](https://ibis-project.org/backends/flink)
- [Apache Impala](https://ibis-project.org/backends/impala/)
- [Apache PySpark](https://ibis-project.org/backends/pyspark/)
- [BigQuery](https://ibis-project.org/backends/bigquery/)
- [ClickHouse](https://ibis-project.org/backends/clickhouse/)
- [Dask](https://ibis-project.org/backends/dask/)
- [DuckDB](https://ibis-project.org/backends/duckdb/)
- [Exasol](https://ibis-project.org/backends/exasol) (experimental)
- [HeavyAI](https://github.com/heavyai/ibis-heavyai)
- [MySQL](https://ibis-project.org/backends/mysql/)
- [Oracle](https://ibis-project.org/backends/oracle/) (experimental)
Expand Down
31 changes: 0 additions & 31 deletions ci/conda-lock/condarc

This file was deleted.

Loading

0 comments on commit e22bf46

Please sign in to comment.