Merge pull request #657 from DefectDojo/dev

1.5 Upgrade

Author: aaronweaver

.flake8

@@ -2,14 +2,33 @@
 # Documentation for flake8 http://flake8.pycqa.org/en/3.1.1/user/index.html
 ignore =
     # Suppress - line too long (> 79 characters)
-    E501,
+    E501
     # Suppress - Continuation line missing indentation or outdented
     E127
     # Suppress - Function is too complex
     C901
+    # Multiple statements on one line
+    E704
+    # Assign a lambda expression
+    E731
+    # Bare except
+    E722
+    # Local variable
+    F841
+    # May be undefined
+    F405
+    # list comprehension redefines
+    F812
+    # module level imports
+    E402
+    E126
+    E128
+
 exclude =
     # No need to traverse our git directory
     .git,
+    # Exclude unittests
+    dojo/unittests,
     # There's no value in checking cache directories
     __pycache__,
     # This contains of branch that we don't want to check

.travis.yml

@@ -6,18 +6,18 @@ env:
   - TEST=smoke-test
   - TEST=integration-test
   - TEST=unit-test
-  - TEST=sourceclear
   - TEST=bandit
   - TEST=docker-bench-security
   - TEST=ansible
-  - TEST=pep8
+  - TEST=flake8-complete
   - TEST=flake8
 
 matrix:
   allow_failures:
+    - env: TEST=smoke-test
     - env: TEST=bandit
     - env: TEST=sourceclear
-    - env: TEST=pep8
+    - env: TEST=flake8-complete
 
 services:
   - docker
@@ -67,13 +67,13 @@ script:
         true
         ;;
       pep8)
-        pip install pep8
-        pep8 .
+        pip install flake8
+        flake8 .
         ;;
       flake8)
         echo "$TRAVIS_BRANCH"
         if [ "$TRAVIS_BRANCH" == "dev" ]
-        then 
+        then
             echo "Running Flake8 tests on dev branch aka pull requests"
             # We need to checkout dev for flake8-diff to work properly
             git checkout dev

PULL_REQUEST_TEMPLATE.md

@@ -2,5 +2,5 @@ Please submit your pull requests to the 'dev' branch.
 
 When submitting a pull request, please make sure you have completed the following checklist:
 
-- [ ] Your code is pep8 compliant (Dojo's code isn't currently pep8 compliant, but we're trying to correct that)
+- [ ] Your code is flake8 compliant (Dojo's code isn't currently flake8 compliant, but we're trying to correct that)
 - [ ] If this is a new feature and not a bug fix, you've included the proper documentation under the /docs folder

README.md

@@ -109,7 +109,7 @@ Proceeds are used for testing, infrastructure, etc.
 
 [![Xing](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/XING_logo.png)](https://corporate.xing.com/en/about-xing/security/)
 
-Interested in becoming a sponsor and having your logo displayed? Please email [email protected]
+Interested in becoming a sponsor and having your logo displayed? Please review our [sponsorship information](SPONSORING.md) or email [email protected]
 
 # License
 

SPONSORING.md

@@ -0,0 +1,25 @@
+On April 5th, 2018, OWASP clarified their sponsorship requirements to note that time, software, or any other quantifiable contribution can be counted towards the $1000 threshold outlined by the [OWASP Global Policy](https://www.owasp.org/index.php/Project_Sponsorship_Operational_Guidelines).
+
+Below is our sponsorship guidelines to provide further clarification specific to our project for non-monetary contributions:
+
+**Maintainers**
+
+As a maintainer, you invest a significant number of hours reviewing code, contributing code, validating architecture, and helping the community. With the time you contribute, maintainers are entitled to name a sponsor, whether it be your employer or yourself, as long as you have written permission to have the entity’s logo displayed on the wiki and on our github repository. Should your relationship end with the entity you have designated (i.e. change of jobs) the entity will be grandfathered for calendar year at the time of your change.
+
+**Contributors**
+
+Contributors who earn 100 Sponsorship Points in a calendar year will qualify for sponsorship status. Sponsorship Points are available in the following forms. 
+
+For reporting a bug that is verified, the contributor will receive 10 point. 
+
+For merged pull requests, points will be awarded as follows:
+
+1 - 10 lines = 1 Point
+
+11 - 20 lines = 2 Points
+
+21- 30 lines = 3 Points
+
+Etc, etc
+	
+Issues will also be labeled with points. When a fix is merged, the contributor will receive the corresponding points, and the points associated with the line rewards above.