Merge pull request #165 from dvitale199/dependencies

Dependencies

Author: mkoretsky1

genotools/dependencies.py

@@ -66,11 +66,26 @@ def __install_exec(url, exec_path):
     r = requests.get(url, verify=False, stream=True)
 
     if '.zip' in url:
-        r.raw.decode_content = True
-        buffer = io.BytesIO()
-        buffer.write(r.content)
-        with zipfile.ZipFile(buffer, "r") as fp:
-            fp.extractall(__executable_folder)
+        try:
+            r.raw.decode_content = True
+            buffer = io.BytesIO()
+            buffer.write(r.content)
+            with zipfile.ZipFile(buffer, "r") as fp:
+                fp.extractall(__executable_folder)
+        except:
+            zip_file = url.split('/')[-1]
+            zip_file_path = os.path.join(__executable_folder, zip_file)
+
+            r = requests.get(url)
+            r.raise_for_status()
+            with open(zip_file_path, 'wb') as fp:
+                fp.write(r.content)
+            
+            with zipfile.ZipFile(zip_file_path, 'r') as fp:
+                fp.extractall(__executable_folder)
+
+            permissions = 0o100
+            os.chmod(os.path.join(__executable_folder, 'plink2'), permissions)
 
     elif '.tar.gz' in url:
         file = tarfile.open(fileobj=r.raw, mode="r|gz")

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name='the_real_genotools', 
-    version='1.0.1', 
+    version='1.2.1', 
     packages=find_packages(),
     author='Dan Vitale',
     author_email='[email protected]',