Fix data file import and package name issues

sircinnamon · Sep 23, 2019 · c399b52 · c399b52
1 parent 522ec02
commit c399b52
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/runescape-text/__init__.py b/runescape-text/__init__.py
diff --git a/runescape_text/__init__.py b/runescape_text/__init__.py
@@ -0,0 +1 @@
+from .runescape_text import *
diff --git a/runescape_uf.ttf → runescape_text/data/runescape_uf.ttf b/runescape_uf.ttf → runescape_text/data/runescape_uf.ttf
diff --git a/runescape-text/runescape_text.py → runescape_text/runescape_text.py b/runescape-text/runescape_text.py → runescape_text/runescape_text.py
@@ -1,6 +1,6 @@
 from PIL import Image, ImageDraw,ImageFont
 import math
-import sys, getopt
+import sys, getopt, os
 
 # Preset colors
 black = (0,0,0)
@@ -375,7 +375,7 @@ def line_merge(arr):
 	"shake": shake_effect
 }
 
-fnt = ImageFont.truetype('./runescape_uf.ttf', size=18)
+fnt = ImageFont.truetype(os.path.join(os.path.dirname(__file__),'data/runescape_uf.ttf'), size=18)
 
 if __name__ == "__main__":
 	# string = "glow1:wave:cdjquw4 \nAAAA"
@@ -398,7 +398,7 @@ def line_merge(arr):
 		else:
 			multi_frame_save(img, file=outfile)
 	except getopt.GetoptError:
-		print("\nrunescape.py [options] <string>")
+		print("\nrunescape_text.py [options] <string>")
 		print("OPTIONS")
 		print("\t-o <outputfile>")
 		print("\t-c <colour>")

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
 	name="runescape-text",
-	version="1.0.0",
+	version="1.0.4",
 	author="Riley Lahd",
 	author_email="sircinnamon@gmail.com",
 	description="A program for generating runescape-chat-like images of text.",
@@ -19,4 +19,8 @@
 		"Operating System :: OS Independent",
 	],
 	python_requires='>=3.6',
+    install_requires=[
+        "pillow",
+    ],
+    package_data={"":["data/runescape_uf.ttf"]},
 )