loading ids.txt from package path

openai · Apr 30, 2020 · 9bc7b5a · 9bc7b5a
1 parent 2b02fbd
commit 9bc7b5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+recursive-include jukebox *.py
+recursive-include jukebox *.txt
diff --git a/jukebox/data/artist_genre_processor.py b/jukebox/data/artist_genre_processor.py
@@ -1,3 +1,4 @@
+import os
 import re
 
 accepted = frozenset([chr(i) for i in range(ord('a'), ord('z') + 1)] +
@@ -26,12 +27,13 @@ def create_reverse_lookup(atoi):
 class ArtistGenreProcessor():
     def __init__(self, v3=False):
         self.v3 = v3
+        dirname = os.path.dirname(__file__)
         if self.v3:
-            self.artist_id_file = "jukebox/data/ids/v3_artist_ids.txt"
-            self.genre_id_file = "jukebox/data/ids/v3_genre_ids.txt"
+            self.artist_id_file = f"{dirname}/ids/v3_artist_ids.txt"
+            self.genre_id_file = f"{dirname}/ids/v3_genre_ids.txt"
         else:
-            self.artist_id_file = "jukebox/data/ids/v2_artist_ids.txt"
-            self.genre_id_file = "jukebox/data/ids/v2_genre_ids.txt"
+            self.artist_id_file = f"{dirname}/ids/v2_artist_ids.txt"
+            self.genre_id_file = f"{dirname}/ids/v2_genre_ids.txt"
         self.load_artists()
         self.load_genres()
 

diff --git a/setup.py b/setup.py
@@ -16,4 +16,5 @@
             open(os.path.join(os.path.dirname(__file__), "requirements.txt"))
         )
     ],
+    include_package_data=True
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		recursive-include jukebox *.py
		recursive-include jukebox *.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,5 @@ @@
                 open(os.path.join(os.path.dirname(__file__), "requirements.txt"))
             )
         ],
+        include_package_data=True
     )