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

Backend Dependency Update #2977

Draft
wants to merge 62 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
0ed2d2e
- Updated all feasible backend dependencies
elipe17 May 6, 2024
15746cd
- remove env var
elipe17 May 6, 2024
740caf9
- Update django timezone to datetime timezone. Django used to use dat…
elipe17 May 7, 2024
31e828a
- update django storages to newest version
elipe17 May 7, 2024
690ee41
- fix tests
elipe17 May 7, 2024
067af9f
- resolved test issue
elipe17 May 7, 2024
bb9178c
- fix lint
elipe17 May 7, 2024
d9a288c
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 May 24, 2024
58df8c1
Merge branch 'develop' into backend-dep-update
elipe17 May 25, 2024
8e8008e
- Update terraform to create rds with postgres v15
elipe17 May 29, 2024
87dbafd
- enable kibana
elipe17 May 29, 2024
03b0a9d
- Updated files to be 2021
elipe17 May 29, 2024
50b9843
Merge branch 'develop' into backend-dep-update
elipe17 May 30, 2024
3bb8982
Merge branch 'develop' into backend-dep-update
elipe17 May 31, 2024
766066c
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Jun 7, 2024
6458894
- fix merge conflicts
elipe17 Jun 7, 2024
0bb07a1
- fix lint
elipe17 Jun 7, 2024
a25221c
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Jun 7, 2024
abf5094
- resolved dependencies
elipe17 Jun 7, 2024
fee138e
Merge branch 'develop' into backend-dep-update
elipe17 Jun 18, 2024
51ff2db
Merge branch 'develop' into backend-dep-update
elipe17 Jun 20, 2024
00bd7fa
Merge branch 'develop' into backend-dep-update
elipe17 Jun 27, 2024
66ea73c
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Jun 27, 2024
4517cd3
Merge branch 'backend-dep-update' of https://github.com/raft-tech/TAN…
elipe17 Jun 27, 2024
8f17e03
- Updated tests
elipe17 Jun 27, 2024
f14a96b
Merge branch 'develop' into backend-dep-update
elipe17 Jul 2, 2024
6b84ea7
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Jul 12, 2024
9da2f00
- Updated Pipfile.lock
elipe17 Jul 12, 2024
ccd79e2
- Added missing dependency
elipe17 Jul 12, 2024
8cd2454
Merge branch 'develop' into backend-dep-update
elipe17 Jul 16, 2024
d66782e
Merge branch 'develop' into backend-dep-update
elipe17 Jul 18, 2024
fcd8f94
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Jul 26, 2024
d0cd6d5
Merge branch 'develop' into backend-dep-update
elipe17 Jul 29, 2024
4f31d39
Merge branch 'develop' into backend-dep-update
elipe17 Jul 29, 2024
68ac76d
Merge branch 'develop' into backend-dep-update
elipe17 Aug 6, 2024
029c419
Merge branch 'develop' into backend-dep-update
elipe17 Aug 12, 2024
0eaa7a7
Merge branch 'develop' into backend-dep-update
elipe17 Aug 12, 2024
06e0adb
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Aug 14, 2024
777b5c0
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Aug 26, 2024
f3f53dd
- Update lock file
elipe17 Aug 26, 2024
d4cfa44
Merge branch 'develop' into backend-dep-update
elipe17 Aug 27, 2024
e4d6b35
Merge branch 'develop' into backend-dep-update
elipe17 Aug 28, 2024
b719247
Merge branch 'develop' into backend-dep-update
elipe17 Aug 28, 2024
bd47db8
- use correct lazy text generator
elipe17 Aug 29, 2024
c15b080
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Aug 29, 2024
3cd52ee
- use cat2 syntax
elipe17 Aug 29, 2024
3361ff7
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Sep 10, 2024
5c2c3cc
- use correct lazy getter
elipe17 Sep 10, 2024
852a949
- Remove ipdb
elipe17 Sep 10, 2024
89e1e0a
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Oct 8, 2024
e4f9614
- Update lock
elipe17 Oct 8, 2024
66a6bfd
Merge branch 'develop' into backend-dep-update
elipe17 Oct 31, 2024
d8b5402
- Updated fixture
elipe17 Oct 31, 2024
c3e7828
- updated test
elipe17 Oct 31, 2024
89ca4ef
Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …
elipe17 Dec 10, 2024
baf68df
- Update lock file
elipe17 Dec 10, 2024
0e612cc
- linting
elipe17 Dec 10, 2024
bcd7bd7
Merge branch 'develop' into backend-dep-update
elipe17 Dec 16, 2024
3559226
Merge branch 'develop' into backend-dep-update
elipe17 Dec 19, 2024
725170f
Merge branch 'develop' into backend-dep-update
elipe17 Jan 3, 2025
2809991
Merge branch 'develop' into backend-dep-update
elipe17 Jan 8, 2025
ee92e44
Merge branch 'develop' into backend-dep-update
elipe17 Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 45 additions & 44 deletions tdrs-backend/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,61 @@ url = "https://tdp-nexus.dev.raftlabs.tech/repository/pypi-proxy/simple"
verify_ssl = true

