Skip to content

Commit

Permalink
Merge pull request #20 from zalando/automated-travis-ci-builds
Browse files Browse the repository at this point in the history
Automated travis ci builds
  • Loading branch information
Oleksii Kliukin committed Jun 24, 2015
2 parents 18f5fe9 + 17b5c41 commit 1ccad16
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ nosetests.xml
.mr.developer.cfg
.project
.pydevproject

pg_view.log
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
language: python
python:
- "3.4"
- "2.7"
script:
- python -m doctest -v pg_view.py
- flake8 pg_view.py
8 changes: 4 additions & 4 deletions pg_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

import os
import re
import stat
import sys
import glob
import getpass
Expand Down Expand Up @@ -1691,8 +1690,8 @@ def __init__(self, dbname, dbversion, work_directory, consumer):
self.dbver = dbversion
self.queue_consumer = consumer
self.work_directory = work_directory
self.df_list_transformation = [{'out': 'dev', 'in': 0, 'fn': self._dereference_dev_name}, {'out': 'space_total'
, 'in': 1, 'fn': int}, {'out': 'space_left', 'in': 2, 'fn': int}]
self.df_list_transformation = [{'out': 'dev', 'in': 0, 'fn': self._dereference_dev_name}, {'out': 'space_total',
'in': 1, 'fn': int}, {'out': 'space_left', 'in': 2, 'fn': int}]
self.io_list_transformation = [{'out': 'sectors_read', 'in': 5, 'fn': int}, {'out': 'sectors_written', 'in': 9,
'fn': int}, {'out': 'await', 'in': 13, 'fn': int}]
self.du_list_transformation = [{'out': 'path_size', 'in': 0, 'fn': int}, {'out': 'path', 'in': 1}]
Expand Down Expand Up @@ -2576,7 +2575,7 @@ def layout_x(self, xstart, colwidth, colnames, colhidden, colcandrop):

layout = {}
# get only the columns that are not hidden
col_remaining = [name for name in colnames if not name in colhidden]
col_remaining = [name for name in colnames if name not in colhidden]
# calculate the available screen X dimensions and the width required by all columns
width_available = self.screen_x - (xstart + 1)
# we add width of all N fields + N-1 spaces between fields
Expand Down Expand Up @@ -3005,6 +3004,7 @@ def pick_connection_arguments(conn_args):
break
return result


def can_connect_with_connection_arguments(host, port):
""" check that we can connect given the specified arguments """
user, database = detect_default_user_database()
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[flake8]
max-line-length=120

0 comments on commit 1ccad16

Please sign in to comment.