-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(django): upgrade django framework and deps
- upgrading django to 2.2.19 and djangorestframework to 3.12.2 - resolving all failing tests due to above upgrade - upgrade models to default `on_delete=models.CASCADE` if app or user are deleted - upgrade all other dependencies to latest versions - update Makefile to use hephy/shell-dev for tests - update Dockerfile to use `hephy/base:latest` for building - update Dockefile to use python3 -m pip commands - upgrade pip, setuptools, wheel using python3 command - resolves #140 - resolves #80 Signed-off-by: Cryptophobia <aouzounov@gmail.com>
- Loading branch information
1 parent
0312315
commit cd67e6c
Showing
7 changed files
with
64 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
# Run "make test-unit" for the % of code exercised during tests | ||
coverage==4.4.1 | ||
coverage==4.5.4 | ||
|
||
# Run "make test-style" to check python syntax and style | ||
flake8==3.4.1 | ||
|
||
# code coverage report at https://codecov.io/github/deis/controller | ||
codecov==2.0.9 | ||
# code coverage report at https://codecov.io/github/teamhephy/controller | ||
codecov==2.1.11 | ||
|
||
# mock out python-requests, mostly k8s | ||
# requests-mock==1.3.0 | ||
git+https://github.com/deisthree/requests-mock.git@class_adapter#egg=request_mock | ||
git+https://github.com/teamhephy/requests-mock.git@class_adapter#egg=requests_mock | ||
|
||
# tail a log and pipe into tbgrep to find all tracebacks | ||
tbgrep==0.3.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,23 @@ | ||
# Deis controller requirements | ||
backoff==1.4.3 | ||
django==1.11.29 | ||
django-auth-ldap==1.2.15 | ||
django-cors-middleware==1.3.1 | ||
django-guardian==1.4.9 | ||
djangorestframework==3.9.4 | ||
backoff>=1.8.0 | ||
django>=2.2.19,<3.0 | ||
django-auth-ldap>=2.3.0,<3.0 | ||
django-cors-middleware>=1.5.0 | ||
django-guardian>=2.3.0 | ||
djangorestframework>=3.12.2,<4.0 | ||
docker-py==1.10.6 | ||
gunicorn==19.7.1 | ||
idna==2.6 | ||
jmespath==0.9.3 | ||
jsonfield==2.0.2 | ||
jsonschema==2.6.0 | ||
morph==0.1.2 | ||
ndg-httpsclient==0.4.2 | ||
packaging==16.8 | ||
pyasn1==0.3.2 | ||
psycopg2-binary==2.7.5 | ||
pyldap==2.4.37 | ||
pyOpenSSL==17.5.0 | ||
pytz==2017.2 | ||
requests==2.20.0 | ||
requests-toolbelt==0.8.0 | ||
gunicorn>=20.0.4 | ||
idna>=2.6 | ||
jmespath>=0.10.0 | ||
jsonfield>=3.1.0 | ||
jsonschema>=3.2.0 | ||
morph==0.1.4 | ||
ndg-httpsclient==0.5.1 | ||
packaging==20.0 | ||
pyasn1==0.3.7 | ||
psycopg2-binary==2.8.6 | ||
pyldap==3.0.0 | ||
pyOpenSSL>=20.0.1 | ||
pytz>=2021.1 | ||
requests>=2.25.1 | ||
requests-toolbelt>=0.9.1 |