Merge branch 'master' into add-choices-list-parameter

Author: dlstadther

luigi/__meta__.py

@@ -7,5 +7,5 @@
 __author__ = 'The Luigi Authors'
 __contact__ = 'https://github.com/spotify/luigi'
 __license__ = 'Apache License 2.0'
-__version__ = '3.5.1'
+__version__ = '3.5.2'
 __status__ = 'Production'

luigi/contrib/lsf.py

@@ -81,9 +81,9 @@ def track_job(job_id):
     - "EXIT"
     based on the LSF documentation
     """
-    cmd = "bjobs -noheader -o stat {}".format(job_id)
+    cmd = ["bjobs", "-noheader", "-o", "stat", str(job_id)]
     track_job_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, shell=True)
+        cmd, stdout=subprocess.PIPE, shell=False)
     status = track_job_proc.communicate()[0].strip('\n')
     return status
 

luigi/contrib/pai.py

@@ -239,7 +239,7 @@ def __init_token(self):
 
         request_json = json.dumps({'username': self.__openpai.username, 'password': self.__openpai.password,
                                    'expiration': self.__openpai.expiration})
-        logger.debug('Get token request {0}'.format(request_json))
+        logger.debug('Requesting token from OpenPai')
         response = rs.post(urljoin(self.__openpai.pai_url, '/api/v1/token'),
                            headers={'Content-Type': 'application/json'}, data=request_json)
         logger.debug('Get token response {0}'.format(response.text))

luigi/lock.py

@@ -100,7 +100,7 @@ def acquire_for(pid_dir, num_available=1, kill_signal=None):
     # Create a pid file if it does not exist
     try:
         os.mkdir(pid_dir)
-        os.chmod(pid_dir, 0o777)
+        os.chmod(pid_dir, 0o700)
     except OSError as exc:
         if exc.errno != errno.EEXIST:
             raise

test/lock_test.py

@@ -100,7 +100,7 @@ def test_acquiring_partially_taken_lock(self):
         self.assertTrue(acquired)
 
         s = os.stat(self.pid_file)
-        self.assertEqual(s.st_mode & 0o777, 0o777)
+        self.assertEqual(s.st_mode & 0o700, 0o700)
 
     def test_acquiring_lock_from_missing_process(self):
         fake_pid = 99999
@@ -111,7 +111,7 @@ def test_acquiring_lock_from_missing_process(self):
         self.assertTrue(acquired)
 
         s = os.stat(self.pid_file)
-        self.assertEqual(s.st_mode & 0o777, 0o777)
+        self.assertEqual(s.st_mode & 0o700, 0o700)
 
     @mock.patch('os.kill')
     def test_take_lock_with_kill(self, kill_fn):