moved data into folder to fix pip install issue

dronecfd · Oct 15, 2014 · 53a0d79 · 53a0d79
1 parent c5bc0a6
commit 53a0d79
Show file tree

Hide file tree

Showing 25 changed files with 18 additions and 11 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
 include droneCFD/*.py
-recursive-include data *
-recursive-include data/0 *
-recursive-include data/system *
-recursive-include data/constant *
+recursive-include droneCFD/data *
+recursive-include droneCFD/data/0 *
+recursive-include droneCFD/data/system *
+recursive-include droneCFD/data/constant *
diff --git a/droneCFD/Utilities.py b/droneCFD/Utilities.py
@@ -29,12 +29,12 @@ def __init__(self, folderPath, geometryPath=None, templatePath=None, parserArgs=
             exit()
 
         if templatePath is None:
-            self.templatePath = os.path.dirname(__file__)+'/../data/template'
+            self.templatePath = os.path.dirname(__file__)+'/data/template'
             print 'Template File Path is: {0}'.format(self.templatePath)
 
         if geometryPath is None:
             ## Default to the base geometry
-            geometryPath = os.path.dirname(__file__)+'/../data/geometries/benchmarkAircraft.stl'
+            geometryPath = os.path.dirname(__file__)+'/data/geometries/benchmarkAircraft.stl'
 
         ## Since the path exists, lets make sure that folder doesn't exist
         #TODO: Don't just delete a folder without asking for permission

diff --git a/droneCFD/data/__init__.py b/droneCFD/data/__init__.py
@@ -0,0 +1 @@
+__author__ = 'cpaulson'
diff --git a/data/geometries/benchmarkAircraft.stl → ...CFD/data/geometries/benchmarkAircraft.stl b/data/geometries/benchmarkAircraft.stl → ...CFD/data/geometries/benchmarkAircraft.stl
diff --git a/data/template/0/R → droneCFD/data/template/0/R b/data/template/0/R → droneCFD/data/template/0/R
diff --git a/data/template/0/U → droneCFD/data/template/0/U b/data/template/0/U → droneCFD/data/template/0/U
diff --git a/data/template/0/epsilon → droneCFD/data/template/0/epsilon b/data/template/0/epsilon → droneCFD/data/template/0/epsilon
diff --git a/data/template/0/k → droneCFD/data/template/0/k b/data/template/0/k → droneCFD/data/template/0/k
diff --git a/data/template/0/nuTilda → droneCFD/data/template/0/nuTilda b/data/template/0/nuTilda → droneCFD/data/template/0/nuTilda
diff --git a/data/template/0/omega → droneCFD/data/template/0/omega b/data/template/0/omega → droneCFD/data/template/0/omega
diff --git a/data/template/0/p → droneCFD/data/template/0/p b/data/template/0/p → droneCFD/data/template/0/p
diff --git a/data/template/Allclean → droneCFD/data/template/Allclean b/data/template/Allclean → droneCFD/data/template/Allclean
diff --git a/data/template/Allrun → droneCFD/data/template/Allrun b/data/template/Allrun → droneCFD/data/template/Allrun
diff --git a/data/template/constant/RASProperties → ...eCFD/data/template/constant/RASProperties b/data/template/constant/RASProperties → ...eCFD/data/template/constant/RASProperties
diff --git a/.../template/constant/polyMesh/blockMeshDict → .../template/constant/polyMesh/blockMeshDict b/.../template/constant/polyMesh/blockMeshDict → .../template/constant/polyMesh/blockMeshDict
diff --git a/data/template/constant/transportProperties → ...ata/template/constant/transportProperties b/data/template/constant/transportProperties → ...ata/template/constant/transportProperties
diff --git a/data/template/constant/triSurface/README → .../data/template/constant/triSurface/README b/data/template/constant/triSurface/README → .../data/template/constant/triSurface/README
diff --git a/data/template/openme.foam → droneCFD/data/template/openme.foam b/data/template/openme.foam → droneCFD/data/template/openme.foam
diff --git a/data/template/system/controlDict → droneCFD/data/template/system/controlDict b/data/template/system/controlDict → droneCFD/data/template/system/controlDict
diff --git a/data/template/system/decomposeParDict → ...CFD/data/template/system/decomposeParDict b/data/template/system/decomposeParDict → ...CFD/data/template/system/decomposeParDict
diff --git a/data/template/system/fvSchemes → droneCFD/data/template/system/fvSchemes b/data/template/system/fvSchemes → droneCFD/data/template/system/fvSchemes
diff --git a/data/template/system/fvSolution → droneCFD/data/template/system/fvSolution b/data/template/system/fvSolution → droneCFD/data/template/system/fvSolution
diff --git a/data/template/system/snappyHexMeshDict → ...FD/data/template/system/snappyHexMeshDict b/data/template/system/snappyHexMeshDict → ...FD/data/template/system/snappyHexMeshDict
diff --git a/...template/system/surfaceFeatureExtractDict → ...template/system/surfaceFeatureExtractDict b/...template/system/surfaceFeatureExtractDict → ...template/system/surfaceFeatureExtractDict
diff --git a/setup.py b/setup.py
@@ -4,11 +4,18 @@
 from os import path, walk
 
 here = path.abspath(path.dirname(__file__))
-datadir = 'data'
+datadir = 'droneCFD/data'
 package_data = [ (d, [path.join(d, f) for f in files]) for d,folders,files in walk(datadir)]
+print package_data
+data_files=[]
+for i in package_data:
+    for j in i[1]:
+        data_files.append(j)
+data_files = [path.relpath(file, datadir) for file in data_files]
+# print files
 setup(
 name='droneCFD',
-version='0.1.1',
+version='0.1.1a',
 description='A virtual wind tunnel based on OpenFOAM and PyFOAM',
 long_description='Please see dronecfd.com for more information',
 url='http://www.dronecfd.com',
@@ -28,10 +35,9 @@
 ],
 keywords='cfd wind tunnel uav uas suas',
 install_requires=['XlsxWriter', 'numpy'],
-packages=['droneCFD'],
+packages=find_packages(),
 zip_safe = False,
-package_dir={'droneCFD': 'droneCFD'},
-data_files=package_data,
+package_data={"droneCFD.data":data_files,},
 scripts=['droneCFD/scripts/dcCheck', 'droneCFD/scripts/dcRun', 'droneCFD/scripts/dcPostProcess']
 # To provide executable scripts, use entry points in preference to the
 # "scripts" keyword. Entry points provide cross-platform support and allow