Skip to content

Commit

Permalink
Fix CI (#68)
Browse files Browse the repository at this point in the history
  • Loading branch information
tupui committed Apr 29, 2022
1 parent 36a777d commit a160a08
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pre-commit
on:
pull_request:
push:
branches: [master]
branches: [main]

jobs:
pre-commit:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ name: Main

on:
push:
branches: master
branches: main
pull_request:
branches: master

jobs:
tests:
Expand Down
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ repos:
rev: 22.3.0
hooks:
- id: black
exclude: "docs"

- repo: https://gitlab.com/pycqa/flake8
rev: 4.0.1
Expand All @@ -21,3 +22,4 @@ repos:
hooks:
- id: mypy
files: ibis_heavyai/
exclude: "ibis_heavyai/tests"
6 changes: 4 additions & 2 deletions ci/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
version: '3.9'
services:

heavydb:
Expand All @@ -8,10 +8,12 @@ services:
- 6274:6274
- 6278:6278
volumes:
- ./heavydb.conf:/heavydb-storage/heavydb.conf
- ./heavydb.conf:/var/lib/heavyai/heavy.conf:ro

waiter:
image: jwilder/dockerize
depends_on:
- heavydb
command: |
dockerize -wait tcp://heavydb:6274
-wait-retry-interval 5s
Expand Down
2 changes: 2 additions & 0 deletions ci/heavydb.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ cpu-only = true
enable-watchdog = false
enable-window-functions = true
cpu-buffer-mem-bytes = 1000000000
allowed-export-paths = ["/tmp"]
allowed-import-paths = ["/tmp"]
2 changes: 1 addition & 1 deletion environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:

# core
- python >=3.7
- ibis-framework-core >=2.0
- ibis-framework-core >=2.0, <3
- heavyai
- rbc >=0.8.0
- pyarrow
Expand Down
2 changes: 1 addition & 1 deletion ibis_heavyai/tests/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def test_explain(con, alltypes):

@pytest.mark.parametrize(
'filename',
["./test_read_csv.csv", pathlib.Path("./test_read_csv.csv")],
["/tmp/test_read_csv.csv", pathlib.Path("/tmp/test_read_csv.csv")],
)
def test_read_csv(con, temp_table, filename, alltypes, df_alltypes):
schema = alltypes.schema()
Expand Down
19 changes: 14 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ classifiers = [
]

dependencies = [
"ibis-framework >=2.0",
"ibis-framework >=2.0, <3",
"heavyai",
"rbc-project >=0.8.0",
"pyarrow >=3.0.0",
Expand Down Expand Up @@ -61,7 +61,6 @@ exclude = [
line-length = 79
skip-string-normalization = true
target-version = ["py37", "py38", "py39", "py310"]
exclude = "docs"

[tool.isort]
ensure_newline_before_comments = true
Expand All @@ -71,9 +70,6 @@ include_trailing_comma = true

[tool.mypy]
ignore_missing_imports = true
exclude = [
'ibis_heavyai/tests',
]

[tool.pytest.ini_options]
minversion = "6.0"
Expand All @@ -93,4 +89,17 @@ markers = [
"only_on_backends", # replaced by notimpl ibis>2.1.2
"notimpl",
"min_spark_version",
"never",
"broken",
"sqlite",
"pyspark",
"postgres",
"pandas",
"mysql",
"impala",
"duckdb",
"datafusion",
"dask",
"clickhouse",
"heavyai",
]

0 comments on commit a160a08

Please sign in to comment.