Getting setup.py working, moving folders around

yonajune · Oct 12, 2014 · 6cffc62 · 6cffc62
1 parent e491dab
commit 6cffc62
Show file tree

Hide file tree

Showing 46 changed files with 27 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 env
 logs
 build
+dist
 *.pyc
 docs/_*
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+recursive-include flux/www/static *
+recursive-include flux/www/templates *
diff --git a/docs/conf.py b/docs/conf.py
@@ -14,11 +14,12 @@
 
 import sys
 import os
+from flux import settings
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.environ['FLUX_HOME'] + "/src/flux")
+sys.path.insert(0, settings.FLUX_HOME + "/src/flux")
 
 # -- General configuration ------------------------------------------------
 

diff --git a/flux b/flux
diff --git a/src/flux/__init__.py → flux/__init__.py b/src/flux/__init__.py → flux/__init__.py
diff --git a/flux/bin/flux b/flux/bin/flux
@@ -0,0 +1,3 @@
+#!/bin/bash
+source $FLUX_HOME/init.sh
+python $FLUX_HOME/flux/bin/flux_bin.py $*
diff --git a/src/flux/bin/flux_bin.py → flux/bin/flux_bin.py b/src/flux/bin/flux_bin.py → flux/bin/flux_bin.py
diff --git a/src/flux/executors/__init__.py → flux/executors/__init__.py b/src/flux/executors/__init__.py → flux/executors/__init__.py
diff --git a/src/flux/executors/base_executor.py → flux/executors/base_executor.py b/src/flux/executors/base_executor.py → flux/executors/base_executor.py
diff --git a/src/flux/hooks/__init__.py → flux/hooks/__init__.py b/src/flux/hooks/__init__.py → flux/hooks/__init__.py
diff --git a/src/flux/hooks/base_hook.py → flux/hooks/base_hook.py b/src/flux/hooks/base_hook.py → flux/hooks/base_hook.py
diff --git a/src/flux/hooks/mysql_hook.py → flux/hooks/mysql_hook.py b/src/flux/hooks/mysql_hook.py → flux/hooks/mysql_hook.py
diff --git a/src/flux/macros.py → flux/macros.py b/src/flux/macros.py → flux/macros.py
diff --git a/src/flux/models.py → flux/models.py b/src/flux/models.py → flux/models.py
diff --git a/src/flux/operators/__init__.py → flux/operators/__init__.py b/src/flux/operators/__init__.py → flux/operators/__init__.py
diff --git a/src/flux/operators/base_sensor_operator.py → flux/operators/base_sensor_operator.py b/src/flux/operators/base_sensor_operator.py → flux/operators/base_sensor_operator.py
diff --git a/src/flux/operators/bash_operator.py → flux/operators/bash_operator.py b/src/flux/operators/bash_operator.py → flux/operators/bash_operator.py
diff --git a/src/flux/operators/dummy_operator.py → flux/operators/dummy_operator.py b/src/flux/operators/dummy_operator.py → flux/operators/dummy_operator.py
diff --git a/src/flux/operators/mysql_operator.py → flux/operators/mysql_operator.py b/src/flux/operators/mysql_operator.py → flux/operators/mysql_operator.py
diff --git a/src/flux/settings.py → flux/settings.py b/src/flux/settings.py → flux/settings.py
@@ -4,11 +4,10 @@
 from sqlalchemy import create_engine
 
 if 'FLUX_HOME' not in os.environ:
-    raise Exception(
-        "Looks like someone forgot to set their FLUX_HOME env variable.")
+    os.environ['FLUX_HOME'] = os.path.join(os.path.dirname(__file__), "..")
 FLUX_HOME = os.environ['FLUX_HOME']
 
-BASE_FOLDER = FLUX_HOME + '/src/flux'
+BASE_FOLDER = FLUX_HOME + '/flux'
 if BASE_FOLDER not in sys.path:
     sys.path.append(BASE_FOLDER)
 DAGS_FOLDER = FLUX_HOME + '/dags'

