Skip to content

Commit

Permalink
reorganize, fix protoc, add build env + check script
Browse files Browse the repository at this point in the history
  • Loading branch information
MichelleArk committed Jan 25, 2024
1 parent b3dd64d commit 87dfe3f
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 60 deletions.
20 changes: 20 additions & 0 deletions .github/actions/setup-python-env/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Setup Python env
description: Install Python & Hatch
inputs:
python-version:
description: 'Version of Python to Install'
required: true
default: '3.9'
runs:
using: "composite"
steps:
- name: "Set up Python ${{ inputs.python-version }}"
uses: actions/setup-python@v4
with:
python-version: "${{ inputs.python-version }}"

- name: Install Hatch
shell: bash
run: |
python -m pip install --user --upgrade pip
python -m pip install hatch
16 changes: 7 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
type: choice
description: Choose where to publish (test/prod)
options:
- prod
- test
default: prod
- PypiProd
- PypiTest
default: PypiTest

permissions: read-all

Expand Down Expand Up @@ -39,15 +39,11 @@ jobs:
with:
persist-credentials: false

- name: Set up Python 3.11
uses: actions/setup-python@v4
- name: "Set up Python & Hatch - 3.11"
uses: ./.github/actions/setup-python-env
with:
python-version: "3.11"

- name: Install hatch
run: python -m pip install hatch
shell: bash

- name: Build artifacts
run: hatch build
shell: bash
Expand All @@ -58,3 +54,5 @@ jobs:

- name: Publish artifacts to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
repository-url: https://test.pypi.org/legacy/
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ lint:

.PHONY: proto_types
proto_types: ## generates google protobuf python file from types.proto
protoc -I=./dbt/common/events --python_out=./dbt/common/events ./dbt/common/events/types.proto
protoc -I=./dbt_common/events --python_out=./dbt_common/events ./dbt_common/events/types.proto

.PHONY: help
help: ## Show this help message.
Expand Down
97 changes: 47 additions & 50 deletions dbt_common/events/types_pb2.py

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

21 changes: 21 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,27 @@ dependencies = [
"types-PyYAML~=6.0",
]

[tool.hatch.envs.build]
detached = true
features = ["build"]

[tool.hatch.envs.build.scripts]
check-all = [
"- check-wheel",
"- check-sdist",
]
check-wheel = [
"twine check dist/*",
"find ./dist/dbt_common-*.whl -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
"pip freeze | grep dbt-common",
]
check-sdist = [
"check-wheel-contents dist/*.whl --ignore W007,W008",
"find ./dist/dbt_common-*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
"pip freeze | grep dbt-common",
]
protobuf = "protoc -I=./dbt_common/events --python_out=./dbt_common/events ./dbt_common/events/types.proto"

[tool.ruff]
line-length = 120
select = [
Expand Down

0 comments on commit 87dfe3f

Please sign in to comment.