Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement hatch #21

Merged
merged 35 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
285b65b
commit to hatch
emmyoop Jan 9, 2024
bfcafc1
fix files but it doesnt match pre-commit
emmyoop Jan 10, 2024
5c4602e
update config
emmyoop Jan 11, 2024
f60c8da
more reformatting
emmyoop Jan 11, 2024
29930d8
fixing mypy
emmyoop Jan 11, 2024
b6eeeb8
fixing types
emmyoop Jan 12, 2024
d09a638
fix linting, still some pending ignored errors
emmyoop Jan 12, 2024
67e14c8
fix testing errors
emmyoop Jan 12, 2024
642838d
type fixing, hatch updates
emmyoop Jan 16, 2024
d4b7873
more hatch setup
emmyoop Jan 16, 2024
c0a2afc
fix test command in ci
emmyoop Jan 16, 2024
a307556
fix test command in ci
emmyoop Jan 16, 2024
6155bcf
update contributing doc
emmyoop Jan 16, 2024
430bd5a
remove ard in favor of #28
emmyoop Jan 16, 2024
9b40c70
move around hatch envs
emmyoop Jan 16, 2024
9c1c1da
fix CI
emmyoop Jan 16, 2024
6c251e2
Update CONTRIBUTING.md
emmyoop Jan 18, 2024
96d673c
fix merge conflict issues
emmyoop Jan 18, 2024
7dc2172
pre-commit settings
emmyoop Jan 22, 2024
98cbd78
fix pre-commit
emmyoop Jan 24, 2024
0cbbf70
split up pre-commit linting
emmyoop Jan 24, 2024
8a282c6
remove extra version declaration
emmyoop Jan 24, 2024
3cc8d27
remove ruff, reorganize
emmyoop Jan 24, 2024
56af7ea
fux build env
emmyoop Jan 24, 2024
47c223a
remove ruff
emmyoop Jan 25, 2024
4bbd60b
move around how env are defined so we can drop into a shell
emmyoop Jan 25, 2024
d11d66a
Merge branch 'main' into er/build-tooling
emmyoop Jan 25, 2024
3340a3c
dep cleanup
emmyoop Jan 25, 2024
735000d
Merge branch 'er/build-tooling' of https://github.com/dbt-labs/dbt-co…
emmyoop Jan 25, 2024
9f16407
remove extra line
emmyoop Jan 25, 2024
415b794
review changes
emmyoop Jan 25, 2024
e41d60f
centralize python/hatch install
emmyoop Jan 25, 2024
cc28c49
fix action name
emmyoop Jan 25, 2024
293c02c
fix step name
emmyoop Jan 25, 2024
2462ea1
Merge branch 'main' into er/build-tooling
emmyoop Jan 26, 2024
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
14 changes: 0 additions & 14 deletions .flake8
Copy link
Member Author

Choose a reason for hiding this comment

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

These settings now live in pyproject.toml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/actions/setup-python-hatch/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
46 changes: 5 additions & 41 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,50 +42,14 @@ jobs:
- name: Check out the repository
uses: actions/checkout@v4

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

- name: "Install build specific python dependencies"
run: |
python -m pip install --user --upgrade pip
python -m pip install --upgrade wheel twine check-wheel-contents
python -m pip --version

- name: "Install Hatch"
shell: bash
run: pip3 install hatch
python-version: "3.11"

- name: "Build Python Package"
run: |
hatch build

- name: "Show distributions"
run: ls -lh dist/