diff --git a/src/flux/utils.py → flux/utils.py b/src/flux/utils.py → flux/utils.py
diff --git a/src/www/__init__.py → flux/www/__init__.py b/src/www/__init__.py → flux/www/__init__.py
diff --git a/src/www/app.py → flux/www/app.py b/src/www/app.py → flux/www/app.py
diff --git a/src/www/static/d3.v3.min.js → flux/www/static/d3.v3.min.js b/src/www/static/d3.v3.min.js → flux/www/static/d3.v3.min.js
diff --git a/src/www/static/dagre-d3.min.js → flux/www/static/dagre-d3.min.js b/src/www/static/dagre-d3.min.js → flux/www/static/dagre-d3.min.js
diff --git a/src/www/static/dagre.css → flux/www/static/dagre.css b/src/www/static/dagre.css → flux/www/static/dagre.css
diff --git a/src/www/static/docs → flux/www/static/docs b/src/www/static/docs → flux/www/static/docs
diff --git a/src/www/static/favicon.ico → flux/www/static/favicon.ico b/src/www/static/favicon.ico → flux/www/static/favicon.ico
diff --git a/src/www/static/graph.css → flux/www/static/graph.css b/src/www/static/graph.css → flux/www/static/graph.css
diff --git a/src/www/static/highcharts-more.js → flux/www/static/highcharts-more.js b/src/www/static/highcharts-more.js → flux/www/static/highcharts-more.js
diff --git a/src/www/static/highcharts.js → flux/www/static/highcharts.js b/src/www/static/highcharts.js → flux/www/static/highcharts.js
diff --git a/src/www/static/main.css → flux/www/static/main.css b/src/www/static/main.css → flux/www/static/main.css
diff --git a/src/www/static/screenshots/gantt.png → flux/www/static/screenshots/gantt.png b/src/www/static/screenshots/gantt.png → flux/www/static/screenshots/gantt.png
diff --git a/src/www/static/screenshots/graph.png → flux/www/static/screenshots/graph.png b/src/www/static/screenshots/graph.png → flux/www/static/screenshots/graph.png
diff --git a/src/www/static/screenshots/tree.png → flux/www/static/screenshots/tree.png b/src/www/static/screenshots/tree.png → flux/www/static/screenshots/tree.png
diff --git a/src/www/static/tree.css → flux/www/static/tree.css b/src/www/static/tree.css → flux/www/static/tree.css
diff --git a/src/www/templates/admin/chart.html → flux/www/templates/admin/chart.html b/src/www/templates/admin/chart.html → flux/www/templates/admin/chart.html
diff --git a/src/www/templates/admin/code.html → flux/www/templates/admin/code.html b/src/www/templates/admin/code.html → flux/www/templates/admin/code.html
diff --git a/src/www/templates/admin/dag.html → flux/www/templates/admin/dag.html b/src/www/templates/admin/dag.html → flux/www/templates/admin/dag.html
diff --git a/src/www/templates/admin/gantt.html → flux/www/templates/admin/gantt.html b/src/www/templates/admin/gantt.html → flux/www/templates/admin/gantt.html
diff --git a/src/www/templates/admin/graph.html → flux/www/templates/admin/graph.html b/src/www/templates/admin/graph.html → flux/www/templates/admin/graph.html
diff --git a/src/www/templates/admin/index.html → flux/www/templates/admin/index.html b/src/www/templates/admin/index.html → flux/www/templates/admin/index.html
diff --git a/src/www/templates/admin/master.html → flux/www/templates/admin/master.html b/src/www/templates/admin/master.html → flux/www/templates/admin/master.html
diff --git a/src/www/templates/admin/tree.html → flux/www/templates/admin/tree.html b/src/www/templates/admin/tree.html → flux/www/templates/admin/tree.html
diff --git a/init.sh b/init.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 source $FLUX_HOME/env/bin/activate
-export PYTHONPATH=$FLUX_HOME/src
+export PYTHONPATH=$FLUX_HOME
diff --git a/setup.py b/setup.py
@@ -0,0 +1,16 @@
+import os
+from distutils.core import setup
+from pip.req import parse_requirements
+
+req_filepath = os.path.join(os.path.dirname(__file__), "/requirements.txt")
+install_reqs = parse_requirements(req_filepath)
+
+setup(
+    name='flux',
+    version='0.1',
+    packages=['flux'],
+    install_requires=install_reqs,
+    author='Maxime Beauchemin',
+    author_email='[email protected]',
+)
+
-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     env
     logs
     build
+    dist
     *.pyc
     docs/_*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		recursive-include flux/www/static *
		recursive-include flux/www/templates *