TOAR-II FastAPI merge requestshttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests2020-11-01T16:11:52+01:00https://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/1#3: added update mechanism for TOAR extension2020-11-01T16:11:52+01:00Sabine Schröders.schroeder@fz-juelich.de#3: added update mechanism for TOAR extension(cherry picked from commit 2e8d1730d775e45ff5b629453f2f2d5fd6e1eabb)(cherry picked from commit 2e8d1730d775e45ff5b629453f2f2d5fd6e1eabb)Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/2Updated Ontology2021-02-18T08:38:29+01:00Max LensingUpdated Ontologyhttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/3Updated Ontology2021-02-23T12:11:07+01:00Max LensingUpdated Ontologyhttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/4ontology tool to compare the controlled vocabulary and the ontology2021-03-31T19:55:50+02:00Max Lensingontology tool to compare the controlled vocabulary and the ontologyhttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/5#41: first script to shrink OWLdoc files2021-04-13T07:53:02+02:00Sabine Schröders.schroeder@fz-juelich.de#41: first script to shrink OWLdoc files(cherry picked from commit fe61d08d65ee588e30d96f0adcc19f5bbd2bb37e)
accidentally merged into master -- now cleaning up(cherry picked from commit fe61d08d65ee588e30d96f0adcc19f5bbd2bb37e)
accidentally merged into master -- now cleaning upSabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/6#31: added method to return all classes of an ontology2021-04-13T07:57:08+02:00Sabine Schröders.schroeder@fz-juelich.de#31: added method to return all classes of an ontology(cherry picked from commit 85039bea47572faebe378fa2c84b1184720c655d)
accidentally merged into master -- now cleaning up(cherry picked from commit 85039bea47572faebe378fa2c84b1184720c655d)
accidentally merged into master -- now cleaning upSabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/7#31: updated docstrings in TOARII_ontology.py2021-04-13T08:00:33+02:00Sabine Schröders.schroeder@fz-juelich.de#31: updated docstrings in TOARII_ontology.py(cherry picked from commit 93388bb6fe06ba6f27b67fe2840bbf284e03d8d5)
accidentally merged into master -- now cleaning up(cherry picked from commit 93388bb6fe06ba6f27b67fe2840bbf284e03d8d5)
accidentally merged into master -- now cleaning upSabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/8merged Max's developments into ontology branch2021-04-13T08:17:51+02:00Sabine Schröders.schroeder@fz-juelich.demerged Max's developments into ontology branchMax did not push directly to ontology (or did the merge)
-- now catch up on this while cleaning upMax did not push directly to ontology (or did the merge)
-- now catch up on this while cleaning upSabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/9merge ontology to dev2021-04-13T08:30:45+02:00Sabine Schröders.schroeder@fz-juelich.demerge ontology to devmerge all ontology developments into three main project branches (dev, testing, master=operational)merge all ontology developments into three main project branches (dev, testing, master=operational)Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/10merge dev into testing2021-04-13T08:37:42+02:00Sabine Schröders.schroeder@fz-juelich.demerge dev into testingmerge all ontology developments into three main project branches (dev, testing, master=operational)merge all ontology developments into three main project branches (dev, testing, master=operational)Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/11merge testing into master2021-04-13T08:40:10+02:00Sabine Schröders.schroeder@fz-juelich.demerge testing into mastermerge all ontology developments into three main project branches (dev, testing, master=operational)merge all ontology developments into three main project branches (dev, testing, master=operational)Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/12#52: metadata part of webDO3SE API was built2021-04-22T16:05:38+02:00Sabine Schröders.schroeder@fz-juelich.de#52: metadata part of webDO3SE API was builtalready merge metadata part into devalready merge metadata part into devSabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/13Squashed 'autoqc/' content from commit 11666ef and #25 webDO3SE API2021-04-22T16:30:42+02:00Sabine Schröders.schroeder@fz-juelich.deSquashed 'autoqc/' content from commit 11666ef and #25 webDO3SE APIgit-subtree-dir: autoqc
git-subtree-split: 11666efb169ee3ba5b1ad0c70c1861d948e7363agit-subtree-dir: autoqc
git-subtree-split: 11666efb169ee3ba5b1ad0c70c1861d948e7363aSabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/14Squashed 'autoqc/' content from commit 11666ef2021-05-05T21:50:11+02:00Sabine Schröders.schroeder@fz-juelich.deSquashed 'autoqc/' content from commit 11666efgit-subtree-dir: autoqc
git-subtree-split: 11666efb169ee3ba5b1ad0c70c1861d948e7363agit-subtree-dir: autoqc
git-subtree-split: 11666efb169ee3ba5b1ad0c70c1861d948e7363aSabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/15cherry pick (creation of pages)2021-05-05T18:59:55+02:00Sabine Schröders.schroeder@fz-juelich.decherry pick (creation of pages)from master back to dev...from master back to dev...Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/16cherry pick (creation of pages)2021-05-05T19:03:00+02:00Sabine Schröders.schroeder@fz-juelich.decherry pick (creation of pages)from dev to testing...from dev to testing...Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/17related to #8, #33:2021-05-06T19:13:14+02:00Sabine Schröders.schroeder@fz-juelich.derelated to #8, #33:from dev into testing (how to "merge" production_tests.sh from master into dev?!):
Finally found a way to use the controlled vocabulary in pytests without
hardcoding them instead of getting them from the database itself.
BUT: At sever...from dev into testing (how to "merge" production_tests.sh from master into dev?!):
Finally found a way to use the controlled vocabulary in pytests without
hardcoding them instead of getting them from the database itself.
BUT: At several places, 'import toardb' had to be inserted
(to avoid circular imports when importing only the controlled vocabulary)
AND: pytest would only work when stationmeta.models_annotation
imports generic.models
(This seems to be related to the order in which tables are created.)
Deleted all '# coding: utf-8' lines from source code,
since this is standard with python3.Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/18#59: Is Niklas informed about merging from testing into master (for merge det...2021-05-06T19:22:45+02:00Sabine Schröders.schroeder@fz-juelich.de#59: Is Niklas informed about merging from testing into master (for merge details: see description)related to #8, #33:
from dev into testing into master (how to "merge" production_tests.sh from master into testing/dev?!):
Finally found a way to use the controlled vocabulary in pytests without
hardcoding them instead of getting them f...related to #8, #33:
from dev into testing into master (how to "merge" production_tests.sh from master into testing/dev?!):
Finally found a way to use the controlled vocabulary in pytests without
hardcoding them instead of getting them from the database itself.
BUT: At several places, 'import toardb' had to be inserted
(to avoid circular imports when importing only the controlled vocabulary)
AND: pytest would only work when stationmeta.models_annotation
imports generic.models
(This seems to be related to the order in which tables are created.)
Deleted all '# coding: utf-8' lines from source code,
since this is standard with python3.Sabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/19#3,#25: updated revised data flags in controlled vocabulary; corrected API...2021-05-07T15:52:08+02:00Sabine Schröders.schroeder@fz-juelich.de#3,#25: updated revised data flags in controlled vocabulary; corrected API...#3,#25: updated revised data flags in controlled vocabulary; corrected API access for controlled vocabulary#3,#25: updated revised data flags in controlled vocabulary; corrected API access for controlled vocabularySabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.dehttps://gitlab.jsc.fz-juelich.de/esde/toar-data/toardb_fastapi/-/merge_requests/20@selke1: merging from testing to master; #3,#25: updated revised data flags i...2021-05-07T16:04:22+02:00Sabine Schröders.schroeder@fz-juelich.de@selke1: merging from testing to master; #3,#25: updated revised data flags in controlled vocabulary; corrected API...#3,#25: updated revised data flags in controlled vocabulary; corrected API access for controlled vocabulary#3,#25: updated revised data flags in controlled vocabulary; corrected API access for controlled vocabularySabine Schröders.schroeder@fz-juelich.deSabine Schröders.schroeder@fz-juelich.de