-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Add Composer samples that explicitly call python2 #1711
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
print 'Output from Python 2.' # noqa |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# [START composer_bashoperator_python2] | ||
import datetime | ||
|
||
from airflow import models | ||
from airflow.operators import bash_operator | ||
|
||
|
||
yesterday = datetime.datetime.combine( | ||
datetime.datetime.today() - datetime.timedelta(1), | ||
datetime.datetime.min.time()) | ||
|
||
|
||
default_dag_args = { | ||
# Setting start date as yesterday starts the DAG immediately when it is | ||
# detected in the Cloud Storage bucket. | ||
'start_date': yesterday, | ||
} | ||
|
||
with models.DAG( | ||
'composer_sample_bashoperator_python2', | ||
schedule_interval=datetime.timedelta(days=1), | ||
default_args=default_dag_args) as dag: | ||
|
||
run_python2 = bash_operator.BashOperator( | ||
task_id='run_python2', | ||
# This example runs a Python script from the data folder to prevent | ||
# Airflow from attempting to parse the script as a DAG. | ||
bash_command='python2 /home/airflow/gcs/data/python2_script.py', | ||
) | ||
# [END composer_bashoperator_python2] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from . import unit_testing | ||
|
||
|
||
def test_dag_import(): | ||
"""Test that the DAG file can be successfully imported. | ||
|
||
This tests that the DAG can be parsed, but does not run it in an Airflow | ||
environment. This is a recommended sanity check by the official Airflow | ||
docs: https://airflow.incubator.apache.org/tutorial.html#testing | ||
""" | ||
from . import bashoperator_python2 as module | ||
unit_testing.assert_has_valid_dag(module) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
# [START composer_pythonvirtualenvoperator_python2] | ||
import datetime | ||
|
||
from airflow import models | ||
from airflow.operators import python_operator | ||
|
||
|
||
def python2_function(): | ||
"""A function which has not been converted to Python 3.""" | ||
# Use the global variable virtualenv_string_args to pass in values when the | ||
# Python version differs from that used by the Airflow process. | ||
global virtualenv_string_args | ||
|
||
# Imports must happen within the function when run with the | ||
# PythonVirtualenvOperator. | ||
import cStringIO | ||
import logging | ||
|
||
arg0 = virtualenv_string_args[0] | ||
buffer = cStringIO.StringIO() | ||
buffer.write('Wrote an ASCII string to buffer:\n') | ||
buffer.write(arg0) | ||
logging.info(buffer.getvalue()) | ||
|
||
|
||
yesterday = datetime.datetime.combine( | ||
datetime.datetime.today() - datetime.timedelta(1), | ||
datetime.datetime.min.time()) | ||
|
||
|
||
default_dag_args = { | ||
# Setting start date as yesterday starts the DAG immediately when it is | ||
# detected in the Cloud Storage bucket. | ||
'start_date': yesterday, | ||
} | ||
|
||
with models.DAG( | ||
'composer_sample_pythonvirtualenvoperator_python2', | ||
schedule_interval=datetime.timedelta(days=1), | ||
default_args=default_dag_args) as dag: | ||
|
||
# Use the PythonVirtualenvOperator to select an explicit python_version. | ||
run_python2 = python_operator.PythonVirtualenvOperator( | ||
task_id='run_python2', | ||
python_callable=python2_function, | ||
python_version='2', | ||
string_args=['An example input string'], | ||
) | ||
# [END composer_pythonvirtualenvoperator_python2] |
31 changes: 31 additions & 0 deletions
31
composer/workflows/pythonvirtualenvoperator_python2_test.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Copyright 2018 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# https://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import sys | ||
|
||
import pytest | ||
|
||
from . import unit_testing | ||
|
||
|
||
@pytest.mark.skipif(sys.version_info >= (3, 0), reason="requires Python 2") | ||
def test_dag_import(): | ||
"""Test that the DAG file can be successfully imported. | ||
|
||
This tests that the DAG can be parsed, but does not run it in an Airflow | ||
environment. This is a recommended sanity check by the official Airflow | ||
docs: https://airflow.incubator.apache.org/tutorial.html#testing | ||
""" | ||
from . import pythonvirtualenvoperator_python2 as module | ||
unit_testing.assert_has_valid_dag(module) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like the DAG should be importable from Python3 like the other one in this commit, unless I'm missing something
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right. #1714