Skip to content
Open
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
17 changes: 17 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{go,mod}]
indent_style = tab
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why switch to indent_style tab for go instead of leaving it as space?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of the go files in the repo use tabs for indentation. This also seems to be the standard, as gofmt uses tabs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, fair enough 😄


[*.{yml,yaml,js,html,css,svg}]
indent_size = 2

[*.{py,sh,bash,zsh,fish}]
indent_size = 4
4 changes: 4 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Code formatting fixes
1edfbb5a86f4f3e3d00e34ea7c2e034fee6a217f
7b8d457a991b6cc0c47e4386f0881cad1183aaee
e89b95ccc44c73ceaaacb1fa2393f13b962bfcc2
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
description: "Where to deploy to"
required: true
type: environment

release_tag:
description: "Tag of the GitHub release (example: v0.0.1)"
required: true
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
role-to-assume: ${{ secrets.AWS_ROLE }}
role-session-name: deploy-${{ inputs.environment }}-${{ github.run_id }}-${{ github.run_attempt }}
aws-region: ${{ vars.AWS_REGION }}

- name: Check role
run: |
aws sts get-caller-identity
Expand All @@ -61,7 +61,7 @@ jobs:
gh release download ${{ inputs.release_tag }} --repo ${{ github.repository }}
env:
GH_TOKEN: ${{ github.token }}

- name: Upload artifacts
run: |
aws s3 cp . s3://dbc-distribution/${{ inputs.release_tag }} --recursive
2 changes: 1 addition & 1 deletion .github/workflows/publish_install_script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
role-to-assume: ${{ secrets.AWS_ROLE }}
role-session-name: deploy-production-${{ github.run_id }}-${{ github.run_attempt }}
aws-region: ${{ vars.AWS_REGION }}

- name: Check role
run: |
aws sts get-caller-identity
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Import signing GPG key
env:
COLUMNAR_GPG_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
run: |
run: |
echo "$COLUMNAR_GPG_KEY" | gpg --batch --import
KEY_ID=$(gpg -K | sed -n '/^\s/s/\s*//p')
printf "trust\n5\ny\nquit\n" | gpg --batch --no-tty --command-fd 0 --edit-key "$KEY_ID"
Expand All @@ -83,17 +83,17 @@ jobs:

- name: Run GoReleaser Snapshot
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
id: gorelease-snapshot
id: gorelease-snapshot
with:
distribution: goreleaser-pro
version: "~> v2"
args: release -p 20 --clean --snapshot
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}

- name: Upload Snapshot Artifacts
- name: Upload Snapshot Artifacts
uses: actions/upload-artifact@v4
with:
name: snapshot-artifacts
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Import signing GPG key
env:
COLUMNAR_GPG_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
run: |
run: |
echo "$COLUMNAR_GPG_KEY" | gpg --batch --import
KEY_ID=$(gpg -K | sed -n '/^\s/s/\s*//p')
printf "trust\n5\ny\nquit\n" | gpg --batch --no-tty --command-fd 0 --edit-key "$KEY_ID"
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
- name: Install anchore/quill
run: |
curl -sSfL https://get.anchore.io/quill | sudo sh -s -- -b /usr/local/bin

# setup digicert signing
- uses: digicert/ssm-code-signing@fb61e357690ad6aaa11c372000c37fb74d35c000 # v1.1.1
id: digicert
Expand All @@ -205,7 +205,7 @@ jobs:

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
id: gorelease
id: gorelease
with:
distribution: goreleaser-pro
version: "~> v2"
Expand All @@ -222,7 +222,7 @@ jobs:
MACOS_NOTARY_KEY_ID: ${{ secrets.MACOS_NOTARY_KEY_ID }}
DBC_TAP_GITHUB_PAT: ${{ secrets.DBC_TAP_GITHUB_PAT }}

- name: Publish to PyPI
- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # 1.12.4
with:
packages-dir: dist/python/
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ cdn-dev
.cache

.venv
.claude
.claude
20 changes: 10 additions & 10 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ builds:
goos:
- linux
- windows
- darwin
- darwin
goarch:
- amd64
- arm64
Expand Down Expand Up @@ -131,7 +131,7 @@ dockers:
build_flag_templates:
- "--platform=linux/amd64"
- image_templates:
- "columnar/dbc:{{ .Tag }}-amd64"
- "columnar/dbc:{{ .Tag }}-amd64"
- "columnar/dbc:v{{ .Major }}-amd64"
- "columnar/dbc:v{{ .Major }}.{{ .Minor }}-amd64"
- "columnar/dbc:latest-amd64"
Expand All @@ -149,7 +149,7 @@ dockers:
build_flag_templates:
- "--platform=linux/arm64/v8"
- image_templates:
- "columnar/dbc:{{ .Tag }}-arm64v8"
- "columnar/dbc:{{ .Tag }}-arm64v8"
- "columnar/dbc:v{{ .Major }}-arm64v8"
- "columnar/dbc:v{{ .Major }}.{{ .Minor }}-arm64v8"
- "columnar/dbc:latest-arm64v8"
Expand Down Expand Up @@ -191,9 +191,9 @@ docker_manifests:
# secret_name: "DOCKER_TOKEN"
# disable: '{{ or (not .IsRelease) (ne .Prerelease "") }}'
# images:
# - "columnar/dbc:{{ .Version }}"
# - "columnar/dbc:{{ .Tag }}"
# - "columnar/dbc:v{{ .Major }}"
# - "columnar/dbc:{{ .Version }}"
# - "columnar/dbc:{{ .Tag }}"
# - "columnar/dbc:v{{ .Major }}"
# - "columnar/dbc:v{{ .Major }}.{{ .Minor }}"
# - "columnar/dbc:latest"
# description: Official Docker images for dbc, the CLI for installing ADBC drivers.
Expand All @@ -209,7 +209,7 @@ nfpms:
vendor: Columnar Technologies Inc.
homepage: "https://columnar.tech/dbc"
license: Apache-2.0

