Skip to content

Commit

Permalink
Updated changes
Browse files Browse the repository at this point in the history
  • Loading branch information
judtinzhang committed Oct 14, 2023
1 parent 203e11c commit 5f0a84d
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"upgrade-cdk": "yarn upgrade cdkactions@latest cdkactions-cli@latest"
},
"dependencies": {
"@pennlabs/kraken": "^0.8.6",
"@pennlabs/kraken": "^0.8.12",
"cdkactions": "^0.2.3",
"constructs": "^3.2.109"
},
Expand Down
8 changes: 4 additions & 4 deletions .github/cdk/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@pennlabs/kraken@^0.8.6":
version "0.8.6"
resolved "https://registry.yarnpkg.com/@pennlabs/kraken/-/kraken-0.8.6.tgz#79a9d10bed36b699c526556cd69b6d81341847d1"
integrity sha512-aBblQa/661DJ2GP3Dq1KEzCZ72ZV/Jw7z4HNZoWPxGWn+tSPwvaPkSNDpK7tT+nJmu427giGU8DLyciU79hKbA==
"@pennlabs/kraken@^0.8.12":
version "0.8.12"
resolved "https://registry.yarnpkg.com/@pennlabs/kraken/-/kraken-0.8.12.tgz#63aab218236f33af0ec0b90344926e7cbf167d60"
integrity sha512-+iYz/Xv674c0VujbYc65sFYU182Su3cmcByUndwKdnj75KDQVcHKOKrcfAcf5Z7eerGAYC7xfNftaZydjV0alw==
dependencies:
cdkactions "^0.2.3"
constructs "^3.2.80"
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/cdkactions_build-and-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@ jobs:
cd backend
pipenv run coverage run --concurrency=multiprocessing manage.py test --settings=Platform.settings.ci --parallel
pipenv run coverage combine
pipenv run coverage xml
- name: Upload Code Coverage
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./backend/
fail_ci_if_error: true
files: coverage.xml
name: codecov-umbrella
verbose: true
container:
image: python:3.8-buster
env:
Expand Down
1 change: 1 addition & 0 deletions backend/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ django-debug-toolbar = "*"
django-extensions = "*"
flake8-absolute-import = "*"
tblib = "*"
coverage = "*"

[packages]
dj-database-url = "*"
Expand Down
61 changes: 60 additions & 1 deletion backend/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions backend/accounts/migrations/0006_alter_major_name.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.2.5 on 2023-10-14 05:27

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("accounts", "0005_privacyresource_privacysetting"),
]

operations = [
migrations.AlterField(
model_name="major",
name="name",
field=models.CharField(max_length=150),
),
]
2 changes: 1 addition & 1 deletion backend/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Major(models.Model):
Represents a major at the University of Pennsylvania.
"""

name = models.CharField(max_length=100)
name = models.CharField(max_length=150)
is_active = models.BooleanField(default=True)

DEGREE_BACHELOR = "BACHELORS"
Expand Down

0 comments on commit 5f0a84d

Please sign in to comment.