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

Standardize AWS Athena naming #20305

Merged
merged 7 commits into from
Dec 20, 2021
Merged

Standardize AWS Athena naming #20305

merged 7 commits into from
Dec 20, 2021

Conversation

ferruzzi
Copy link
Contributor

@ferruzzi ferruzzi commented Dec 14, 2021

Part of #20296

Also adjusted some tests to use poke({}) and execute({}) instead of poke(None) and execute(None) as the IDE was throwing type hint warnings on those.


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@ferruzzi
Copy link
Contributor Author

Missed renaming the hooks in the sensor tests, update coming.

@ferruzzi ferruzzi changed the title Rename AWS Athena hooks/operators/sensors to standard Standardize AWS Athena naming Dec 15, 2021
airflow/providers/amazon/aws/hooks/athena.py Outdated Show resolved Hide resolved
airflow/providers/amazon/aws/operators/athena.py Outdated Show resolved Hide resolved
setup.cfg Outdated
@@ -45,6 +45,7 @@ license_files =
licenses/LICENSE-moment-strftime.txt
licenses/LICENSE-moment.txt
licenses/LICENSE-normalize.txt
licenses/LICENSES-ui.txt
Copy link
Member

Choose a reason for hiding this comment

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

This seems unrelated?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the pre-commits keep adding that??

Copy link
Member

Choose a reason for hiding this comment

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

Hmm that doesn’t make sense, there’s an identical line just below and pre-commit should catch that. Something is probably broken somewhere. Could you temporarily disable pre-commit to remove that line and push to see if CI would let it pass?

Copy link
Contributor

Choose a reason for hiding this comment

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

yep this change should be removed.
this PR should not change setup.cfg

Copy link
Contributor Author

@ferruzzi ferruzzi Dec 15, 2021

Choose a reason for hiding this comment

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

Change reverted and pushed.

My pre-commit hooks also started failing a whole bunch of mypy tests today when I pulled the latest main down, so I may need to unbork something on my environment. Sorry I missed that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For context, I just now rebased main and ran the pre-commits locally using pre-commit run --all-files on it without any of my code changes and it did the same:

Update setup.cfg file with all licenses..................................................Failed
- hook id: update-setup-cfg-file
- files were modified by this hook

Copy link
Contributor

@eladkal eladkal left a comment

Choose a reason for hiding this comment

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

LGTM

@uranusjr any further comments?

@kaxil kaxil removed their request for review December 16, 2021 00:10
@ferruzzi
Copy link
Contributor Author

Looks like I'll have to rebase to clear some merge conflicts. I'll take care of that tomorrow/Thursday.

@eladkal eladkal dismissed uranusjr’s stale review December 20, 2021 16:16

Comments addressed

Copy link
Contributor

@eladkal eladkal left a comment

Choose a reason for hiding this comment

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

LGTM

If there will be more comments we'll address them in a followup PR.

@github-actions
Copy link

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest main or amend the last commit of the PR, and push it with --force-with-lease.

@github-actions github-actions bot added the okay to merge It's ok to merge this PR as it does not require more tests label Dec 20, 2021
@eladkal eladkal merged commit 4dd751d into apache:main Dec 20, 2021
@ferruzzi ferruzzi deleted the rename-athena branch December 20, 2021 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:dev-tools area:providers kind:documentation okay to merge It's ok to merge this PR as it does not require more tests provider:amazon-aws AWS/Amazon - related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants