Skip to content

Commit

Permalink
Rely on hatch being present on the build machine (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
nfx authored Mar 13, 2024
1 parent 56277a2 commit 2352106
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
7 changes: 2 additions & 5 deletions .codegen.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
"src/databricks/labs/lsql/__about__.py": "__version__ = \"$VERSION\""
},
"toolchain": {
"required": ["python3"],
"pre_setup": [
"python3 -m pip install hatch==1.7.0",
"python3 -m hatch env create"
],
"required": ["python3", "hatch"],
"pre_setup": ["hatch env create"],
"prepend_path": ".venv/bin",
"acceptance_path": "tests/integration",
"test": [
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
python-version: '3.10'

- name: Install hatch
run: pip install hatch==1.7.0
run: pip install hatch==1.9.4

- name: Run integration tests
uses: databrickslabs/sandbox/acceptance@acceptance/v0.1.4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

- name: Run unit tests
run: |
pip install hatch==1.7.0
pip install hatch==1.9.4
make test
- name: Publish test coverage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Build wheels
run: |
pip install hatch==1.7.0
pip install hatch==1.9.4
hatch build
- name: Draft release
Expand Down
7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,10 @@ coverage = "pytest -n 2 --cov src tests/unit --timeout 30 --cov-report=html -
integration = "pytest -n 10 --cov src tests/integration --durations 20"
fmt = ["isort .",
"ruff format",
"ruff . --fix",
"ruff check . --fix",
"mypy .",
"pylint --output-format=colorized -j 0 src"]
verify = ["black --check .",
"isort . --check-only",
verify = ["isort . --check-only",
"ruff .",
"mypy .",
"pylint --output-format=colorized -j 0 src"]
Expand All @@ -94,7 +93,7 @@ cache-dir = ".venv/ruff-cache"
target-version = "py310"
line-length = 120

[tool.ruff.isort]
[tool.ruff.lint.isort]
known-first-party = ["databricks.labs.blueprint"]

[tool.coverage.run]
Expand Down

0 comments on commit 2352106

Please sign in to comment.