Makefile

@@ -68,7 +68,7 @@ pretest:
 	python scripts/gen_individual_importing_tests.py
 
 TEST_ENV_PATH = "`pwd`:`pwd`/tests/lib"
-TEST_ENV = PYTHONPATH="$$PYTHONPATH:"$(TEST_ENV_PATH) PERL5LIB="$$PERL5LIB:"$(TEST_ENV_PATH)
+TEST_ENV = PYTHONPATH=$(TEST_ENV_PATH) PERL5LIB=$(TEST_ENV_PATH)
 TEST_FILES = tests/style/*.t tests/unit-generated/*.py tests/individually-importing/*.py
 
 define RUN_TESTS

pysollib/settings.py

@@ -32,7 +32,7 @@ PACKAGE = 'PySolFC'
 TITLE = 'PySol'
 PACKAGE_URL = 'http://pysolfc.sourceforge.net/'
 
-VERSION_TUPLE = (2, 6, 1)
+VERSION_TUPLE = (2, 5, 5)
 VERSION = '.'.join(map(str, VERSION_TUPLE))
 
 # Tk windowing system (auto set up in init.py)

pysollib/util.py

@@ -23,13 +23,7 @@
 
 # imports
 import os
-try:
-    import site
-except Exception:
-    class Dummy:
-        def __init__(self):
-            self.PREFIXES = []
-    site = Dummy()
+import site
 import sys
 
 # PySol imports
@@ -106,17 +100,10 @@ class DataLoader:
         path.append(os.path.join(sys.path[0], "pysollib", "data"))
         # from settings.py
         path.extend(DATA_DIRS)
-        # py2app compatibility, see
-        # https://github.com/shlomif/PySolFC/issues/100
-        _prefixes = []
-        try:
-            _prefixes = site.PREFIXES
-        except Exception:
-            _prefixes = []
         # itz 2018-10-21 in case of venv installation
         # (or even homedir installation), path[0] will be quite wrong.
         # Just directly use the location where setup.py puts the data.
-        for pref in _prefixes:
+        for pref in site.PREFIXES:
             path.append(os.path.join(pref, 'share', 'PySolFC'))
         # check path for valid directories
         self.path = []