Skip to content

Commit e4951c9

Browse files
authored
Squash all migrations (#365)
* Squash migrations: squash all migrations into a single, cleaned up migration step * Remove no longer needed dependency jsonfield: had no longer been used in the actual code base but had still been a dependency because it was used in intermediate migration steps
1 parent 063e069 commit e4951c9

13 files changed

+101
-621
lines changed

requirements.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ django-registration>=3.1
88
graphviz
99
gunicorn
1010
jinja2
11-
jsonfield
1211
psycopg2-binary # PostgreSQL backend
1312
pynacl
1413
pyyaml>=4.2b1 # for fixtures and config generation; high severity vulnerability before 4.1 (CVE-2017-18342)

requirements.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ django==3.1.6 \
9494
# via
9595
# -r requirements.in
9696
# django-registration
97-
# jsonfield
9897
graphviz==0.14 \
9998
--hash=sha256:cb0e878f90378489f17aab140b68e64e44b79e4cb59a530c8863d84bf2e2e5f5 \
10099
--hash=sha256:e104ba036c8aef84320ec80560e544cd3cad68c9f90394b4e2b87bc44ab09791
@@ -111,10 +110,6 @@ jinja2==2.11.3 \
111110
--hash=sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419 \
112111
--hash=sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6
113112
# via -r requirements.in
114-
jsonfield==3.1.0 \
115-
--hash=sha256:7e4e84597de21eeaeeaaa7cc5da08c61c48a9b64d0c446b2d71255d01812887a \
116-
--hash=sha256:df857811587f252b97bafba42e02805e70a398a7a47870bc6358a0308dd689ed
117-
# via -r requirements.in
118113
markupsafe==1.1.1 \
119114
--hash=sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473 \
120115
--hash=sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161 \

scionlab/migrations/0001_initial.py renamed to scionlab/migrations/0001_squashed_0011_pullap.py

Lines changed: 101 additions & 54 deletions
Large diffs are not rendered by default.

scionlab/migrations/0002_SCIONLab_upgrade-2019-08.py

Lines changed: 0 additions & 48 deletions
This file was deleted.

scionlab/migrations/0003_installation_types.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

scionlab/migrations/0004_multiap.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

scionlab/migrations/0005_monolith.py

Lines changed: 0 additions & 32 deletions
This file was deleted.

scionlab/migrations/0006_pki.py

Lines changed: 0 additions & 162 deletions
This file was deleted.

scionlab/migrations/0007_new_cppki.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)