description: >-
A CLI utility for managing ADBC drivers

Expand All @@ -223,7 +223,7 @@ nfpms:
dst: /etc/bash_completion.d/dbc

- src: cmd/dbc/completions/dbc.zsh
dst: /usr/share/zsh/vendor-completions/_dbc
dst: /usr/share/zsh/vendor-completions/_dbc

- src: cmd/dbc/completions/dbc.fish
dst: /usr/share/fish/vendor_completions.d/dbc.fish
Expand Down Expand Up @@ -304,13 +304,13 @@ snapshot:
homebrew_casks:
- name: dbc
alternative_names:
- dbc@{{ .Version }}
- dbc@{{ .Version }}
- dbc@{{ .Major }}.{{ .Minor }}
ids:
- archives
url:
template: "https://github.com/columnar-tech/dbc/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
verified: "github.com/columnar-tech/dbc/"
verified: "github.com/columnar-tech/dbc/"
cookies:
license: "accept-backup"
commit_msg_template: "Brew cask update for {{ .ProjectName }} version {{ .Tag }}"
Expand Down
4 changes: 2 additions & 2 deletions ci/scripts/run_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ set -eux
python -m venv .venv

if [ -f ".venv/bin/activate" ]; then
. ".venv/bin/activate"
. ".venv/bin/activate"
else
. ".venv/Scripts/activate"
. ".venv/Scripts/activate"
fi

pip install adbc_driver_manager
Expand Down
6 changes: 3 additions & 3 deletions cmd/dbc/completions/dbc.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function _dbc {
_arguments -C \
"1: :->subcommand" \
"*::arg:->args"

case $state in
subcommand)
_values "dbc command" \
Expand Down Expand Up @@ -60,7 +60,7 @@ function _dbc {
esac
}

function _dbc_install_completions {
function _dbc_install_completions {
_arguments \
'(--help)-h[Help]' \
'(-h)--help[Help]' \
Expand Down Expand Up @@ -90,7 +90,7 @@ function _dbc_add_completions {
'(-h)--help[Help]' \
'(-p)--path[driver list to add to]: :_files -g \*.toml' \
'(--path)-p[driver list to add to]: :_files -g \*.toml' \
':driver name: '
':driver name: '
}

function _dbc_sync_completions {
Expand Down
6 changes: 3 additions & 3 deletions resources/dbc.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ limitations under the License.
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
{{ if eq .MsiArch "x64" }}
<?define ArchString = "(64 bit)" ?>
<?define Win64 = "yes" ?>
<?define Win64 = "yes" ?>
{{ else }}
<?define ArchString = "" ?>
<?define Win64 = "no" ?>
<?define Win64 = "no" ?>
{{ end }}
<Fragment>
<UI Id="WixUI_Minimal">
Expand Down Expand Up @@ -89,4 +89,4 @@ limitations under the License.
<Property Id="Setup" Value="Setup" />
<Property Id="ARPPRODUCTICON" Value="ProductIcon.ico" />
</Product>
</Wix>
</Wix>
4 changes: 2 additions & 2 deletions scripts/create_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def write_wheel(out_dir, *, name, version, tag, metadata, description, contents)
{
**contents,
f"{dist_info}/entry_points.txt": make_message([],
'[console_scripts]\ndbc = dbc.__main__:dummy'),
'[console_scripts]\ndbc = dbc.__main__:dummy'),
f"{dist_info}/METADATA": make_message(
[
("Metadata-Version", "2.4"),
Expand Down Expand Up @@ -294,7 +294,7 @@ def dummy(): """Dummy function for an entrypoint. dbc is executed as a side effe
("Project-URL", "source, https://github.com/columnar-tech/dbc"),
("Classifier", "Intended Audience :: Developers"),
("Classifier", "Topic :: Software Development"),
("Classifier", "Topic :: Scientific/Engineering"),
("Classifier", "Topic :: Scientific/Engineering"),
],
description=description,
contents=contents,
Expand Down
7 changes: 3 additions & 4 deletions scripts/install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ function Invoke-Installer($artifacts, $platforms) {

# The actual path we're going to install to
$dest_dir = $null

# Before actually consulting the configured install strategy, see
# if we're overriding it.
if (($force_install_dir)) {
Expand All @@ -256,11 +256,11 @@ function Invoke-Installer($artifacts, $platforms) {
$dest_dir = Join-Path $force_install_dir "bin"
}
"flat" {
$dest_dir = $force_install_dir
$dest_dir = $force_install_dir
}
Default {
throw "Error: unrecognized installation layout: $install_layout"
}
}
}
}
if (-not $dest_dir) {
Expand Down Expand Up @@ -433,4 +433,3 @@ try {
Write-Information $_
exit 1
}

Loading
Loading