mushorg / tanner / 1235
77%
master: 77%

LAST BUILD BRANCH: black_formatting
DEFAULT BRANCH: master
Ran
Jobs 2
Files 43
Run time 2min
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst
1235

push

travis-ci

web-flow 
Use YAML format for tanner configuration (#371)

* Use YAML format for tanner configuration

* Add pyyaml to requirements.txt

* remove usage of self in TannerConfig class

Since the old config was using staticmethod decorator I decided to use those

* Fix the format of YAML config

* Use metaclass to setup default values

* Update config test

* place default config file under tanner/data

This has to be done so TravisCI can include a file
## To make a commit, type your commit message and press CTRL-ENTER.
## To cancel the commit, close the window. To sign off on the commit,
## press CTRL-S.
##
## You may also reference or close a GitHub issue with this commit.
## To do so, type `#` followed by the `tab` key.  You will be shown a
## list of issues related to the current repo.  You may also type
## `owner/repo#` plus the `tab` key to reference an issue in a
## different GitHub repo.

 setup.py                      | 3 ++-
 tanner/config.py              | 4 ++--
 tanner/{ => data}/config.yaml | 0
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index edcecad..01aa755 100644
--- a/setup.py
+++ b/setup.py
@@ -12,5 +12,6 @@ setup(name='Tanner',
       scripts=['bin/tanner', 'bin/tannerweb', 'bin/tannerapi'],
       data_files=[('/opt/tanner/db/', ['tanner/data/db_config.json', 'tanner/data/GeoLite2-City.mmdb']),
                   ('/opt/tanner/data/', ['tanner/data/dorks.pickle', 'tanner/data/crawler_user_agents.txt',
-                                         'tanner/files/engines/mako.py', 'tanner/files/engines/tornado.py'])]
+                                         'tanner/files/engines/mako.py', 'tanner/files/engines/tornado.py',
+                                         'tanner/data/config.yamls'])]
       )
diff --git a/tanner/config.py b/tanner/config.py
index c5aa423..788a56e 100644
--- a/tanner/config.py
+++ b/tanner/config.py
@@ -18,7 +18,7 @@ class Meta(type):
... (continued)

1404 of 1827 relevant lines covered (76.85%)

1.54 hits per line

Jobs
ID Job ID Ran Files Coverage
1 1235.1 0
76.85
 Travis Job 1235.1
2 1235.2 0
76.85
 Travis Job 1235.2
Source Files on build 1235
Detailed source file information is not available for this build.