[dev-packages]
awscli = "1.29.4"
awscli-local = "0.20"
factory-boy = "==3.2.1"
flake8 = "6.0.0"
awscli = "1.32.98"
awscli-local = "0.22.0"
factory-boy = "==3.3.0"
flake8 = "7.0.0"
flake8-docstrings = "1.7.0"
isort = "5.12.0"
mkdocs = "1.4.3"
pygraphviz = "1.11"
pyparsing = "3.1.0"
pytest = "7.4.0"
pytest-cov = "4.1.0"
pytest-django = "4.5.2"
pytest-mock = "==3.11.0"
pytest-factoryboy = "2.5.1"
isort = "5.13.2"
mkdocs = "1.6.0"
pygraphviz = "1.12"
pyparsing = "3.1.2"
pytest = "8.2.0"
pytest-cov = "5.0.0"
pytest-django = "4.8.0"
pytest-mock = "==3.14.0"
pytest-factoryboy = "2.7.0"

[packages]
pytz = "2022.1"
botocore = "==1.31.4"
boto3 = "==1.28.4"
cryptography = "==3.4.7"
dj-database-url = "==0.5.0"
django = "==3.2.15"
pytz = "2024.1"
botocore = "==1.34.98"
boto3 = "==1.34.98"
cryptography = "==42.0.7"
dj-database-url = "==2.1.0"
django = "==5.0.5"
django-admin-508 = "==1.0.2"
django-admin-logs = "==1.0.2"
django-configurations = "==2.2"
django-cors-headers = "==3.12.0"
django-extensions = "==3.1.3"
django-filter = "==21.1"
django-model-utils = "==4.1.1"
django-storages = "==1.12.3"
django-admin-logs = "==1.2.0"
django-configurations = "==2.5.1"
django-cors-headers = "==4.3.1"
django-extensions = "==3.2.3"
django-filter = "==24.2"
django-more-admin-filters = "==1.8"
django-model-utils = "==4.5.1"
django-storages = "==1.14.3"
django-unique-upload = "==0.2.1"
django-csp = "==3.7"
djangorestframework = "==3.13.1"
drf-yasg = "==1.20.0"
gunicorn = "==20.1.0"
jwcrypto = "==1.3.1"
markdown = "==3.3.7"
django-csp = "==3.8"
djangorestframework = "==3.15.1"
drf-yasg = "==1.21.7"
gunicorn = "==22.0.0"
jwcrypto = "==1.5.6"
markdown = "==3.6"
psycopg2 = "==2.9.9"
pyjwt = "==2.4.0"
requests = "==2.27.1"
wait-for-it = "==2.2.0"
requests-mock = "==1.9.3"
celery = "==5.2.6"
redis = "==4.1.2"
flower = "==1.1.0"
django-celery-beat = "==2.2.1"
pyjwt = "==2.8.0"
requests = "==2.31.0"
wait-for-it = "==2.2.2"
requests-mock = "==1.12.1"
celery = "==5.4.0"
redis = "==5.0.4"
flower = "==2.0.1"
django-celery-beat = "==2.6.0"
elasticsearch = "==7.13.4" # REQUIRED - v7.14.0 introduces breaking changes
django-elasticsearch-dsl = "==7.3"
django-elasticsearch-dsl-drf = "==0.22.5"
requests-aws4auth = "==1.1.2"
cerberus = "==1.3.4"
xlsxwriter = "==3.1.9"
requests-aws4auth = "==1.2.3"
cerberus = "==1.3.5"
xlsxwriter = "==3.2.0"
openpyxl = "==3.1.2"
sendgrid = "==6.10.0"
sendgrid = "==6.11.0"
django_prometheus = "==2.3.1"
sentry-sdk = "==2.11.0"

