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

Make Compilation - Mission a many-to-many relationship #158

Merged
merged 26 commits into from
Feb 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
380f592
[requires.io] dependency update
requires Jan 28, 2022
09b6f98
[requires.io] dependency update
requires Jan 29, 2022
f51c067
[requires.io] dependency update
requires Jan 29, 2022
c605f7d
[requires.io] dependency update
requires Feb 1, 2022
a6fbf34
[requires.io] dependency update
requires Feb 1, 2022
eccf2bd
[requires.io] dependency update
requires Feb 2, 2022
3be503b
[requires.io] dependency update
requires Feb 3, 2022
8ebe92d
[requires.io] dependency update
requires Feb 3, 2022
c726403
Schema changes on Compilation table - make m2m with Mission
MBARIMike Feb 4, 2022
fe55003
Schema changes on Compilation table - make m2m with Mission
MBARIMike Feb 4, 2022
85f5329
WIP: Load compilations into database
MBARIMike Feb 4, 2022
29ee186
For testing --compilation
MBARIMike Feb 4, 2022
3728cc3
Made Compilation many-to-many with Mission and added fields
MBARIMike Feb 4, 2022
61f0e73
[requires.io] dependency update
requires Feb 4, 2022
f069136
Merge branch 'main' into requires-io-main
MBARIMike Feb 4, 2022
542bb63
Merge pull request #41 from MBARIMike/requires-io-main
MBARIMike Feb 4, 2022
c4ff2d4
Revert to django==3.2.12
MBARIMike Feb 4, 2022
d67a509
Revert to pytest==6.2.5 to avoid this error: ImportError: cannot impo…
MBARIMike Feb 5, 2022
984a0ee
Change Compilation dir_name to name
MBARIMike Feb 5, 2022
b983736
Specify search and fields for CompilationAdmin
MBARIMike Feb 5, 2022
0417ec1
Change Compilation dir_name to name, add creation_date, cmd_filename,…
MBARIMike Feb 5, 2022
847749a
Remove deprecated Compiler methods, reduce Compilation thumbnail_imag…
MBARIMike Feb 5, 2022
2e15c18
Add compilation.thumbnail_filename to the list
MBARIMike Feb 7, 2022
f446e10
Attempt to add link to mount cifs volume
MBARIMike Feb 7, 2022
5ce3b72
Enable --skipuntil for --compilation, catch empty compilations
MBARIMike Feb 7, 2022
a1021ad
Provide links to where Used in Compilations
MBARIMike Feb 7, 2022
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
10 changes: 8 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,15 @@
//"args": [ "-v", "2", "--bootstrap", "--skipuntil_regex", "--regex", "MappingAUVOps2006/20060828/ZTopo.grd$", "--limit", "1", "--clobber", "--noinput" ],
//"args": ["--fnv", "-v", "1", "--limit", "2", "--skipuntil", "MappingAUVOps2006/20060828"]
//"args": ["--fnv", "-v", "2", "--limit", "2", "--skipuntil", "2021/20210906d1/lidar"]
"args": ["--fnv", "-v", "1"],
//"args": ["--fnv", "-v", "1"],
//"args": [ "--compilation", "-v", "1", "--skipuntil", "swathdata/surveys/UH/kok0714", "--log_file", "compilation.txt" ],
//"args": ["--compilation", "-v", "1", "--log_file", "compilation.txt"],
// Supporting Compilation load testing, first mission found in --compilation: 2019/20190627d1/multibeam
// execute next line to build a fresh database, then the --compilation one can be used for testing
//"args": ["--bootstrap", "--notes", "--fnv", "-v", "1", "--limit", "15", "--clobber"],
//"args": ["--compilation", "-v", "1", "--skipuntil", "2019/MorroBay/Figures", "--limit", "20"],
//"args": ["--compilation", "-v", "1", "--filter", "2019/AxialSeamount/Figures_v2019Oct31", "--log_file", "compilation.txt"],
"args": ["--compilation", "-v", "1", "--skipuntil", "MappingAUVOps2007/Axial2007old/Figures/", "--log_file", "compilation.txt"],
//"args": ["--compilation", "-v", "1"],
"justMyCode": false
}
]
Expand Down
8 changes: 8 additions & 0 deletions smdb/config/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

from smdb.api.base import router as api_v1_router
from smdb.views import (
CompilationDetailView,
CompilationListView,
ExpeditionDetailView,
ExpeditionListView,
MissionDetailView,
Expand Down Expand Up @@ -42,6 +44,12 @@
ExpeditionDetailView.as_view(),
name="expedition-detail",
),
path("compilations/", CompilationListView.as_view()),
path(
"compilations/<str:slug>/",
CompilationDetailView.as_view(),
name="compilation-detail",
),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

# API URLS
Expand Down
Binary file modified smdb/docs/smdb_schema.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions smdb/requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytz==2021.3 # https://github.com/stub42/pytz
python-slugify==5.0.2 # https://github.com/un33k/python-slugify
Pillow==9.0.0 # https://github.com/python-pillow/Pillow
Pillow==9.0.1 # https://github.com/python-pillow/Pillow
rcssmin==1.1.0 # https://github.com/ndparker/rcssmin
argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi
whitenoise==5.3.0 # https://github.com/evansd/whitenoise
Expand All @@ -10,11 +10,11 @@ psycopg2==2.9.3 # https://github.com/psycopg/psycopg2

# Django
# ------------------------------------------------------------------------------
django==3.2.11 # pyup: < 3.2 # https://www.djangoproject.com/
django==3.2.12 # pyup: < 3.2 # https://www.djangoproject.com/
django-bleach==1.0.0 # https://pypi.org/project/django-bleach/
django-environ==0.8.1 # https://github.com/joke2k/django-environ
django-model-utils==4.2.0 # https://github.com/jazzband/django-model-utils
django-allauth==0.47.0 # https://github.com/pennersr/django-allauth
django-allauth==0.48.0 # https://github.com/pennersr/django-allauth
django-crispy-forms==1.14.0 # https://github.com/django-crispy-forms/django-crispy-forms
django-compressor==3.1 # https://github.com/django-compressor/django-compressor
django-redis==5.2.0 # https://github.com/jazzband/django-redis
Expand All @@ -31,7 +31,7 @@ graphene-graphiql-explorer==0.0.1 # https://pypi.org/project/graphene-graphiql-e
graphene-gis==0.0.6 # https://github.com/EverWinter23/graphene-gis
graphviz==0.19.1 # https://stackoverflow.com/a/13987392/1281657
ipdb==0.13.9 # https://github.com/gotcha/ipdb
ipykernel==6.7.0 # For use in Notebooks
ipykernel==6.8.0 # For use in Notebooks
matplotlib==3.5.1 # For plotting in Notebooks
netCDF4==1.5.8 # https://pypi.org/project/netCDF4/
pandas==1.4.0 # For use in Notebooks
Expand Down
4 changes: 2 additions & 2 deletions smdb/requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
# ------------------------------------------------------------------------------
flake8==4.0.1 # https://github.com/PyCQA/flake8
flake8-isort==4.1.1 # https://github.com/gforcada/flake8-isort
coverage==6.3 # https://github.com/nedbat/coveragepy
black==21.12b0 # https://github.com/ambv/black
coverage==6.3.1 # https://github.com/nedbat/coveragepy
black==22.1.0 # https://github.com/ambv/black
pylint-django==2.5.0 # https://github.com/PyCQA/pylint-django
pre-commit==2.17.0 # https://github.com/pre-commit/pre-commit

Expand Down
Loading