DiamondLightSource · willrogers · Nov 14, 2017 · Nov 14, 2017 · Nov 14, 2017 · Nov 14, 2017
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,5 @@
 include LICENSE
 
 # Include the data files
-recursive-include data *
-recursive-include docs *
+recursive-include pytac/data *
+recursive-include docs *
diff --git a/data/DIAD/devices.csv → pytac/data/DIAD/devices.csv b/data/DIAD/devices.csv → pytac/data/DIAD/devices.csv
diff --git a/data/DIAD/elements.csv → pytac/data/DIAD/elements.csv b/data/DIAD/elements.csv → pytac/data/DIAD/elements.csv
diff --git a/data/DIAD/families.csv → pytac/data/DIAD/families.csv b/data/DIAD/families.csv → pytac/data/DIAD/families.csv
diff --git a/data/DIAD/uc_pchip_data.csv → pytac/data/DIAD/uc_pchip_data.csv b/data/DIAD/uc_pchip_data.csv → pytac/data/DIAD/uc_pchip_data.csv
diff --git a/data/DIAD/uc_poly_data.csv → pytac/data/DIAD/uc_poly_data.csv b/data/DIAD/uc_poly_data.csv → pytac/data/DIAD/uc_poly_data.csv
diff --git a/data/DIAD/unitconv.csv → pytac/data/DIAD/unitconv.csv b/data/DIAD/unitconv.csv → pytac/data/DIAD/unitconv.csv
diff --git a/data/VMX/devices.csv → pytac/data/VMX/devices.csv b/data/VMX/devices.csv → pytac/data/VMX/devices.csv
diff --git a/data/VMX/elements.csv → pytac/data/VMX/elements.csv b/data/VMX/elements.csv → pytac/data/VMX/elements.csv
diff --git a/data/VMX/families.csv → pytac/data/VMX/families.csv b/data/VMX/families.csv → pytac/data/VMX/families.csv
diff --git a/data/VMX/uc_pchip_data.csv → pytac/data/VMX/uc_pchip_data.csv b/data/VMX/uc_pchip_data.csv → pytac/data/VMX/uc_pchip_data.csv
diff --git a/data/VMX/uc_poly_data.csv → pytac/data/VMX/uc_poly_data.csv b/data/VMX/uc_poly_data.csv → pytac/data/VMX/uc_poly_data.csv
diff --git a/data/VMX/unitconv.csv → pytac/data/VMX/unitconv.csv b/data/VMX/unitconv.csv → pytac/data/VMX/unitconv.csv
diff --git a/data/VMXSP/devices.csv → pytac/data/VMXSP/devices.csv b/data/VMXSP/devices.csv → pytac/data/VMXSP/devices.csv
diff --git a/data/VMXSP/elements.csv → pytac/data/VMXSP/elements.csv b/data/VMXSP/elements.csv → pytac/data/VMXSP/elements.csv
diff --git a/data/VMXSP/families.csv → pytac/data/VMXSP/families.csv b/data/VMXSP/families.csv → pytac/data/VMXSP/families.csv
diff --git a/data/VMXSP/uc_pchip_data.csv → pytac/data/VMXSP/uc_pchip_data.csv b/data/VMXSP/uc_pchip_data.csv → pytac/data/VMXSP/uc_pchip_data.csv
diff --git a/data/VMXSP/uc_poly_data.csv → pytac/data/VMXSP/uc_poly_data.csv b/data/VMXSP/uc_poly_data.csv → pytac/data/VMXSP/uc_poly_data.csv
diff --git a/data/VMXSP/unitconv.csv → pytac/data/VMXSP/unitconv.csv b/data/VMXSP/unitconv.csv → pytac/data/VMXSP/unitconv.csv
diff --git a/pytac/load_csv.py b/pytac/load_csv.py
@@ -79,7 +79,7 @@ def load(mode, control_system=None, directory=None):
         from pytac import epics
         control_system = epics.EpicsControlSystem()
     if directory is None:
-        directory = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data')
+        directory = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data')
     lat = lattice.Lattice(mode, control_system, 3000)
     with open(os.path.join(directory, mode, 'elements.csv')) as elements:
         csv_reader = csv.DictReader(elements)

diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.0.3',
+    version='0.1',
 
     description='Python Toolkit for Accelerator Controls (Pytac) is a Python library intended to make it easy to work with particle accelerators.',
     long_description=long_description,
@@ -60,17 +60,12 @@
         'Programming Language :: Python :: 3.6',
     ],
 
-    # What does your project relate to?
-    keywords='accelerator physics development',
+    keywords='accelerator physics',
 
-    # You can just specify the packages manually here if your project is
-    # simple. Or you can use find_packages().
-    # packages=find_packages['pytac', 'test']),
     packages=['pytac'],
-
-    # Alternatively, if you want to distribute just a my_module.py, uncomment
-    # this:
-    #   py_modules=["my_module"],
+    # We need to use files from inside the package, so don't zip
+    include_package_data=True,
+    zip_safe=False,
 
     # List run-time dependencies here.  These will be installed by pip when
     # your project is installed. For an analysis of "install_requires" vs pip's

diff --git a/test/test_machine.py b/test/test_machine.py
@@ -17,8 +17,7 @@
 def get_lattice(ring_mode):
     """ Load the entire lattice from the data directory. """
     basepath = os.getcwd()
-    filename = os.path.join(basepath, 'data/')
-    lattice = pytac.load_csv.load(ring_mode, mock.MagicMock(), filename)
+    lattice = pytac.load_csv.load(ring_mode, mock.MagicMock())
     return lattice