#10 - package improved, still not good

setup.py

@@ -35,9 +35,9 @@
 There are some configurable options - see the default config file
 (.2-n_solitaire.conf). All options should be described there including default
 values which will be used if not specified otherwise. The game will search for
-the configuration file in the following locations (in this order):
--   current working directory
--   home directory
+the configuration file in the following locations (in this order):\n
+-   current working directory\n
+-   home directory\n
 -   directory specified by TWN_SOLITAIRE_CONF_DIR environment variable
 
 
@@ -47,7 +47,7 @@
 
 setup(
     name='twn-solitaire',
-    version='0.0.1a1',
+    version='0.0.1a3',
     packages=['twnsol', ],
     scripts=['solitaire.py', ],
     url='https://github.com/geckon/2-n_solitaire',
@@ -59,5 +59,6 @@
         "pygame == 1.9.4",
         "toml == 0.10.0",
     ],
-    include_package_data=True,
+    package_data={'': ['LICENSE', 'assets'],},
+    package_dir={'requests': 'requests'}
 )

twnsol/constants.py

@@ -17,6 +17,33 @@
 CONST dictionary is provided for any module to use.
 """
 
+import logging
+import os
+
+#def get_assets_dir():
+#    """Return path to the assets directory.
+#
+#    It's either /usr/share/twn_solitaire/assets or ./assets. If none of
+#    these exist, throw FileNotFoundError.
+#    """
+#    locations = (
+#        '/usr/share/twn_solitaire',
+#        os.curdir,
+#    )
+#
+#    for loc in locations:
+#        assets_dir = os.path.join(loc, 'assets')
+#        if os.path.isdir(assets_dir):
+#            logging.debug('Assets dir found: %s', assets_dir)
+#            return assets_dir
+#
+#    raise FileNotFoundError('Assets directory not found.')
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+
+TOP_DIR = os.path.join(HERE, '..')
+
+ASSETS_DIR = os.path.join(TOP_DIR, 'assets')
 
 CONST = {
     'game': {
@@ -28,7 +55,8 @@
     },
     'font': {
         'path': {
-            'default': './assets/Jellee-Roman/Jellee-Roman.otf',
+            'default': os.path.join(ASSETS_DIR,
+                                    'Jellee-Roman/Jellee-Roman.otf'),
         },
         'size': {
             'normal': 18,