Expand Down
1,813 changes: 821 additions & 992 deletions tdrs-backend/Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/core/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from abc import abstractmethod
from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _


class MostRecentVersionFilter(admin.SimpleListFilter):
Expand Down
2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/data_files/admin/filters.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Filter classes for DataFiles admin page."""
from django.contrib import admin
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from tdpservice.search_indexes.models.reparse_meta import ReparseMeta
from tdpservice.core.filters import MostRecentVersionFilter

Expand Down
2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/email/email.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def prepare_recipients(recipient_email):

recipient_email can be either a string (single recipient) or a array of strings.
"""
recipients = [recipient_email] if type(recipient_email) == str else recipient_email
recipients = [recipient_email] if type(recipient_email) is str else recipient_email
logger.info(f"Starting celery task to send email to {recipients}")
return recipients

Expand Down
3 changes: 1 addition & 2 deletions tdrs-backend/tdpservice/email/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
from django.contrib.auth.models import Group
from django.conf import settings
from django.urls import reverse
from django.utils import timezone
from celery import shared_task
from datetime import datetime, timedelta
from datetime import datetime, timedelta, timezone
import logging
from tdpservice.email.helpers.account_access_requests import send_num_access_requests_email
from tdpservice.email.helpers.account_deactivation_warning import send_deactivation_warning_email
Expand Down
2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/parsers/row_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,5 +242,5 @@ def update_encrypted_fields(self, is_encrypted):
"""Update whether schema fields are encrypted or not."""
for schema in self.schemas:
for field in schema.fields:
if type(field) == TransformField and "is_encrypted" in field.kwargs:
if type(field) is TransformField and "is_encrypted" in field.kwargs:
field.kwargs['is_encrypted'] = is_encrypted
10 changes: 8 additions & 2 deletions tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,10 @@
startIndex=2,
endIndex=7,
required=True,
validators=[],
validators=[
category2.dateYearIsLargerThan(1998),
category2.dateMonthIsValid(),
],
),
Field(
item="4B",
Expand Down Expand Up @@ -508,7 +511,10 @@
startIndex=2,
endIndex=7,
required=True,
validators=[],
validators=[
category2.dateYearIsLargerThan(1998),
category2.dateMonthIsValid(),
],
),
Field(
item="4C",
Expand Down
10 changes: 8 additions & 2 deletions tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,10 @@
startIndex=2,
endIndex=7,
required=True,
validators=[],
validators=[
category2.dateYearIsLargerThan(1998),
category2.dateMonthIsValid(),
],
),
Field(
item="4B",
Expand Down Expand Up @@ -472,7 +475,10 @@
startIndex=2,
endIndex=7,
required=True,
validators=[],
validators=[
category2.dateYearIsLargerThan(1998),
category2.dateMonthIsValid(),
],
),
Field(
item="4C",
Expand Down
Loading
Loading