Skip to content
Permalink
Browse files

Change python from 3.7 to 3.5 for compatibility reasons. Update docum…

…entation
  • Loading branch information...
TROVATELLI Pascal
TROVATELLI Pascal committed Jul 30, 2019
1 parent 0ab594e commit cb63cb9bca2363bed669ec536e8620809cac9cdb
Showing with 29 additions and 5 deletions.
  1. +19 −1 CONTRIBUTING.md
  2. +5 −2 Dockerfile.django
  3. +1 −1 Dockerfile.nginx
  4. +2 −1 PULL_REQUEST_TEMPLATE.md
  5. +2 −0 README.md
@@ -25,6 +25,22 @@ executed as smoothly as possible. During this process, DefectDojo will also be
upgraded to Django 2.2.1. Going forward, the 'dev' branch will only accept
bug fixes, Please instead contribute features / bug fixes to the ‘python3_dev’ branch.

## Python3 version
For compatibility reasons, the code in dev branch should be python3.5 compliant.

## Logging
Logging is configured in `settings.dist.py`.

Specific logger can be added. For example to activate logs related to the deduplication, change the level from DEBUG to INFO in:

```
'dojo.specific-loggers.deduplication': {
'handlers': ['console'],
'level': 'DEBUG',
'propagate': False,
}
```

## Submitting Pull Requests

The following are things to consider before submitting a pull request to
@@ -40,7 +56,9 @@ DefectDojo.

0. All submitted code should conform to [__PEP8 standards__][pep8].

0. Pull requests should be submitted to the 'master' branch.
0. Pull requests should be submitted to the 'dev' or 'legacy-python2.7' branch.

0. In dev branch, the code should be python 3.5 compliant.

[dojo_settings]: /dojo/settings/settings.dist.py "DefectDojo settings file"
[setup_py]: /setup.py "Python setup script"
@@ -4,7 +4,10 @@
# The code for the build image should be idendical with the code in
# Dockerfile.nginx to use the caching mechanism of Docker.

FROM python:3.7.4-buster@sha256:7dd57761929672e7c2c18348d257ed5148fc6a971a13cfd8a3d1d8573226a5c2 as build
# Using 3.5.7 to avoid compatibility issues that may be introduced by python 3.5.6 and 3.5.7.
# Please upgrade before end-of-life in september 2020!
# Ref: https://devguide.python.org/#branchstatus
FROM python:3.5.7-buster@sha256:4598d4365bb7a8628ba840f87406323e699c4da01ae6f926ff33787c63230779 as build
WORKDIR /app
RUN \
apt-get -y update && \
@@ -21,7 +24,7 @@ RUN \
COPY requirements.txt ./
RUN pip3 wheel --wheel-dir=/tmp/wheels -r ./requirements.txt

FROM python:3.7.4-slim-buster@sha256:93cb70c52a4351871557f1daa6cfaf6081840804f3f69a3c55b291bd58f75793
FROM python:3.5.7-slim-buster@sha256:127fee645393d311c7fbc5e8c2e5034f10a4e66b47c9273d4dbe5da2926fc3f2
WORKDIR /app
RUN \
apt-get -y update && \
@@ -3,7 +3,7 @@
# The code for the build image should be idendical with the code in
# Dockerfile.django to use the caching mechanism of Docker.

FROM python:3.7.4-buster@sha256:7dd57761929672e7c2c18348d257ed5148fc6a971a13cfd8a3d1d8573226a5c2 as build
FROM python:3.5.7-buster@sha256:4598d4365bb7a8628ba840f87406323e699c4da01ae6f926ff33787c63230779 as build
WORKDIR /app
RUN \
apt-get -y update && \
@@ -3,6 +3,7 @@
When submitting a pull request, please make sure you have completed the following checklist:

- [ ] Your code is flake8 compliant
- [ ] Your code is python 3.5 compliant
- [ ] If this is a new feature and not a bug fix, you've included the proper documentation in the ReadTheDocs documentation folder. https://github.com/DefectDojo/Documentation/tree/master/docs or provide feature documentation in the PR.
- [ ] Model changes must include the necessary migrations in the dojo/dd_migrations folder.
- [ ] Add applicable tests to the unit tests.
- [ ] Add applicable tests to the unit tests.
@@ -73,6 +73,8 @@ Realtime discussion is done in the OWASP Slack Channel, #defectdojo.

![Twitter](https://raw.githubusercontent.com/DefectDojo/Documentation/master/doc/img/Twitter_Logo.png)

More info: [Contributing guideline](CONTRIBUTING.md)

[DefectDojo Twitter Account](https://twitter.com/defectdojo) tweets project
updates and changes.

0 comments on commit cb63cb9

Please sign in to comment.
You can’t perform that action at this time.