Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update requirements.txt #1729

Merged
merged 4 commits into from Jan 4, 2020
Merged

Update requirements.txt #1729

merged 4 commits into from Jan 4, 2020

Conversation

@Maffooch
Copy link
Collaborator

Maffooch commented Dec 31, 2019

Note: DefectDojo is now on Python3 and Django 2.2.1 Please submit your pull requests to the 'dev' branch as the 'legacy-python2.7' branch is only for bug fixes. Any new features submitted to the legacy branch will be ignored and closed.

Ownership of Django-custom-fields and Django-tastypyswagger has now changed to DefectDojo. Updates to corresponding install bases are necessary.

Update in dev takes place in #1713

  • 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.
@Maffooch Maffooch requested a review from DefectDojo/defectdojo-moderators Dec 31, 2019
@madchap
madchap approved these changes Jan 2, 2020
@ptrovatelli

This comment has been minimized.

Copy link
Contributor

ptrovatelli commented Jan 2, 2020

@Maffooch ok for starter but can you add the tag name and commit hash too? thanks :)

Maffooch added 2 commits Jan 2, 2020
@Maffooch Maffooch mentioned this pull request Jan 2, 2020
2 of 5 tasks complete
@Maffooch

This comment has been minimized.

Copy link
Collaborator Author

Maffooch commented Jan 2, 2020

Should we not better merge it to the dev branch? Does not seem to be super important.

It needs to be in both because there is no longer a repo at https://github.com/Maffooch/django-custom-field. It has been moved to https://github.com/DefectDojo/django-custom-field.

The change In dev is placed in #1713.

@devGregA devGregA merged commit d8cd760 into master Jan 4, 2020
4 of 5 checks passed
4 of 5 checks passed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
AccessLint Review complete
continuous-integration/travis-ci/push The Travis CI build passed
Details
security/snyk - components/package.json (aaronweaver (GitHub marketplace)) No manifest changes detected
security/snyk - requirements.txt (aaronweaver (GitHub marketplace)) No new issues
Details
@urand0m urand0m mentioned this pull request Jan 6, 2020
1 of 3 tasks complete
@Maffooch Maffooch deleted the Maffooch-patch-1 branch Jan 6, 2020
@urand0m urand0m mentioned this pull request Jan 8, 2020
1 of 3 tasks complete
@Dorfus1988 Dorfus1988 mentioned this pull request Jan 14, 2020
1 of 3 tasks complete
@dfirpaul dfirpaul mentioned this pull request Jan 17, 2020
0 of 2 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.