Fix all pathing issues by using pkg_resources

nickjj · Sep 11, 2014 · 12bce5d · 12bce5d
1 parent 356406c
commit 12bce5d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v0.4.4
+
+- Fix the missing readme template and VERSION file
+  - Trolled hard by how package files work but I think we're good now
+
 ## v0.4.3
 
 - Probably fixed the colors file not being included properly

diff --git a/RELEASES.txt b/RELEASES.txt
@@ -1,5 +1,6 @@
 Version        Release date
 ---------------------------
+v0.4.4         09/11/2014
 v0.4.3         09/11/2014
 v0.4.2         09/11/2014
 v0.4.1         09/11/2014

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.3
+0.4.4
diff --git a/ansigenome/constants.py b/ansigenome/constants.py
@@ -7,7 +7,7 @@
 GIT_AUTHOR = utils.capture_shell("git config user.name")[0][:-1]
 GIT_EMAIL = utils.capture_shell("git config user.email")[0][:-1]
 
-MODULE_DIR = os.path.join(os.path.dirname(__file__), os.path.pardir)
+PACKAGE_RESOURCE = pkg_resources.resource_filename(__name__, "data")
 
 VALID_ACTIONS = ("config", "scan", "gendoc", "genmeta",
                  "export", "init", "run")
@@ -96,7 +96,7 @@
 ANSIBLE_FOLDERS = ("defaults", "handlers", "meta",
                    "tasks", "templates", "tests", "vars")
 
-README_TEMPLATE_PATH = os.path.join(MODULE_DIR,
+README_TEMPLATE_PATH = os.path.join(PACKAGE_RESOURCE,
                                     "templates", "README.md.j2")
 
 DEFAULT_META_FILE = """---
@@ -175,6 +175,4 @@
 
 TEST_PATH = os.path.join(os.path.sep, "tmp", "ansigenome")
 
-X11_COLORS = utils.file_to_list(pkg_resources.resource_filename(__name__,
-                                                                \
-                                os.path.join("data", "colors")))
+X11_COLORS = utils.file_to_list(os.path.join(PACKAGE_RESOURCE, "colors"))
diff --git a/templates/README.md.j2 → ansigenome/data/templates/README.md.j2 b/templates/README.md.j2 → ansigenome/data/templates/README.md.j2
diff --git a/bin/ansigenome b/bin/ansigenome
@@ -52,7 +52,8 @@ def build_option_parser(action):
     epilog = ui.epilogue(os.path.basename(sys.argv[0]))
 
     args = " ".join(sys.argv)
-    version = utils.get_version(os.path.join(c.MODULE_DIR, "VERSION"))
+    version = utils.get_version(os.path.join(c.PACKAGE_RESOURCE,
+                                             os.pardir, os.pardir, "VERSION"))
 
     OptionParser.format_epilog = lambda self, formatter: self.epilog
     parser = OptionParser(usage=usage, epilog=epilog,

diff --git a/setup.py b/setup.py
@@ -22,4 +22,4 @@
       packages=["ansigenome"],
       package_data={"ansigenome": ["data/*"]},
       scripts=["bin/ansigenome"],
-      data_files=[])
+      data_files=["VERSION"])