Renamed source directory and fixed built distribution missing data files

GRIPS · Feb 10, 2016 · 194c228 · 194c228
1 parent 92d2229
commit 194c228
Show file tree

Hide file tree

Showing 28 changed files with 16 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,10 +2,10 @@
 *.pyd
 *.so
 
-gripspy/util/checksum.c
-gripspy/util/checksum.html
-gripspy/util/coincidence.c
-gripspy/util/coincidence.html
+src/util/checksum.c
+src/util/checksum.html
+src/util/coincidence.c
+src/util/coincidence.html
 
 
 build

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,7 @@
-recursive-include gripspy *.py
-recursive-include gripspy *.pyx
-recursive-include gripspy *.txt
-recursive-include gripspy *.npz
+recursive-include src *.py
+recursive-include src *.pyx
+
+recursive-include src *.txt
+recursive-include src *.npz
 
 include README.md
diff --git a/setup.py b/setup.py
@@ -2,15 +2,17 @@
 
 from Cython.Build import cythonize
 
-ext_modules = [Extension("gripspy.util.checksum", ["gripspy/util/checksum.pyx"]),
-               Extension("gripspy.util.coincidence", ["gripspy/util/coincidence.pyx"])]
+ext_modules = [Extension("gripspy.util.checksum", ["src/util/checksum.pyx"]),
+               Extension("gripspy.util.coincidence", ["src/util/coincidence.pyx"])]
 
 setup(
     name='gripspy',
     version='0.1',
-    author='',
-    author_email='',
+    author='Albert Y. Shih',
+    author_email='ayshih@gmail.com',
     packages=find_packages(),
+    package_dir={'gripspy': 'src'},
+    include_package_data=True,
     install_requires=['numpy',
                       'scipy',
                       'matplotlib',
@@ -20,6 +22,6 @@
     ext_modules = cythonize(ext_modules, annotate=True),
     url='',
     license='See LICENSE.txt',
-    description='',
+    description='Python package for GRIPS data analysis',
     long_description=open('README.md').read(),
 )
diff --git a/gripspy/__init__.py → src/__init__.py b/gripspy/__init__.py → src/__init__.py
diff --git a/gripspy/science/__init__.py → src/science/__init__.py b/gripspy/science/__init__.py → src/science/__init__.py
diff --git a/gripspy/science/asicmap/asicmap0.txt → src/science/asicmap/asicmap0.txt b/gripspy/science/asicmap/asicmap0.txt → src/science/asicmap/asicmap0.txt
diff --git a/gripspy/science/asicmap/asicmap1.txt → src/science/asicmap/asicmap1.txt b/gripspy/science/asicmap/asicmap1.txt → src/science/asicmap/asicmap1.txt
diff --git a/gripspy/science/asicmap/asicmap2.txt → src/science/asicmap/asicmap2.txt b/gripspy/science/asicmap/asicmap2.txt → src/science/asicmap/asicmap2.txt
diff --git a/gripspy/science/asicmap/asicmap3.txt → src/science/asicmap/asicmap3.txt b/gripspy/science/asicmap/asicmap3.txt → src/science/asicmap/asicmap3.txt
diff --git a/gripspy/science/asicmap/asicmap4.txt → src/science/asicmap/asicmap4.txt b/gripspy/science/asicmap/asicmap4.txt → src/science/asicmap/asicmap4.txt
diff --git a/gripspy/science/asicmap/asicmap5.txt → src/science/asicmap/asicmap5.txt b/gripspy/science/asicmap/asicmap5.txt → src/science/asicmap/asicmap5.txt
diff --git a/gripspy/science/asicmap/asicmap6.txt → src/science/asicmap/asicmap6.txt b/gripspy/science/asicmap/asicmap6.txt → src/science/asicmap/asicmap6.txt
diff --git a/gripspy/science/asicmap/asicmap7.txt → src/science/asicmap/asicmap7.txt b/gripspy/science/asicmap/asicmap7.txt → src/science/asicmap/asicmap7.txt
diff --git a/gripspy/science/aspect.py → src/science/aspect.py b/gripspy/science/aspect.py → src/science/aspect.py
diff --git a/gripspy/science/bgo.py → src/science/bgo.py b/gripspy/science/bgo.py → src/science/bgo.py
diff --git a/gripspy/science/cms/cc0_1000.cms.npz → src/science/cms/cc0_1000.cms.npz b/gripspy/science/cms/cc0_1000.cms.npz → src/science/cms/cc0_1000.cms.npz
diff --git a/gripspy/science/cms/cc1_1000.cms.npz → src/science/cms/cc1_1000.cms.npz b/gripspy/science/cms/cc1_1000.cms.npz → src/science/cms/cc1_1000.cms.npz
diff --git a/gripspy/science/cms/cc2_1000.cms.npz → src/science/cms/cc2_1000.cms.npz b/gripspy/science/cms/cc2_1000.cms.npz → src/science/cms/cc2_1000.cms.npz
diff --git a/gripspy/science/cms/cc3_1000.cms.npz → src/science/cms/cc3_1000.cms.npz b/gripspy/science/cms/cc3_1000.cms.npz → src/science/cms/cc3_1000.cms.npz
diff --git a/gripspy/science/cms/cc4_1000.cms.npz → src/science/cms/cc4_1000.cms.npz b/gripspy/science/cms/cc4_1000.cms.npz → src/science/cms/cc4_1000.cms.npz
diff --git a/gripspy/science/cms/cc5_1000.cms.npz → src/science/cms/cc5_1000.cms.npz b/gripspy/science/cms/cc5_1000.cms.npz → src/science/cms/cc5_1000.cms.npz
diff --git a/gripspy/science/ge.py → src/science/ge.py b/gripspy/science/ge.py → src/science/ge.py
diff --git a/gripspy/telemetry/__init__.py → src/telemetry/__init__.py b/gripspy/telemetry/__init__.py → src/telemetry/__init__.py
diff --git a/gripspy/telemetry/generators.py → src/telemetry/generators.py b/gripspy/telemetry/generators.py → src/telemetry/generators.py
diff --git a/gripspy/telemetry/parsers.py → src/telemetry/parsers.py b/gripspy/telemetry/parsers.py → src/telemetry/parsers.py
diff --git a/gripspy/util/__init__.py → src/util/__init__.py b/gripspy/util/__init__.py → src/util/__init__.py
diff --git a/gripspy/util/checksum.pyx → src/util/checksum.pyx b/gripspy/util/checksum.pyx → src/util/checksum.pyx
diff --git a/gripspy/util/coincidence.pyx → src/util/coincidence.pyx b/gripspy/util/coincidence.pyx → src/util/coincidence.pyx