- name: "Check distribution descriptions"
run: |
twine check dist/*

- name: "Check wheel contents"
run: |
check-wheel-contents dist/*.whl --ignore W007,W008

- name: "Install wheel distributions"
run: |
find ./dist/dbt_common-*.whl -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/

# TODO: how to validate here? we did dbt --version previously. this checks it's there, but not that it can do anything. maybe it's enough?
- name: "Check wheel distributions"
run: |
pip freeze | grep dbt-common

- name: "Install source distributions"
run: |
find ./dist/dbt_common-*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/

# TODO: how to validate here? we did dbt --version previously. this checks it's there, but not that it can do anything. maybe it's enough?
- name: "Check source distributions"
run: |
pip freeze | grep dbt-common
- name: "Check build"
run: hatch run build:check-all
12 changes: 6 additions & 6 deletions .github/workflows/ci_code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ jobs:
- name: Check out the repository
uses: actions/checkout@v4

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

- name: Install Hatch
- name: Install pre-commit
Copy link
Contributor

Choose a reason for hiding this comment

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

Why would we install pre-commit in CI? I'm probably answering my own question, but is it to catch the eof and trailing whitespace issues?

Copy link
Member Author

Choose a reason for hiding this comment

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

You are indeed answering your own question.

shell: bash
run: pip3 install hatch
run: pip3 install pre-commit

- name: Run Pre-commit Hooks
run: hatch run dev-env:pre-commit run --show-diff-on-failure --color=always --all-files
run: pre-commit run --show-diff-on-failure --color=always --all-files
10 changes: 3 additions & 7 deletions .github/workflows/ci_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,13 @@ jobs:
- name: "Check out the repository"
uses: actions/checkout@v4

- name: "Set up Python ${{ matrix.python-version }}"
uses: actions/setup-python@v5
- name: "Set up Python & Hatch - ${{ matrix.python-version }}"
uses: ./.github/actions/setup-python-hatch
with:
python-version: "${{ matrix.python-version }}"

- name: "Install Hatch"
shell: bash
run: pip3 install hatch

- name: "Run Tests"
run: hatch run dev-env:pytest tests
run: hatch run test:unit

- name: "Get current date"
if: always()
Expand Down
59 changes: 21 additions & 38 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,51 +10,34 @@ repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: debug-statements
- id: check-yaml
args: [--unsafe]
- id: end-of-file-fixer
- id: trailing-whitespace
exclude_types:
- "markdown"
- id: check-case-conflict
- repo: https://github.com/psf/black
rev: 22.3.0
- repo: local
hooks:
- id: black
- id: black
alias: black-check
stages: [manual]
args:
- "--check"
- "--diff"
- repo: https://github.com/pycqa/flake8
rev: 4.0.1
hooks:
name: black
entry: hatch run lint:black
mikealfare marked this conversation as resolved.
Show resolved Hide resolved
language: system
types: [python]
pass_filenames: false
verbose: true
- id: flake8
- id: flake8
alias: flake8-check
stages: [manual]
# - repo: https://github.com/pre-commit/mirrors-mypy
# rev: v1.4.1
# hooks:
# - id: mypy
# # N.B.: Mypy is... a bit fragile.
# #
# # By using `language: system` we run this hook in the local
# # environment instead of a pre-commit isolated one. This is needed
# # to ensure mypy correctly parses the project.

# # It may cause trouble
# # in that it adds environmental variables out of our control to the
# # mix. Unfortunately, there's nothing we can do about per pre-commit's
# # author.
# # See https://github.com/pre-commit/pre-commit/issues/730 for details.
# args: [--show-error-codes]
# files: ^dbt_common/
# language: system
# - id: mypy
# alias: mypy-check
# stages: [manual]
# args: [--show-error-codes, --pretty]
# files: ^dbt_common
# language: system
name: flake8
entry: hatch run lint:flake8
mikealfare marked this conversation as resolved.
Show resolved Hide resolved
language: system
types: [python]
pass_filenames: false
verbose: true
- id: mypy
name: mypy
entry: hatch run lint:mypy
mikealfare marked this conversation as resolved.
Show resolved Hide resolved
language: system
types: [python]
pass_filenames: false
verbose: true
49 changes: 18 additions & 31 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ There are some tools that will be helpful to you in developing locally. While th

These are the tools used in `dbt-common` development and testing:

- [`hatch`](https://hatch.pypa.io/latest/) for project management
- [`flake8`](https://flake8.pycqa.org/en/latest/) for code linting
- [`black`](https://github.com/psf/black) for code formatting
- [`mypy`](https://mypy.readthedocs.io/en/stable/) for static type checking
Expand All @@ -62,31 +63,15 @@ These are the tools used in `dbt-common` development and testing:

A deep understanding of these tools in not required to effectively contribute to `dbt-common`, but we recommend checking out the attached documentation if you're interested in learning more about each one.

#### Virtual environments

We strongly recommend using virtual environments when developing code in `dbt-common`. We recommend creating this virtualenv
in the root of the `dbt-common` repository. To create a new virtualenv, run:
```sh
python3 -m venv env
source env/bin/activate
```

This will create and activate a new Python virtual environment.

## Running `dbt-common` in development

### Installation

First make sure that you set up your `virtualenv` as described in [Setting up an environment](#setting-up-an-environment). Also ensure you have the latest version of pip installed with `pip install --upgrade pip`. Next, install `dbt-common` (and its dependencies):

```sh
git
pre-commit install
```
Ensure you have the latest version of pip installed with `pip install --upgrade pip` as well as [hatch](https://hatch.pypa.io/latest/install/).
mikealfare marked this conversation as resolved.
Show resolved Hide resolved

### Running `dbt-common`

This repository is just a template and cannot be run.
This repository cannot be run on its own.
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure that this is entirely true. I think it just has very specific use cases that make it less valuable outside of the dbt ecosystem. I'm arguing semantics, but I think the distinction we're looking for is that between a library and an application. dbt-core was more of an application whereas this is a library. I'm only pointing it out because this may convey a different sentiment than intended. After all, one of the goals of breaking up the monorepo was to establish stand-alone packages, albeit very use-case-specific packages.


## Testing

Expand All @@ -98,29 +83,31 @@ Once you're able to manually test that your code change is working as expected,

### Initial setup

None needed.

### Test commands
- [Install pre-commit](https://pre-commit.com/#usage)
emmyoop marked this conversation as resolved.
Show resolved Hide resolved
- [Install hatch](https://hatch.pypa.io/1.7/install/#pip)

No tests included.
- Nothing needed to set up your environments. hatch will create your environment as defined in the `pyproject.toml` when you run.

### Hatch Commands

### Unit, Integration, Functional?
See the pyproject.toml for a complete list of custom commands. See the h[atch docs](https://hatch.pypa.io/latest/cli/reference/) for a description of built in commands and flags.

Here are some general rules for adding tests:
* unit tests (`tests/unit`) don’t need to access a database; "pure Python" tests should be written as unit tests
* functional tests (`tests/functional`) cover anything that interacts with a database, namely adapter
Run `hatch env show` to view a list of all envoronments and all commands available within them.

## Debugging
Example uses:

1. The logs for a `dbt run` have stack traces and other information for debugging errors (in `logs/dbt.log` in your project directory).
2. Try using a debugger, like `ipdb`. For pytest: `--pdb --pdbcls=IPython.terminal.debugger:pdb`
3.
|Type|Command|Description|
emmyoop marked this conversation as resolved.
Show resolved Hide resolved
|---|---|---|
|Utility|`hatch run proto`|regenerate protobuf definitions|
|Testing|`hatch run test:unit`|run all tests|
|Code Quality|`hatch run lint:all`|run black, flake8 and mypy checks|
|Code Quality|`hatch run lint:black`|run black|
|Shell|`hatch shell`|Drops you into the default shell with project + dev requirements installed. Use `exit` to leave the shell, _not_ `deactivate`.|
|Shell|`hatch -e <environment-name> shell`|Drops you into a shell of the specified environment. Use `exit` to leave the shell, _not_ `deactivate`.|

### Assorted development tips
* Append `# type: ignore` to the end of a line if you need to disable `mypy` on that line.
* Sometimes flake8 complains about lines that are actually fine, in which case you can put a comment on the line such as: # noqa or # noqa: ANNN, where ANNN is the error code that flake8 issues.
* To collect output for `CProfile`, run dbt with the `-r` option and the name of an output file, i.e. `dbt -r dbt.cprof run`. If you just want to profile parsing, you can do: `dbt -r dbt.cprof parse`. `pip` install `snakeviz` to view the output. Run `snakeviz dbt.cprof` and output will be rendered in a browser window.

## Adding or modifying a CHANGELOG Entry

Expand Down
32 changes: 0 additions & 32 deletions Makefile
Copy link
Member Author

@emmyoop emmyoop Jan 16, 2024

Choose a reason for hiding this comment

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

hatch replaces this functionality. instead of make unit you now run hatch run unit-tests, etc

This file was deleted.

Loading
Loading