Skip to content

Commit

Permalink
various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
cbini committed Oct 24, 2023
1 parent 97502e0 commit 1fd5f8e
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 111 deletions.
81 changes: 21 additions & 60 deletions docs/contributing/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
# Welcome to Teamster contributing guide
# Welcome to the Teamster contributing guide

Thank you for investing your time in contributing to our project! Any contribution you make will be
reflected on [docs.github.com](https://docs.github.com/en) :sparkles:.

Read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable.
Read our [Code of Conduct](CODE_OF_CONDUCT.md) to keep our community approachable and respectable.

In this guide you will get an overview of the contribution workflow from opening an issue, creating
a PR, reviewing, and merging the PR.

## New contributor guide

To get an overview of the project, read the [README](README.md) file. Here are some resources to
help you get started with open source contributions:
To get an overview of the project, read the [README](/) file. Here are some resources to help you
get started with open source contributions:

- [Finding ways to contribute to open source on GitHub](https://docs.github.com/en/get-started/exploring-projects-on-github/finding-ways-to-contribute-to-open-source-on-github)
- [Set up Git](https://docs.github.com/en/get-started/quickstart/set-up-git)
Expand All @@ -28,57 +25,22 @@ To navigate our codebase with confidence, see
Check to see what [types of contributions](/contributing/types-of-contributions.md) we accept before
making changes. Some of them don't even require writing a single line of code :sparkles:.

### Issues
## Issues

#### Create a new issue
### Create a new issue

If you spot a problem with the docs,
[search if an issue already exists](https://docs.github.com/en/github/searching-for-information-on-github/searching-on-github/searching-issues-and-pull-requests#search-by-the-title-body-or-comments).
If a related issue doesn't exist, you can open a new issue using a relevant
[issue form](https://github.com/github/docs/issues/new/choose).

#### Solve an issue

Scan through our [existing issues](https://github.com/github/docs/issues) to find one that interests
you. You can narrow down the search using `labels` as filters. See
[Labels](/contributing/how-to-use-labels.md) for more information. As a general rule, we don’t
assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix.

### Make Changes

#### Make changes in the UI

Click **Make a contribution** at the bottom of any docs page to make small changes such as a typo,
sentence fix, or a broken link. This takes you to the `.md` file where you can make your changes and
[create a pull request](#pull-request) for a review.

<img src="/contributing/images/contribution_cta.png" />

#### Make changes in a codespace
## Make Changes

For more information about using a codespace for working on GitHub documentation, see
"[Working in a codespace](https://github.com/github/docs/blob/main/contributing/codespace.md)."
### Make changes in dbt Cloud

#### Make changes locally

1. Fork the repository.

- Using GitHub Desktop:

- [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop)
will guide you through setting up Desktop.
- Once Desktop is set up, you can use it to
[fork the repo](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop)!

- Using the command line:
- [Fork the repo](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo#fork-an-example-repository)
so that you can make your changes without affecting the original project until you're ready
to merge them.

2. Install or update to **Node.js**, at the version specified in `.node-version`. For more
information, see [the development guide](development.md).

3. Create a working branch and start with your changes!
1. "Create branch"
2. Make your changes
3. Commit your changes

### Commit your update

Expand All @@ -89,15 +51,12 @@ Commit the changes once you are happy with them. Don't forget to

When you're finished with the changes, create a pull request, also known as a PR.

1. On dbt Cloud: "Create a pull request on GitHub"
2. On GitHub: "Create pull request"

- Fill the "Ready for review" template so that we can review your PR. This template helps reviewers
understand your changes as well as the purpose of your pull request.
- Don't forget to
[link PR to issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
if you are solving one.
- Enable the checkbox to
[allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)
so the branch can be updated for a merge. Once you submit your PR, a Docs team member will review
your proposal. We may ask questions or request additional information.
- Asana
- We may ask for changes to be made before a PR can be merged, either using
[suggested changes](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/incorporating-feedback-in-your-pull-request)
or pull request comments. You can apply suggested changes directly through the UI. You can make
Expand All @@ -112,8 +71,10 @@ When you're finished with the changes, create a pull request, also known as a PR

Congratulations :tada::tada: The GitHub team thanks you :sparkles:.

Once your PR is merged, your contributions will be publicly visible on the
[GitHub docs](https://docs.github.com/en).
Once your PR is merged, your contributions will...

Now that you are part of the GitHub docs community, see how else you can
[contribute to the docs](/contributing/types-of-contributions.md).
- deploy to Dagster
- SQL updates will take effect whenever the next update is triggered. The lag can vary significantly
depending on the source of the data.
- If you need changes to appear immediately, we can force an update via Dagster. [how to communicate
that?]
13 changes: 0 additions & 13 deletions docs/contributing/pull-requests.md

This file was deleted.

56 changes: 28 additions & 28 deletions pdm.lock

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

3 changes: 0 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ dev = ["pytest>=7.4.0"]
[tool.pdm.scripts]
_.env_file = "env/.env"
clean = { shell = "bash .pdm/scripts/clean.sh", help = "Remove all build, test, coverage, and Python artifacts" }
docs-build = { shell = "mkdocs build", help = "Build the MkDocs documentation" }
docs-serve = { shell = "mkdocs serve", help = "Run the builtin development server" }
docs-deploy = { shell = "mkdocs gh-deploy", help = "Deploy your documentation to GitHub Pages" }
test = { shell = "pytest --capture=no", help = "Run tests with the default Python" }
secrets = { shell = "bash .pdm/scripts/secrets.sh", help = "Update k8s secret for branch" }
install-dagster = { shell = "bash .pdm/scripts/install-dagster.sh", help = "Install Dagster Cloud via Helm" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ select
department_assigned_name as `Business Unit Description`,
department_assigned_name as `Home Department Description`,
job_title as `Job Title Description`,
report_to_employee_number as `Business Unit Code`,
safe_cast(report_to_employee_number as string) as `Business Unit Code`,
format_date('%m/%d/%Y', worker_rehire_date) as `Rehire Date`,
format_date('%m/%d/%Y', worker_termination_date) as `Termination Date`,
format_date('%m/%d/%Y', birth_date) as `Birth Date`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ with
on cfo._airbyte_ticket_fields_hashid = tf._airbyte_ticket_fields_hashid
)

select *
select _airbyte_tickets_hashid, `name`, title,
from
custom_fields pivot (
max(`name`) for title in (
Expand Down
12 changes: 9 additions & 3 deletions src/dbt/titan/models/staging/stg_titan__income_form_data.sql
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
with
income_form_data as (
income_form_data as ( -- noqa: ST03
select
reference_code,
student_identifier,
_dagster_partition_key as academic_year,
parse_date('%m/%d/%Y', date_signed) as date_signed,
coalesce(
safe_cast(eligibility_result.long_value as string),
eligibility_result.string_value
) as eligibility_result,
_dagster_partition_key as academic_year,
from {{ source("titan", "src_titan__income_form_data") }}
),

deduplicate as (
-- noqa: disable=TMP
{{
dbt_utils.deduplicate(
relation="income_form_data",
partition_by="student_identifier, academic_year",
order_by="date_signed desc",
)
}}
-- noqa: enable=TMP
),

with_eligibility_name as (
select
*,
reference_code,
student_identifier,
academic_year,
date_signed,
eligibility_result,
case
eligibility_result
when '1'
Expand Down
3 changes: 1 addition & 2 deletions src/dbt/titan/models/staging/stg_titan__person_data.sql
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
with
person_data as (

select
person_identifier,
application_academic_school_year,
Expand All @@ -11,12 +10,12 @@ with
total_balance.double_value as total_balance,
total_positive_balance.double_value as total_positive_balance,
total_negative_balance.double_value as total_negative_balance,
_dagster_partition_key as academic_year,
parse_date('%m/%d/%Y', eligibility_start_date) as eligibility_start_date,
parse_date('%m/%d/%Y', eligibility_end_date) as eligibility_end_date,
coalesce(
eligibility.string_value, safe_cast(eligibility.long_value as string)
) as eligibility,
_dagster_partition_key as academic_year,
from {{ source("titan", "src_titan__person_data") }}
)

Expand Down

0 comments on commit 1fd5f8e

Please sign in to comment.