Release: Merge back 1.15.1 into dev from: master-into-dev/1.15.1-2.0.…

…0-dev (#4617)

* Update CONTRIBUTING.md

* Bump urllib3 from 1.26.4 to 1.26.5 (#4590)

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.4...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Revert "Bump urllib3 from 1.26.4 to 1.26.5 (#4590)" (#4595)

This reverts commit 290e686.

* Bump urllib3 from 1.26.4 to 1.26.5 (#4596)

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.4...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump django from 2.2.20 to 2.2.21 (#4610)

Bumps [django](https://github.com/django/django) from 2.2.20 to 2.2.21.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@2.2.20...2.2.21)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Release: Merge release into master from: release/1.15.1 (#4611)

* Update versions in application files

* Update Chart.yaml

Co-authored-by: DefectDojo release bot <dojo-release-bot@users.noreply.github.com>
Co-authored-by: valentijnscholten <valentijnscholten@gmail.com>

* Update versions in application files

Co-authored-by: valentijnscholten <valentijnscholten@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DefectDojo release bot <dojo-release-bot@users.noreply.github.com>

setup.py

@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+setup(
+    name='DefectDojo',
+    version='2.0.0-dev',
+    author='Greg Anderson',
+    description="Tool for managing vulnerability engagements",
+    install_requires=[
+        'defusedxml',
+        'Django==2.2.21',
+        'django-auditlog==0.4.7',
+        'django-custom-field',
+        'django-filter==2.4.0',
+        'django-imagekit',
+        'django-multiselectfield',
+        'django-polymorphic==3.0.0',
+        'django-crispy-forms',
+        'django_extensions',
+        'django-rest-swagger==2.1.2',
+        'django-slack',
+        'django-tagging',
+        'django-tastypie-swagger',
+        'django-tastypie>=0.12.2',
+        'django-rest-swagger==2.1.2',
+        'djangorestframework==3.12.4',
+        'django-environ==0.4.5',
+        'django-axes',
+        'gunicorn>=19.1.1',
+        'html2text',
+        'humanize',
+        'jira',
+        'lxml',
+        'Pillow',
+        'psycopg2-binary',
+        'pycrypto',
+        'pytz>=2013.9',
+        'requests>=2.2.1',
+        'sqlalchemy',  # Required by Celery broker transport
+        'supervisor',
+        'vobject',
+        'html2text',
+        'django-watson',
+        'celery>=4.1.1',
+        'kombu>=4.1',
+        'sqlalchemy',
+        'pdfkit==0.6.1',
+        'defusedxml',
+        'django-tagging',
+        'django-custom-field',
+        'django-imagekit',
+        'jira',
+        'cryptography',
+        'lxml',
+        'django-multiselectfield',
+        'pbr',
+        'django-slack',
+        'asteval',
+        'Markdown==3.3.4',
+        'pandas>=0.22.0',
+        'django-dbbackup>=3.2.0',
+        'whitenoise==4.1.4',
+        'django-environ==0.4.5',
+        'titlecase',
+        'jsonlines==2.0.0'  # requred by yarn audit parser
+    ],
+
+    extras_require={'mysql': ['mysqlclient==2.0.3']},
+
+    dependency_links=[
+        "https://github.com/grendel513/python-pdfkit/tarball/master#egg=pdfkit-0.5.0"
+    ],
+    url='https://github.com/DefectDojo/django-DefectDojo'
+)