Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app.py

app.py

@@ -3,4 +3,4 @@ import os
 os.system("apt-get update && apt-get upgrade")
 os.system("apt-get install default-jdk")
 
-os.system("spark-submit --master yarn routine_pull")
+os.system("spark-submit --master yarn routine_pull.py")

property_pull.py

@@ -4,8 +4,6 @@ import sys
 import requests
 from requests.exceptions import HTTPError
 
-import mysql.connector
-import pyconf as cfg
 
 from cern.nxcals.pyquery.builders import *
 from pyspark import SparkConf
@@ -24,14 +22,7 @@ API_HOST = 'http://test-nxdblm-api2.web.cern.ch/'
 
 _dest_dir = './pulledData'
 
-# mysqlDB variables
-mydb = mysql.connector.connect(
-    host=cfg.mysql['host'],
-    port=cfg.mysql['port'],
-    user=cfg.mysql['user'],
-    passwd=cfg.mysql['passwd'],
-    database=cfg.mysql['database']
-)
+
 
 # Sparks Variable
 conf = SparkConf()

requirements.txt

 pyspark
 pyspark-stubs
 requests
-pytimber
-pyconf
-mysql-connector-python
\ No newline at end of file
+pytimber
\ No newline at end of file

routine_pull.py

 import time
 
-import mysql.connector
 import requests
 
 from property_pull import property_pull
@@ -10,15 +9,8 @@ import datetime as dt
 # from multiprocessing import Process
 
 # mysqlDB variables
-import pyconf as cfg
-
-mydb = mysql.connector.connect(
-    host=cfg.mysql['host'],
-    port=cfg.mysql['port'],
-    user=cfg.mysql['user'],
-    passwd=cfg.mysql['passwd'],
-    database=cfg.mysql['database']
-)
+
+
 
 API_HOST = 'http://test-nxdblm-api2.web.cern.ch/'