Changeset ec7df22 in ammosreader

Timestamp:

05/04/22 14:56:29 (3 years ago)

Author:

recknagel <recknagel@…>

Branches:

AmmosSource, guix

Children:

bec3119

Parents:

e3e89c2

Message:

final bugfix to imports

Files:

• .gitignore (modified) (1 diff)
• sample_scripts/audio_reader.py (modified) (1 diff)
• sample_scripts/audio_socket_reader_test.py (modified) (2 diffs)
• setup.cfg (modified) (1 diff)
• src/ammosreader/AmmosAudioReader.py (modified) (1 diff)
• src/ammosreader/AmmosAudioSocketReader.py (modified) (1 diff)
• src/ammosreader/AmmosExtendedAudioDataHeader.py (modified) (1 diff)
• src/ammosreader/AmmosExtendedIFDataHeader.py (modified) (1 diff)
• src/ammosreader/AmmosIFReader.py (modified) (1 diff)

.gitignore

@@ -1 +1 @@
 *__pycache__/
+*build/

sample_scripts/audio_reader.py

@@ -1 +1 @@
 import sys
 import os
-sys.path.insert(0, os.path.abspath('../'))
+sys.path.append('../src/ammosreader/')
 
-from AmmosAudioReader import AmmosAudioReader
+from ammosreader.AmmosAudioReader import AmmosAudioReader
 
 if __name__ == '__main__':

sample_scripts/audio_socket_reader_test.py

@@ -1 +1 @@
 import sys
 import os
-sys.path.insert(0, os.path.abspath('../'))
+
+sys.path.append('../src/')
 
 import socket
@@ -8 +9 @@
 import scipy.io.wavfile as wavfile
 
-from AmmosAudioSocketReader import AmmosAudioSocketReader
+from ammosreader.AmmosAudioSocketReader import AmmosAudioSocketReader
 
 

setup.cfg

@@ -29 +29 @@
 
 install_requires =
-    numpy>=1.22.2
+    numpy==1.21
     setuptools>=52.0.0
 python_requires = >=3.8

src/ammosreader/AmmosAudioReader.py

@@ -3 +3 @@
 import os
 
-from .AmmosGlobalFrameBody import AmmosGlobalFrameBody
-from .AmmosAudioDataHeader import AmmosAudioDataHeader
-from .AmmosExtendedAudioDataHeader import AmmosExtendedAudioDataHeader
-from .AmmosGlobalFrameHeader import AmmosGlobalFrameHeader
-from .AmmosSingleFrame import AmmosSingleFrame
-from .AmmosContainer import AmmosContainer
+from ammosreader.AmmosGlobalFrameBody import AmmosGlobalFrameBody
+from ammosreader.AmmosAudioDataHeader import AmmosAudioDataHeader
+from ammosreader.AmmosExtendedAudioDataHeader import AmmosExtendedAudioDataHeader
+from ammosreader.AmmosGlobalFrameHeader import AmmosGlobalFrameHeader
+from ammosreader.AmmosSingleFrame import AmmosSingleFrame
+from ammosreader.AmmosContainer import AmmosContainer
 
 

src/ammosreader/AmmosAudioSocketReader.py

@@ -3 +3 @@
 
 import numpy as np
-from .AmmosAudioDataHeader import AmmosAudioDataHeader
-from .AmmosExtendedAudioDataHeader import AmmosExtendedAudioDataHeader
-from .AmmosGlobalFrameHeader import AmmosGlobalFrameHeader
+from ammosreader.AmmosAudioDataHeader import AmmosAudioDataHeader
+from ammosreader.AmmosExtendedAudioDataHeader import AmmosExtendedAudioDataHeader
+from ammosreader.AmmosGlobalFrameHeader import AmmosGlobalFrameHeader
 
 

src/ammosreader/AmmosExtendedAudioDataHeader.py

@@ -1 +1 @@
 import struct
 import numpy as np
-from .AmmosAudioDataHeader import AmmosAudioDataHeader
+from ammosreader.AmmosAudioDataHeader import AmmosAudioDataHeader
 
 

src/ammosreader/AmmosExtendedIFDataHeader.py

@@ -1 +1 @@
 import struct
 import numpy as np
-from .AmmosIFDataHeader import AmmosIFDataHeader
+from ammosreader.AmmosIFDataHeader import AmmosIFDataHeader
 
 

src/ammosreader/AmmosIFReader.py

@@ -2 +2 @@
 import os
 
-from .AmmosGlobalFrameBody import AmmosGlobalFrameBody
-from .AmmosIFDataHeader import AmmosIFDataHeader
-from .AmmosExtendedIFDataHeader import AmmosExtendedIFDataHeader
-from .AmmosGlobalFrameHeader import AmmosGlobalFrameHeader
-from .AmmosSingleFrame import AmmosSingleFrame
-from .AmmosIFDataBlock import AmmosIFDataBlock
-from .AmmosContainer import AmmosContainer
+from ammosreader.AmmosGlobalFrameBody import AmmosGlobalFrameBody
+from ammosreader.AmmosIFDataHeader import AmmosIFDataHeader
+from ammosreader.AmmosExtendedIFDataHeader import AmmosExtendedIFDataHeader
+from ammosreader.AmmosGlobalFrameHeader import AmmosGlobalFrameHeader
+from ammosreader.AmmosSingleFrame import AmmosSingleFrame
+from ammosreader.AmmosIFDataBlock import AmmosIFDataBlock
+from ammosreader.AmmosContainer import AmmosContainer