Merge pull request #46 from AllYarnsAreBeautiful/py-installer

added loading with pyinstaller
fossasia · Jul 14, 2016 · a755090 · a755090
2 parents 14b5898 + cacfd53
commit a755090
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,11 @@
 # see https://packaging.python.org/appveyor/#adding-appveyor-support-to-your-project
+clone_depth: 1
 environment:
 
+  PYPI_PASSWORD:
+    secure: Gxrd9WI60wyczr9mHtiQHvJ45Oq0UyQZNrvUtKs2D5w=
+  PYPI_USERNAME: niccokunzmann3
+
   matrix:
 
     # For Python versions available on Appveyor, see

diff --git a/knittingpattern/Loader.py b/knittingpattern/Loader.py
@@ -87,9 +87,13 @@ def _relative_to_absolute(self, module_location, folder):
         elif os.path.isdir(module_location):
             path = module_location
         else:
-            __import__(module_location)
-            module = sys.modules[module_location]
-            path = os.path.dirname(module.__file__)
+            module_folder = os.path.dirname(module_location)
+            if module_folder:
+                path = module_folder
+            else:
+                __import__(module_location)
+                module = sys.modules[module_location]
+                path = os.path.dirname(module.__file__)
         absolute_path = os.path.join(path, folder)
         return absolute_path
 

diff --git a/knittingpattern/__init__.py b/knittingpattern/__init__.py
@@ -5,7 +5,7 @@
 # there should be no imports
 
 #: the version of the knitting pattern library
-__version__ = '0.1.10'
+__version__ = '0.1.11'
 
 #: an empty knitting pattern set as specification
 EMPTY_KNITTING_PATTERN_SET = {"version": "0.1", "type": "knitting pattern",