Skip to content

#59: Is Niklas informed about merging from testing into master (for merge details: see description)

Sabine Schröder requested to merge testing into master

related to #8 (closed), #33 (closed): 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.

Merge request reports