[GitHub] feng-tao closed pull request #3752: [AIRFLOW-XXX] Make pip install commands consistent

[GitBox <gi...@apache.org>]

feng-tao closed pull request #3752: [AIRFLOW-XXX] Make pip install commands consistent
URL: https://github.com/apache/incubator-airflow/pull/3752
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 060c5dd84d..e6df3d4751 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -93,7 +93,7 @@ docker run -t -i -v `pwd`:/airflow/ -w /airflow/ -e SLUGIFY_USES_TEXT_UNIDECODE=
 
 # Install Airflow with all the required dependencies,
 # including the devel which will provide the development tools
-pip install -e ".[hdfs,hive,druid,devel]"
+pip install -e .[devel,druid,hdfs,hive]
 
 # Init the database
 airflow initdb
diff --git a/airflow/contrib/utils/sendgrid.py b/airflow/contrib/utils/sendgrid.py
index 9055c97879..6d8b5f5ddb 100644
--- a/airflow/contrib/utils/sendgrid.py
+++ b/airflow/contrib/utils/sendgrid.py
@@ -42,7 +42,7 @@ def send_email(to, subject, html_content, files=None,
 
     To use this plugin:
     0. include sendgrid subpackage as part of your Airflow installation, e.g.,
-    pip install airflow[sendgrid]
+    pip install apache-airflow[sendgrid]
     1. update [email] backend in airflow.cfg, i.e.,
     [email]
     email_backend = airflow.contrib.utils.sendgrid.send_email
diff --git a/airflow/example_dags/example_kubernetes_operator.py b/airflow/example_dags/example_kubernetes_operator.py
index 92d73c5d33..e8d35c4c5b 100644
--- a/airflow/example_dags/example_kubernetes_operator.py
+++ b/airflow/example_dags/example_kubernetes_operator.py
@@ -25,7 +25,7 @@
 
 try:
     # Kubernetes is optional, so not available in vanilla Airflow
-    # pip install airflow[kubernetes]
+    # pip install apache-airflow[kubernetes]
     from airflow.contrib.operators.kubernetes_pod_operator import KubernetesPodOperator
 
     args = {
@@ -53,4 +53,4 @@
 except ImportError as e:
     log.warn("Could not import KubernetesPodOperator: " + str(e))
     log.warn("Install kubernetes dependencies with: "
-             "    pip install airflow['kubernetes']")
+             "    pip install apache-airflow[kubernetes]")
diff --git a/docs/installation.rst b/docs/installation.rst
index e012b288a8..d522d0b2da 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -14,7 +14,7 @@ You can also install Airflow with support for extra features like ``s3`` or ``po
 
 .. code-block:: bash
 
-    pip install "apache-airflow[s3, postgres]"
+    pip install apache-airflow[postgres,s3]
 
 .. note:: GPL dependency
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services