Merge pull request #76 from elekto-io/subprocess

Replace all os.system() calls with suprocess.run()

Author: jberkus

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.12-stretch
+FROM python:3.7-stretch
 
 WORKDIR /app
 

elekto/models/meta.py

@@ -16,6 +16,7 @@
 
 import os
 import random
+import subprocess
 import flask as F
 
 from datetime import datetime
@@ -38,14 +39,12 @@ def __init__(self, config):
         self.BRANCH = config['BRANCH']
         self.SECRET = config['SECRET']
         self.git = '/usr/bin/git'
-        self.pref = "/usr/bin/git --git-dir={}/.git --work-tree={}\
-            ".format(self.META, self.META)
 
     def clone(self):
-        os.system('{} clone -b {} -- {} {}'.format(self.git, self.BRANCH, self.REMOTE, self.META))
+        subprocess.run([self.git, 'clone', '-b', self.BRANCH, '--', self.REMOTE, self.META], check=True)
 
     def pull(self):
-        os.system('{} pull --ff-only origin {}'.format(self.pref, self.BRANCH))
+        subprocess.run([self.git, '--git-dir', '{}/.git'.format(self.META),'--work-tree', self.META, 'pull', '--ff-only', 'origin', self.BRANCH], check=True)
 
 
 class Election(Meta):

test/test_main.py

@@ -15,6 +15,7 @@
 # Author(s):         Manish Sahani <[email protected]>
 
 import os
+import subprocess
 import sys
 import pytest
 import pandas as pd
@@ -37,14 +38,14 @@
 def client():
     # Generate Database
     db = os.path.abspath('./test.db')
-    os.system('touch {}'.format(db))
+    subprocess.run(['touch', db], check=True)
 
     with APP.test_client() as client:
         with APP.app_context():
             migrate(APP.config['DATABASE_URL'])
         yield client
 
-    os.system('rm {}'.format(db))
+    os.unlink(db)
     # os.system('rm -rf {}'.format(APP.config['META']['PATH']))