Merge pull request #104 from zalando/requirements

Remove pytest from requirements.txt

Author: CyberDem0n

.travis.yml

@@ -1,10 +1,13 @@
 language: python
 python:
-  - "3.4"
   - "2.7"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
 install:
   - pip install -r requirements.txt
-  - pip install coveralls
+  - pip install coveralls pytest pytest-cov flake8
 script:
   - python setup.py test
   - python setup.py flake8

pg_view/__init__.py

@@ -283,7 +283,7 @@ def main():
         print(traceback.format_exc())
         if 'SSH_CLIENT' in os.environ and 'SSH_TTY' not in os.environ:
             print('Unable to initialize curses. Make sure you supply -t option (force psedo-tty allocation) to ssh')
-    except:
+    except Exception:
         print(traceback.format_exc())
     finally:
         sys.exit(0)

pg_view/collectors/base_collector.py

@@ -59,9 +59,9 @@ def __init__(self, ticks_per_refresh=1, produce_diffs=True):
         self.ncurses_custom_fields = dict.fromkeys(StatCollector.NCURSES_CUSTOM_OUTPUT_FIELDS, None)
 
     def postinit(self):
-        for l in [self.transform_list_data, self.transform_dict_data, self.diff_generator_data,
+        for n in [self.transform_list_data, self.transform_dict_data, self.diff_generator_data,
                   self.output_transform_data]:
-            self.validate_list_out(l)
+            self.validate_list_out(n)
         self.output_column_positions = self._calculate_output_column_positions()
 
     def set_ignore_autohide(self, new_status):
@@ -91,12 +91,12 @@ def exec_command_with_output(cmdline):
         return ret, proc.stdout.read().strip()
 
     @staticmethod
-    def validate_list_out(l):
+    def validate_list_out(n):
         """ If the list element doesn't supply an out column - remove it """
 
-        for col in l:
+        for col in n:
             if 'out' not in col:
-                el = l.pop(l.index(col))
+                el = n.pop(n.index(col))
                 logger.error('Removed {0} column because it did not specify out value'.format(el))
 
     @staticmethod
@@ -135,10 +135,10 @@ def kb_pretty_print_long(b):
         """ Show kb values in a human readable form. """
 
         r = []
-        for l, n in StatCollector.BYTE_MAP:
+        for unit, n in StatCollector.BYTE_MAP:
             d = b / n
             if d:
-                r.append(str(d) + l)
+                r.append(str(d) + unit)
             b %= n
         return ' '.join(r)
 
@@ -147,10 +147,10 @@ def kb_pretty_print(b):
         """ Show memory size as a float value in the biggest measurement units  """
 
         r = []
-        for l, n in StatCollector.BYTE_MAP:
+        for unit, n in StatCollector.BYTE_MAP:
             if b > n:
                 v = round(float(b) / n, 1)
-                r.append(str(v) + l)
+                r.append(str(v) + unit)
                 break
         if len(r) == 0:
             return '{0}KB'.format(str(b))
@@ -486,21 +486,21 @@ def _transform_input(self, x, custom_transformation_data=None):
     # behavior in case 'in' is not specified: the _dict version assumes the in
     # column is the same as the out one, the list emits the warning and skips
     # the column.
-    def _transform_list(self, l, custom_transformation_data=None):
+    def _transform_list(self, x, custom_transformation_data=None):
         result = {}
         # choose between the 'embedded' and external transformations
         if custom_transformation_data is not None:
             transformation_data = custom_transformation_data
         else:
             transformation_data = self.transform_list_data
         if transformation_data is not None:
-            total = len(l)
+            total = len(x)
             for col in transformation_data:
                 # set the output column name
                 attname = col['out']
                 if 'infn' in col:
-                    if len(l) > 0:
-                        result[attname] = col['infn'](attname, l, 'optional' in col and col['optional'])
+                    if len(x) > 0:
+                        result[attname] = col['infn'](attname, x, 'optional' in col and col['optional'])
                     else:
                         result[attname] = None
                 else:
@@ -513,18 +513,18 @@ def _transform_list(self, l, custom_transformation_data=None):
                         # the result in the format we ask them to, but, on the other hand, if there is
                         # nothing at all from them - then the problem is elsewhere and there is no need
                         # to bleat here for each missing column.
-                        if not col.get('optional', False) and len(l) > 0:
+                        if not col.get('optional', False) and len(x) > 0:
                             self.warn_non_optional_column(incol)
                     else:
-                        result[attname] = l[incol]
+                        result[attname] = x[incol]
                 # if transformation function is supplied - apply it to the input data.
                 if 'fn' in col and result[attname] is not None:
                     result[attname] = col['fn'](result[attname])
             return result
         raise Exception('No data for the list transformation supplied')
 
     # Most of the functionality is the same as in the dict transforming function above.
-    def _transform_dict(self, l, custom_transformation_data=None):
+    def _transform_dict(self, x, custom_transformation_data=None):
         result = {}
         if custom_transformation_data is not None:
             transformation_data = custom_transformation_data
@@ -538,19 +538,19 @@ def _transform_dict(self, l, custom_transformation_data=None):
                 # if infn is supplied - it calculates the column value possbily using other values
                 # in the row - we don't use incoming column in this case.
                 if 'infn' in col:
-                    if len(l) > 0:
-                        result[attname] = col['infn'](attname, l, 'optional' in col and col['optional'])
+                    if len(x) > 0:
+                        result[attname] = col['infn'](attname, x, 'optional' in col and col['optional'])
                     else:
                         result[attname] = None
-                elif incol not in l:
+                elif incol not in x:
                     # if the column is marked as optional and it's not present in the output data
                     # set None instead
                     result[attname] = None
                     # see the comment at _transform_list on why we do complain here.
-                    if not col.get('optional', False) and len(l) > 0:
+                    if not col.get('optional', False) and len(x) > 0:
                         self.warn_non_optional_column(incol)
                 else:
-                    result[attname] = l[incol]
+                    result[attname] = x[incol]
                 if 'fn' in col and result[attname] is not None:
                     result[attname] = col['fn'](result[attname])
             return result

pg_view/collectors/host_collector.py

@@ -118,7 +118,7 @@ def _read_cpus():
         cpus = 0
         try:
             cpus = cpu_count()
-        except:
+        except Exception:
             logger.error('multiprocessing does not support cpu_count')
         return {'cores': cpus}
 
@@ -134,7 +134,7 @@ def _read_uptime(self):
         try:
             fp = open(HostStatCollector.UPTIME_FILE, 'rU')
             raw_result = fp.read().split()
-        except:
+        except Exception:
             logger.error('Unable to read uptime from {0}'.format(HostStatCollector.UPTIME_FILE))
         finally:
             fp and fp.close()

pg_view/collectors/memory_collector.py

@@ -125,8 +125,8 @@ def _read_memory_data():
         result = {}
         try:
             fp = open(MemoryStatCollector.MEMORY_STAT_FILE, 'rU')
-            for l in fp:
-                vals = l.strip().split()
+            for line in fp:
+                vals = line.strip().split()
                 if len(vals) >= 2:
                     name, val = vals[:2]
                     # if we have units of measurement different from kB - transform the result
@@ -141,7 +141,7 @@ def _read_memory_data():
                         logger.error('name is too short: {0}'.format(str(name)))
                 else:
                     logger.error('/proc/meminfo string is not name value: {0}'.format(vals))
-        except:
+        except Exception:
             logger.error('Unable to read /proc/meminfo memory statistics. Check your permissions')
             return result
         finally:

pg_view/collectors/partition_collector.py

@@ -181,8 +181,8 @@ def get_io_data(pnames):
         try:
             fp = None
             fp = open(PartitionStatCollector.DISK_STAT_FILE, 'rU')
-            for l in fp:
-                elements = l.split()
+            for line in fp:
+                elements = line.split()
                 for pname in pnames:
                     if pname in elements:
                         result[pname] = elements
@@ -191,7 +191,7 @@ def get_io_data(pnames):
                             break
                 if found == total:
                     break
-        except:
+        except Exception:
             logger.error('Unable to read {0}'.format(PartitionStatCollector.DISK_STAT_FILE))
             result = {}
         finally:

pg_view/collectors/pg_collector.py

@@ -548,7 +548,7 @@ def _read_pg_stat_activity(self):
                     if r['pid'] != self.connection_pid:
                         self.active_connections += 1
                 lines = r['query'].splitlines()
-                newlines = [re.sub('\s+', ' ', l.strip()) for l in lines]
+                newlines = [re.sub(r'\s+', ' ', line.strip()) for line in lines]
                 r['query'] = ' '.join(newlines)
             ret[r['pid']] = r
         self.pgcon.commit()

pg_view/models/db_client.py

@@ -16,7 +16,7 @@ def read_postmaster_pid(work_directory, dbname):
     try:
         fp = open('{0}/postmaster.pid'.format(work_directory))
         pid = fp.readline().strip()
-    except:
+    except Exception:
         # XXX: do not bail out in case we are collecting data for multiple PostgreSQL clusters
         logger.error('Unable to read postmaster.pid for {name} at {wd}\n HINT: \
             make sure Postgres is running'.format(name=dbname, wd=work_directory))
@@ -170,7 +170,7 @@ def get_postmasters_directories():
         try:
             with open(f, 'rU') as fp:
                 stat_fields = fp.read().strip().split()
-        except:
+        except Exception:
             logger.error('failed to read {0}'.format(f))
             continue
         # read PostgreSQL processes. Avoid zombies
@@ -233,7 +233,7 @@ def get_postmasters_directories():
             val = fp.read().strip()
             if val is not None and len(val) >= 2:
                 version = float(val)
-        except os.error as e:
+        except os.error:
             logger.error(
                 'unable to read version number from PG_VERSION directory {0}, have to skip it'.format(pg_dir))
             continue
@@ -259,7 +259,7 @@ def fetch_socket_inodes_for_process(pid):
                 continue
             try:
                 target = os.readlink(link)
-            except:
+            except Exception:
                 logger.error('coulnd\'t read link {0}'.format(link))
             else:
                 # socket:[8430]

pg_view/models/outputs.py

@@ -65,7 +65,7 @@ def _init_display(self):
         if hasattr(curses, 'curs_set'):
             try:
                 curses.curs_set(0)  # make the cursor invisible
-            except:
+            except Exception:
                 pass
         self.screen.nodelay(1)  # disable delay when waiting for keyboard input
 

requirements.txt

@@ -1,2 +1 @@
-pytest
 psycopg2