Skip to content

Commit e5a8842

Browse files
aaronweaveraaronweaver
authored
Merge pull request DefectDojo#657 from DefectDojo/dev
1.5 Upgrade
2 parents f99b562 + 9b3105d commit e5a8842

File tree

238 files changed

+13221
-9943
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+13221
-9943
lines changed

‎.flake8

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,33 @@
22
# Documentation for flake8 http://flake8.pycqa.org/en/3.1.1/user/index.html
33
ignore =
44
# Suppress - line too long (> 79 characters)
5-
E501,
5+
E501
66
# Suppress - Continuation line missing indentation or outdented
77
E127
88
# Suppress - Function is too complex
99
C901
10+
# Multiple statements on one line
11+
E704
12+
# Assign a lambda expression
13+
E731
14+
# Bare except
15+
E722
16+
# Local variable
17+
F841
18+
# May be undefined
19+
F405
20+
# list comprehension redefines
21+
F812
22+
# module level imports
23+
E402
24+
E126
25+
E128
26+
1027
exclude =
1128
# No need to traverse our git directory
1229
.git,
30+
# Exclude unittests
31+
dojo/unittests,
1332
# There's no value in checking cache directories
1433
__pycache__,
1534
# This contains of branch that we don't want to check

‎.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ env:
66
- TEST=smoke-test
77
- TEST=integration-test
88
- TEST=unit-test
9-
- TEST=sourceclear
109
- TEST=bandit
1110
- TEST=docker-bench-security
1211
- TEST=ansible
13-
- TEST=pep8
12+
- TEST=flake8-complete
1413
- TEST=flake8
1514

1615
matrix:
1716
allow_failures:
17+
- env: TEST=smoke-test
1818
- env: TEST=bandit
1919
- env: TEST=sourceclear
20-
- env: TEST=pep8
20+
- env: TEST=flake8-complete
2121

2222
services:
2323
- docker
@@ -67,13 +67,13 @@ script:
6767
true
6868
;;
6969
pep8)
70-
pip install pep8
71-
pep8 .
70+
pip install flake8
71+
flake8 .
7272
;;
7373
flake8)
7474
echo "$TRAVIS_BRANCH"
7575
if [ "$TRAVIS_BRANCH" == "dev" ]
76-
then
76+
then
7777
echo "Running Flake8 tests on dev branch aka pull requests"
7878
# We need to checkout dev for flake8-diff to work properly
7979
git checkout dev

‎PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Please submit your pull requests to the 'dev' branch.
22

33
When submitting a pull request, please make sure you have completed the following checklist:
44

5-
- [ ] Your code is pep8 compliant (Dojo's code isn't currently pep8 compliant, but we're trying to correct that)
5+
- [ ] Your code is flake8 compliant (Dojo's code isn't currently flake8 compliant, but we're trying to correct that)
66
- [ ] If this is a new feature and not a bug fix, you've included the proper documentation under the /docs folder

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Proceeds are used for testing, infrastructure, etc.
109109

110110
[![Xing](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/XING_logo.png)](https://corporate.xing.com/en/about-xing/security/)
111111

112-
Interested in becoming a sponsor and having your logo displayed? Please email [email protected]
112+
Interested in becoming a sponsor and having your logo displayed? Please review our [sponsorship information](SPONSORING.md) or email [email protected]
113113

114114
# License
115115

‎SPONSORING.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
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).
2+
3+
Below is our sponsorship guidelines to provide further clarification specific to our project for non-monetary contributions:
4+
5+
**Maintainers**
6+
7+
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.
8+
9+
**Contributors**
10+
11+
Contributors who earn 100 Sponsorship Points in a calendar year will qualify for sponsorship status. Sponsorship Points are available in the following forms.
12+
13+
For reporting a bug that is verified, the contributor will receive 10 point.
14+
15+
For merged pull requests, points will be awarded as follows:
16+
17+
1 - 10 lines = 1 Point
18+
19+
11 - 20 lines = 2 Points
20+
21+
21- 30 lines = 3 Points
22+
23+
Etc, etc
24+
25+
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.

‎ansible/dev-install/EXAMPLE-inventory

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎ansible/dev-install/README.md

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)