Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
792e122
Added test data
Chilipp Mar 16, 2019
6b49186
added temperature and precip
Chilipp Mar 16, 2019
8d9c65e
Use pytest.ini from tests submodule
Chilipp Mar 18, 2019
85042e0
Updated tests
Chilipp Mar 18, 2019
c6b5673
Updated tests
Chilipp Mar 18, 2019
0d12e84
replaced spaces with tabs
Chilipp Mar 19, 2019
4aa3dfa
updated tests
Chilipp Mar 19, 2019
33685e7
Added okexcept column
Chilipp Mar 19, 2019
f82bc52
Updated submodule
Chilipp Mar 19, 2019
5c3d1c5
Accept wrong Country for all samples
Mar 19, 2019
e6bae7d
Accept wrong Country for all samples
Mar 19, 2019
763ea38
Revert "Accept wrong Country for all samples"
Chilipp Mar 19, 2019
12039ab
Revert "Accept wrong Country for all samples"
Chilipp Mar 19, 2019
f79a607
added second test sample
Chilipp Mar 20, 2019
9bd06c1
Minr
Chilipp Mar 21, 2019
9347f51
Added postgres into the framework
Chilipp Mar 21, 2019
0e8fcb0
Updated tests
Chilipp Mar 21, 2019
0dbfef0
use PYTEST env var in docker run
Chilipp Mar 22, 2019
cf6ed4d
Update tests
Chilipp Mar 22, 2019
a466760
Allow update of existing samples
Chilipp Mar 22, 2019
db953e8
Added postgres dump for test.tsv
Chilipp Mar 22, 2019
1775d56
Revert "Added postgres dump for test.tsv"
Chilipp Mar 22, 2019
2e4812b
Added mapping from EMPD country to Natural Earth country
Chilipp Mar 23, 2019
71bc1a9
removed tests submodule [skip ci]
Chilipp Mar 23, 2019
b832972
added tests
Chilipp Mar 23, 2019
c277f08
Added postgres dump for test.tsv
Mar 23, 2019
2eb9ad3
minor
Chilipp Mar 23, 2019
b4eb52b
typo
Chilipp Mar 23, 2019
6f35ac7
minor
Chilipp Mar 23, 2019
f0ba254
added pytest.ini
Chilipp Mar 23, 2019
02d9c09
split fixed tables into separate tsv files
Chilipp Mar 23, 2019
83be78b
Added handling of okexcept in postgres
Chilipp Mar 24, 2019
58728f6
some fixes with postgres import
Chilipp Mar 24, 2019
8ede07f
Include natural_earth and okexcept in postgres dump
Chilipp Mar 24, 2019
6164bf0
added tab-delimited postgres dump
Chilipp Mar 24, 2019
eb44889
minor
Chilipp Mar 24, 2019
9b71d2d
Added more tests for metadata
Chilipp Mar 24, 2019
6fec106
added new test sample with new SampleContext
Chilipp Mar 24, 2019
8a832d7
Minor
Chilipp Mar 24, 2019
2c269cc
Improved meta tests
Chilipp Mar 24, 2019
423c69d
added a script to update fixed tables
Chilipp Mar 24, 2019
ff84bf0
[test_a1]: Changed country from France to Germany
Mar 25, 2019
919bffe
Revert "[test_a1]: Changed country from France to Germany"
Chilipp Mar 25, 2019
40d0d79
[test_a1]: Changed country from France to Germany
Mar 25, 2019
0cea95e
Merged test.tsv into meta.tsv [skip ci]
Mar 25, 2019
b698bb3
Removed postgres dump of test.tsv
Mar 25, 2019
7337d04
Removed test.tsv to finish the PR
Mar 25, 2019
26bccc8
Merge branch 'master' into test-data
Chilipp Mar 25, 2019
d9a8162
Revert "Removed test.tsv to finish the PR"
Chilipp Mar 25, 2019
6da4e49
Revert "Removed postgres dump of test.tsv"
Chilipp Mar 25, 2019
795280c
Revert "Merged test.tsv into meta.tsv [skip ci]"
Chilipp Mar 25, 2019
3585e35
Merge branch 'master' into test-data
Chilipp Mar 25, 2019
bf60811
Revert "[test_a1]: Changed country from France to Germany"
Chilipp Mar 25, 2019
8f9bd98
Merge branch 'master' into test-data
Chilipp Mar 25, 2019
3304a6d
Merge branch 'master' into test-data
Chilipp Mar 25, 2019
0e230bd
Merge branch 'upstream/master' into test-data
Chilipp Mar 25, 2019
3401399
[test_a1]: Changed country from France to Germany
Mar 25, 2019
e373a2b
Merge branch 'upstream/master' into test-data
Mar 25, 2019
e289b18
Merged test.tsv into meta.tsv [skip ci]
Mar 25, 2019
9f32863
Added postgres dump for test.tsv
Mar 25, 2019
ebfcb8d
Removed postgres dump of test.tsv
Mar 25, 2019
a20dfc1
Updated tab-delimited files from EMPD2 postgres database
Mar 25, 2019
1a07f02
Removed test.tsv to finish the PR
Mar 25, 2019
1bd5cba
Revert "Removed test.tsv to finish the PR"
Chilipp Mar 25, 2019
25dc07b
Revert "Updated tab-delimited files from EMPD2 postgres database"
Chilipp Mar 25, 2019
2a40e8d
Revert "Removed postgres dump of test.tsv"
Chilipp Mar 25, 2019
d35ad49
Revert "Added postgres dump for test.tsv"
Chilipp Mar 25, 2019
bdd58b7
Revert "Merged test.tsv into meta.tsv [skip ci]"
Chilipp Mar 25, 2019
ada9ac5
Revert "[test_a1]: Changed country from France to Germany"
Chilipp Mar 25, 2019
507b686
[test_a1]: Changed country from France to Germany
Mar 25, 2019
f47f61b
Merge branch 'upstream/master' into test-data
Mar 25, 2019
adc9561
Merged test.tsv into meta.tsv [skip ci]
Mar 25, 2019
26c9b8e
Added postgres dump for test.tsv
Mar 25, 2019
fea50c0
Removed postgres dump of test.tsv
Mar 25, 2019
d075624
Updated tab-delimited files from EMPD2 postgres database
Mar 25, 2019
bcab151
Removed test.tsv to finish the PR
Mar 25, 2019
010a317
Revert "Removed test.tsv to finish the PR"
Chilipp Mar 25, 2019
8c88c62
Revert "Updated tab-delimited files from EMPD2 postgres database"
Chilipp Mar 25, 2019
cf92024
Revert "Added postgres dump for test.tsv"
Chilipp Mar 25, 2019
5e3e27b
Revert "Merged test.tsv into meta.tsv [skip ci]"
Chilipp Mar 25, 2019
6b7c9db
Revert "[test_a1]: Changed country from France to Germany"
Chilipp Mar 25, 2019
c0813a5
Merge branch 'upstream/master' into test-data
Chilipp Mar 25, 2019
9128681
[test_a1]: Changed country from France to Germany
Mar 25, 2019
437cb16
export fixed tables
Chilipp Mar 25, 2019
a7976b5
Merged test.tsv into meta.tsv [skip ci]
Mar 25, 2019
b8eeb67
Updated fixed tables
Mar 25, 2019
00fd0ff
Added postgres dump for test.tsv
Mar 25, 2019
56e09a1
Updated tab-delimited files from EMPD2 postgres database
Mar 25, 2019
05cc0a3
Removed test.tsv to finish the PR
Mar 25, 2019
7b20676
Merge branch 'master' of https://github.com/EMPD2/EMPD-data into test…
Chilipp Mar 25, 2019
60dbc57
Merge branch 'upstream/master' into test-data
Chilipp Mar 25, 2019
f0f3fc9
Revert "Removed test.tsv to finish the PR"
Chilipp Mar 25, 2019
3d03039
Revert "Updated tab-delimited files from EMPD2 postgres database"
Chilipp Mar 25, 2019
29c4f92
Revert "Added postgres dump for test.tsv"
Chilipp Mar 25, 2019
a65d0ce
Revert "Updated fixed tables"
Chilipp Mar 25, 2019
951baea
Revert "Merged test.tsv into meta.tsv [skip ci]"
Chilipp Mar 25, 2019
b3cac3c
Revert "[test_a1]: Changed country from France to Germany"
Chilipp Mar 25, 2019
73ffad2
Updated 1 samples in test.tsv as requested by Philipp Sommer
Chilipp Apr 1, 2019
79768df
Updated 1 samples in test.tsv as requested by {submitter}
Chilipp Apr 1, 2019
279f8ff
Updated 1 sample in test.tsv as requested by {submitter}
Chilipp Apr 1, 2019
a902077
Updated 1 sample in test.tsv as requested by {submitter}
Apr 1, 2019
a0b6efc
Updated 1 sample in test.tsv as requested by {submitter}
Apr 1, 2019
512a50c
Updated 1 sample in test.tsv as requested by {submitter}
Apr 1, 2019
43ab5e1
Updated 1 sample in test.tsv as requested by {submitter}
Apr 2, 2019
b81ae5b
Updated 1 sample in test.tsv as requested by {submitter}
Apr 3, 2019
f3dc5d1
set initial publi_id and worker_id from existing tables
Chilipp Mar 25, 2019
bfe1321
added extract-failed argument
Chilipp Mar 27, 2019
7d6dbf9
added fix_trailing_spaces and fix_newline_chars
Chilipp Mar 27, 2019
77d52ac
save the original metadata after having removed okexcept fields
Chilipp Mar 27, 2019
7ce6c4b
Always add dbfix mark when fix-db option is passed
Chilipp Mar 27, 2019
6f07b3e
Fixed fixing of temperatures and precipitation
Chilipp Mar 27, 2019
e8d93bf
minor
Chilipp Mar 27, 2019
ba030e5
minor change in precip and temperature fix
Chilipp Mar 27, 2019
2cf8ace
do not run tests per meta_row
Chilipp Mar 28, 2019
9ced84f
Fixes for no sample submission
Chilipp Apr 3, 2019
e53a01d
disable updates of groupids
Chilipp Apr 3, 2019
c2c60b7
merged master into test-data
Chilipp Apr 3, 2019
29ed805
Merge branch 'upstream/master' into test-data
Chilipp Apr 3, 2019
8897b82
Extracted failures to failures/failed.tsv [skip ci]
Apr 3, 2019
edeb8ef
Minor
Chilipp Apr 3, 2019
1d229c8
Merge branch 'master' of https://github.com/EMPD2/EMPD-data into test…
Chilipp Apr 11, 2019
ae62ed8
Merge branch 'master' of https://github.com/EMPD2/EMPD-data into test…
Chilipp Apr 12, 2019
6e8bcb7
Merge remote-tracking branch 'origin' into test-data
Chilipp Apr 12, 2019
3bc3d2f
Merge branch 'master' of https://github.com/EMPD2/EMPD-data into test…
Chilipp Apr 28, 2019
2843894
Merge branch 'master' of https://github.com/EMPD2/EMPD-data into test…
Chilipp May 9, 2019
6af0a83
Merge branch 'master' of https://github.com/EMPD2/EMPD-data into test…
May 13, 2019
e9dccef
Updated fixed tables
Oct 20, 2019
426ff36
Added postgres dump for test.tsv
Oct 20, 2019
e888c47
Revert "Updated fixed tables"
Oct 20, 2019
17504e7
Added metaViewer table to postgres dump
Oct 20, 2019
c013d56
added counts for test_a1
Oct 20, 2019
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
2 changes: 2 additions & 0 deletions failures/failed.tsv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SampleName OriginalSampleName SiteName Country Longitude Latitude Elevation Temperature Precipitation LocationReliability LocationNotes AreaOfSite SampleContext SiteDescription VegDescription SampleType SampleMethod AgeBP AgeUncertainty ispercent Notes EMPD_version Publication1 DOI1 Publication2 DOI2 Publication3 DOI3 Publication4 DOI4 Publication5 DOI5 Worker1_Role Worker1_LastName Worker1_Initials Worker1_FirstName Worker1_Address1 Worker1_Address2 Worker1_Email1 Worker1_Email2 Worker1_Phone1 Worker1_Phone2 Worker2_Role Worker2_LastName Worker2_Initials Worker2_FirstName Worker2_Address1 Worker2_Address2 Worker2_Email1 Worker2_Email2 Worker2_Phone1 Worker2_Phone2 Worker3_Role Worker3_LastName Worker3_Initials Worker3_FirstName Worker3_Address1 Worker3_Address2 Worker3_Email1 Worker3_Email2 Worker3_Phone1 Worker3_Phone2 Worker4_Role Worker4_LastName Worker4_Initials Worker4_FirstName Worker4_Address1 Worker4_Address2 Worker4_Email1 Worker4_Email2 Worker4_Phone1 Worker4_Phone2 okexcept nat_earth empd_countries okexcept(Country) Country_ok
test_a1 orig_test_a1 somewhere France 10 50 340 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5 X Actually in Germany 30 True Germany Germany False False
Loading