Fix/release (#235)

* rule fix * tornado reqs * fixing tests
csirtgadgets · Jan 18, 2017 · 1f4f8b3 · 1f4f8b3
1 parent f612f64
commit 1f4f8b3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,5 @@
 prune packaging
+include .coveragerc
 include README.md COPYING LICENSE
 include requirements.txt dev_requirements.txt
 include Makefile
@@ -12,9 +13,12 @@ include Vagrantfile.centos
 include Vagrantfile_es
 include Vagrantfile_prod
 include Vagrantfile_prod.centos
+recursive-include test *
 recursive-include deployment *
 recursive-include hacking *
 recursive-include docs *
 recursive-include packaging *
 recursive-include rules *
 global-exclude *.retry
+global-exclude *.pyc
+global-exclude __pycache__
diff --git a/requirements.txt b/requirements.txt
@@ -19,3 +19,4 @@ html5lib==1.0b8 # bug in csirtg-smrt upstream
 msgpack-python>=0.4.8,<0.5.0
 csirtg_smrt==0.0.0a22
 csirtg_dnsdb>=0.0.0a3,<1.0
+tornado>=4.4.1,<5.0
diff --git a/rules/default/danger_rules_sk.yml b/rules/default/danger_rules_sk.yml
@@ -7,14 +7,16 @@ defaults:
 feeds:
   ssh:
     remote: http://danger.rulez.sk/projects/bruteforceblocker/blist.php
-    application: ssh
-    protocol: tcp
-    portlist: 22
-    tags:
-      - scanner
-      - bruteforce
-    description:
     pattern: '^(\S+)[\s|\t]+#\s(\S+\s\S+)'
     values:
       - indicator
-      - lasttime
+      - lasttime
+    defaults:
+      application: ssh
+      protocol: tcp
+      portlist: 22
+      tags:
+        - scanner
+        - bruteforce
+      description: scanner
+
diff --git a/test/zadvanced/__init__.py b/test/zadvanced/__init__.py
diff --git a/test/zelasticsearch/__init__.py b/test/zelasticsearch/__init__.py
diff --git a/test/zsqlite/__init__.py b/test/zsqlite/__init__.py