You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by bo...@apache.org on 2017/04/17 08:10:04 UTC

incubator-airflow git commit: [AIRFLOW-1000] Rebrand distribution to Apache Airflow

Repository: incubator-airflow
Updated Branches:
  refs/heads/master 219c50641 -> 4fb05d8cc


[AIRFLOW-1000] Rebrand distribution to Apache Airflow

Per Apache requirements Airflow should be branded
Apache Airflow.
It is impossible to provide a forward compatible
automatic update
path and users will be required to manually
upgrade.

Closes #2172 from bolkedebruin/AIRFLOW-1000


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/4fb05d8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/4fb05d8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/4fb05d8c

Branch: refs/heads/master
Commit: 4fb05d8cc7a69255c6bff33c7f856eb4a341d5f2
Parents: 219c506
Author: Bolke de Bruin <bo...@xs4all.nl>
Authored: Mon Apr 17 10:09:47 2017 +0200
Committer: Bolke de Bruin <bo...@xs4all.nl>
Committed: Mon Apr 17 10:09:47 2017 +0200

----------------------------------------------------------------------
 .rat-excludes      |  1 +
 airflow/version.py |  2 +-
 setup.py           | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4fb05d8c/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 1363766..1238abb 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -13,6 +13,7 @@ docs
 dist
 build
 airflow.egg-info
+apache_airflow.egg-info
 .idea
 metastore_db
 .*sql

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4fb05d8c/airflow/version.py
----------------------------------------------------------------------
diff --git a/airflow/version.py b/airflow/version.py
index 038d3dd..bce497e 100644
--- a/airflow/version.py
+++ b/airflow/version.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-version = '1.9.0dev0+apache.incubating'
+version = '1.9.0dev0+incubating'

http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/4fb05d8c/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 6691208..d0c2446 100644
--- a/setup.py
+++ b/setup.py
@@ -18,6 +18,7 @@ from setuptools.command.test import test as TestCommand
 import imp
 import logging
 import os
+import pip
 import sys
 
 logger = logging.getLogger(__name__)
@@ -99,6 +100,15 @@ def write_version(filename=os.path.join(*['airflow',
         a.write(text)
 
 
+def check_previous():
+    installed_packages = ([package.project_name for package
+                           in pip.get_installed_distributions()])
+    if 'airflow' in installed_packages:
+        print("An earlier non-apache version of Airflow was installed, "
+              "please uninstall it first. Then reinstall.")
+        sys.exit(1)
+
+
 async = [
     'greenlet>=0.4.9',
     'eventlet>= 0.9.7',
@@ -192,9 +202,10 @@ devel_all = devel + all_dbs + doc + samba + s3 + slack + crypto + oracle + docke
 
 
 def do_setup():
+    check_previous()
     write_version()
     setup(
-        name='airflow',
+        name='apache-airflow',
         description='Programmatically author, schedule and monitor data pipelines',
         license='Apache License 2.0',
         version=version,