Merge pull request #37 from casper-astro/install-fixed

Install fixed
casper-astro · Jun 22, 2022 · 258c166 · 258c166
2 parents 4bfd8ec + 02bb719
commit 258c166
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,5 +3,5 @@ ipython==5.3.0
 katcp==0.6.2
 numpy<1.17
 odict
-tornado<5
--e git://github.com/casper-astro/tftpy.git#egg=tftpy-0.6.3_fork-py2.7.egg
+tornado
+-e git+https://github.com/casper-astro/tftpy.git#egg=tftpy-0.6.3_fork-py2.7.egg
diff --git a/setup.py b/setup.py
@@ -35,7 +35,7 @@
     # extra_link_args=['-static'],
 )
 
-data_files = ['tengbe_mmap.txt', 'tengbe_mmap_legacy.txt']
+data_files = ['src/tengbe_mmap.txt', 'src/tengbe_mmap_legacy.txt']
 
 
 setuptools.setup(

diff --git a/src/tengbe.py b/src/tengbe.py
@@ -12,8 +12,8 @@
 STRUCT_CTYPES = {1: 'B', 2: 'H', 4: 'L', 8: 'Q'}
 STRUCT_CTYPES_TO_B = {'B': 1, 'H': 2, 'L': 4, 'Q': 8}
 
-TENGBE_UNIFIED_MMAP_TXT = resource_filename('casperfpga', 'tengbe_mmap.txt')
-TENGBE_MMAP_LEGACY_TXT  = resource_filename('casperfpga', 'tengbe_mmap_legacy.txt')
+TENGBE_UNIFIED_MMAP_TXT = 'tengbe_mmap.txt'
+TENGBE_MMAP_LEGACY_TXT  = 'tengbe_mmap_legacy.txt'
 
 def read_memory_map_definition(filename):
     """ Read memory map definition from text file.