fixed package import for usage as an external library

DataGreed · Apr 5, 2022 · cbc27c7 · cbc27c7
1 parent 4bc414a
commit cbc27c7
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 21 deletions.
diff --git a/main.py b/main.py
@@ -1,7 +1,7 @@
 
 if __name__ == '__main__':
 
-    from parsers import patterns, project
+    from polytrackermidi.parsers import project
 
     # # todo: remove this and implement tests
     # p = patterns.PatternParser(

diff --git a/polytracker2midi.py b/polytracker2midi.py
@@ -2,8 +2,8 @@
 import sys
 from sys import argv
 
-from parsers import patterns, project
-from exporters import midi
+from polytrackermidi.parsers import patterns, project
+from polytrackermidi.exporters import midi
 
 
 def print_usage(message="", exit_program=True, exit_code=1):

diff --git a/polytracker2text.py b/polytracker2text.py
@@ -2,8 +2,7 @@
 import sys
 from sys import argv
 
-from parsers import patterns
-from exporters import midi
+from polytrackermidi.parsers import patterns
 
 
 def print_usage(message="", exit_program=True, exit_code=1):

diff --git a/polytrackermidi.py b/polytrackermidi.py
diff --git a/polytrackermidi/__init__.py b/polytrackermidi/__init__.py
@@ -0,0 +1,2 @@
+__author__ = "Alexey 'DataGreed' Strelkov"
+__all__ = ['exporters', 'parsers']
diff --git a/exporters/__init__.py → polytrackermidi/exporters/__init__.py b/exporters/__init__.py → polytrackermidi/exporters/__init__.py
diff --git a/exporters/midi.py → polytrackermidi/exporters/midi.py b/exporters/midi.py → polytrackermidi/exporters/midi.py
@@ -1,11 +1,9 @@
 from typing import Optional
 
-from midiutil.MidiFile import NoteOff
-
-from parsers.patterns import Pattern, Note
+from polytrackermidi.parsers.patterns import Pattern, Note
 from midiutil import MIDIFile
 
-from parsers.project import Song
+from polytrackermidi.parsers.project import Song
 
 
 class BaseMidiExporter:

diff --git a/parsers/__init__.py → polytrackermidi/parsers/__init__.py b/parsers/__init__.py → polytrackermidi/parsers/__init__.py
diff --git a/parsers/arps.py → polytrackermidi/parsers/arps.py b/parsers/arps.py → polytrackermidi/parsers/arps.py
@@ -2,7 +2,7 @@
 import random
 from enum import Enum
 
-from parsers.chords import Chord
+from polytrackermidi.parsers.chords import Chord
 
 class ArpDirection(Enum):
     raising = 1

diff --git a/parsers/chords.py → polytrackermidi/parsers/chords.py b/parsers/chords.py → polytrackermidi/parsers/chords.py
@@ -1,7 +1,6 @@
-from copy import deepcopy
 from typing import List
 
-from parsers.patterns import Note
+from polytrackermidi.parsers.patterns import Note
 
 
 class Chord:

diff --git a/parsers/constants.py → polytrackermidi/parsers/constants.py b/parsers/constants.py → polytrackermidi/parsers/constants.py
diff --git a/parsers/patterns.py → polytrackermidi/parsers/patterns.py b/parsers/patterns.py → polytrackermidi/parsers/patterns.py
diff --git a/parsers/project.py → polytrackermidi/parsers/project.py b/parsers/project.py → polytrackermidi/parsers/project.py
@@ -6,7 +6,7 @@
 import struct
 from typing import List, Dict
 
-from parsers.patterns import Pattern
+from polytrackermidi.parsers.patterns import Pattern
 
 
 class Song:

diff --git a/setup.py b/setup.py
@@ -5,15 +5,15 @@
     requirements = fh.read()
 setup(
     name = 'polyendtracker-midi-export',
-    version = '0.2.4',
+    version = '0.3.0',
     author = 'Alexey Strelkov',
     author_email = '[email protected]',
     license = 'MIT License',
     description = 'Unofficial tool that converts Polyend Tracker *.mt project and *.mtp pattern files to midi files.',
     long_description = long_description,
     long_description_content_type = "text/markdown",
     url = 'https://github.com/DataGreed/polyendtracker-midi-export',
-    py_modules = ['polytrackermidi'],
+    # py_modules = ['polytrackermidi'],
     packages = find_packages(),
     install_requires = [requirements],
     python_requires='>=3.7',
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		__author__ = "Alexey 'DataGreed' Strelkov"
		__all__ = ['exporters', 'parsers']