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

[AIRFLOW-3005] Replace 'Airbnb Airflow' with 'Apache Airflow' #3845

Merged
merged 1 commit into from
Sep 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion airflow/contrib/example_dags/example_twitter_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ CREATE TABLE toTwitter_A(id BIGINT, id_str STRING

When you review the code for the DAG, you will notice that these tasks are generated using for loop. These two for loops could be combined into one loop. However, in most cases, you will be running different analysis on your incoming incoming and outgoing tweets, and hence they are kept separated in this example.
Final step is a running the broker script, brokerapi.py, which will run queries in Hive and store the summarized data to MySQL in our case. To connect to Hive, pyhs2 library is extremely useful and easy to use. To insert data into MySQL from Python, sqlalchemy is also a good one to use.
I hope you find this tutorial useful. If you have question feel free to ask me on [Twitter](https://twitter.com/EkhtiarSyed) or via the live Airflow chatroom room in [Gitter](https://gitter.im/airbnb/airflow).<p>
I hope you find this tutorial useful. If you have question feel free to ask me on [Twitter](https://twitter.com/EkhtiarSyed) or via the live Airflow chatroom room in [Gitter](https://gitter.im/apache/incubator-airflow).<p>
-Ekhtiar Syed
Last Update: 8-April-2016
3 changes: 1 addition & 2 deletions airflow/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3644,8 +3644,7 @@ def subdags(self):
"""
Returns a list of the subdag objects associated to this DAG
"""
# Check SubDag for class but don't check class directly, see
# https://github.com/airbnb/airflow/issues/1168
# Check SubDag for class but don't check class directly
from airflow.operators.subdag_operator import SubDagOperator
subdag_lst = []
for task in self.tasks:
Expand Down
4 changes: 2 additions & 2 deletions airflow/operators/slack_operator.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ def __init__(self,
text='No message has been set.\n'
'Here is a cat video instead\n'
'https://www.youtube.com/watch?v=J---aiyznGQ',
icon_url='https://raw.githubusercontent.com'
'/airbnb/airflow/master/airflow/www/static/pin_100.png',
icon_url='https://raw.githubusercontent.com/apache/'
'incubator-airflow/master/airflow/www/static/pin_100.jpg',
attachments=None,
*args, **kwargs):
self.method = 'chat.postMessage'
Expand Down
2 changes: 1 addition & 1 deletion docs/scheduler.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ interval series.

"""
Code that goes along with the Airflow tutorial located at:
https://github.com/airbnb/airflow/blob/master/airflow/example_dags/tutorial.py
https://github.com/apache/incubator-airflow/blob/master/airflow/example_dags/tutorial.py
"""
from airflow import DAG
from airflow.operators.bash_operator import BashOperator
Expand Down
2 changes: 0 additions & 2 deletions tests/jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,6 @@ def test_backfill_ordered_concurrent_execute(self):
def test_backfill_pooled_tasks(self):
"""
Test that queued tasks are executed by BackfillJob

Test for https://github.com/airbnb/airflow/pull/1225
"""
session = settings.Session()
pool = Pool(pool='test_backfill_pooled_task_pool', slots=1)
Expand Down
6 changes: 3 additions & 3 deletions tests/sensors/test_http_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class FakeSession(object):
def __init__(self):
self.response = requests.Response()
self.response.status_code = 200
self.response._content = 'airbnb/airflow'.encode('ascii', 'ignore')
self.response._content = 'apache/incubator-airflow'.encode('ascii', 'ignore')

def send(self, request, **kwargs):
return self.response
Expand Down Expand Up @@ -178,7 +178,7 @@ def test_get_response_check(self):
method='GET',
endpoint='/search',
data={"client": "ubuntu", "q": "airflow"},
response_check=lambda response: ("airbnb/airflow" in response.text),
response_check=lambda response: ("apache/incubator-airflow" in response.text),
headers={},
dag=self.dag)
t.run(start_date=DEFAULT_DATE, end_date=DEFAULT_DATE, ignore_ti_state=True)
Expand All @@ -192,7 +192,7 @@ def test_sensor(self):
request_params={"client": "ubuntu", "q": "airflow", 'date': '{{ds}}'},
headers={},
response_check=lambda response: (
"airbnb/airflow/" + DEFAULT_DATE.strftime('%Y-%m-%d')
"apache/incubator-airflow/" + DEFAULT_DATE.strftime('%Y-%m-%d')
in response.text),
poke_interval=5,
timeout=15,
Expand Down