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

Issue 511 #514

Open
wants to merge 176 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
c9859d4
should fix issue 511
proccaserra Nov 6, 2023
195cf71
corrections, test passing (new test)
proccaserra Nov 10, 2023
34f9291
minor edit
proccaserra Nov 10, 2023
2f489f5
fixes issue #512
proccaserra Nov 12, 2023
034291f
fixes issue #512
proccaserra Nov 12, 2023
818332d
adding a test to check if comments on assay declaration are properly …
proccaserra Nov 15, 2023
324bcd4
fixes issue #506 - updating to ols4
proccaserra Nov 15, 2023
1ec71db
minor fix to test
proccaserra Nov 20, 2023
b095701
Fix to determining JSON directory location.
ptth222 Jan 19, 2024
1e88823
Fix rule and check.
ptth222 Jan 30, 2024
2bf8347
several fixes related to TAB and JSON serialization but resolution in…
proccaserra Feb 4, 2024
a9a75ea
fixing outstanding roundtrip issues object , documenting in notebook
proccaserra Feb 8, 2024
8a6870c
minor revisions
proccaserra Feb 11, 2024
2d692db
Merge branch 'develop' into issue-511
proccaserra Feb 11, 2024
e108bb9
Merge branch 'develop' into issue-511
proccaserra Feb 11, 2024
3fe7b5f
refactoring
proccaserra Feb 12, 2024
4f2d76d
fixing linting
proccaserra Feb 12, 2024
03d6e8b
removed unnecessary condition
proccaserra Feb 12, 2024
79f9a8e
add name to process
proccaserra Feb 12, 2024
d5edfd5
minor change
proccaserra Feb 12, 2024
1b4e937
refactor convert value
proccaserra Feb 12, 2024
8694f53
reformat arrays, TODO: move to constant.py
proccaserra Feb 12, 2024
30969df
fixing assay import
proccaserra Feb 12, 2024
5d03523
fixing constructor
proccaserra Feb 12, 2024
07ae789
removing print statement
proccaserra Feb 12, 2024
b1d770c
linting
proccaserra Feb 14, 2024
3e70aa1
full test coverage for pubmed.py
proccaserra Feb 14, 2024
9707b82
refactoring & moving arrays defining valid ISA-Tab fields from isatab…
proccaserra Feb 19, 2024
52b0f6b
reworking Comments on class and adding line at end of file
proccaserra Feb 19, 2024
9f13021
setting default value to Comment to empty strings rather than None, l…
proccaserra Feb 19, 2024
290ac60
linting
proccaserra Feb 19, 2024
c478357
linting & adding a todo
proccaserra Feb 19, 2024
7756895
linting & end of file empty line
proccaserra Feb 19, 2024
88f43cb
linting
proccaserra Feb 19, 2024
b9d185b
linting
proccaserra Feb 19, 2024
d1529ce
linting
proccaserra Feb 19, 2024
04c5ade
linting
proccaserra Feb 19, 2024
b330257
adding docstrings, linting, and adding 2 functions to deal with checksum
proccaserra Feb 19, 2024
07dcdc3
linting
proccaserra Feb 19, 2024
4ad3fbe
linting
proccaserra Feb 19, 2024
6b250e0
refactoring ISA-TAB field headers to constants.py, fixing import, lin…
proccaserra Feb 19, 2024
ab93449
linting
proccaserra Feb 19, 2024
2d2464b
refactor defautls ISA-Tab fields to constants.py, linting
proccaserra Feb 19, 2024
57fc39e
refactor defautls ISA-Tab fields to constants.py, linting
proccaserra Feb 19, 2024
ef1af3f
refactor defautls ISA-Tab fields to constants.py, linting
proccaserra Feb 19, 2024
e293d79
linting
proccaserra Feb 19, 2024
6faedb6
linting
proccaserra Feb 19, 2024
35fda9c
linting
proccaserra Feb 19, 2024
8ee180f
linting
proccaserra Feb 19, 2024
c435846
linting and docstring
proccaserra Feb 19, 2024
fd62efe
linting
proccaserra Feb 19, 2024
080dbf3
linting and docstring
proccaserra Feb 19, 2024
cd1103e
linting and docstring
proccaserra Feb 19, 2024
c2b5dad
linting and docstring
proccaserra Feb 19, 2024
97e9b1c
linting and docstring
proccaserra Feb 19, 2024
ed5325d
linting and docstring
proccaserra Feb 19, 2024
fca2799
linting
proccaserra Feb 19, 2024
b38dc2b
adding missing import for OntologySource
proccaserra Feb 19, 2024
e06c22e
linting and minor corrections such variable renaming
proccaserra Feb 19, 2024
0955a5e
adding new tests to augment coverage or refining existing ones
proccaserra Feb 19, 2024
7407f05
linting
proccaserra Feb 19, 2024
6a548d1
minor corrections to functions invoked in tests
proccaserra Feb 19, 2024
23e02a8
simplifying statement to if c.category:
proccaserra Feb 21, 2024
c536f20
correction to protocol type in chain definition
proccaserra Feb 21, 2024
f9254c0
removing superfluous test following refactor
proccaserra Feb 21, 2024
1615bf3
removing needless indentation
proccaserra Feb 21, 2024
9b2479b
removing json validation from test to avoid time out but issue-537
proccaserra Feb 21, 2024
691c447
reinstating indentation for test when using with and context
proccaserra Feb 21, 2024
68322f6
uncommented tear down and changing process_sequence count in test (ch…
proccaserra Feb 21, 2024
bb85e75
removing commented code
proccaserra Feb 23, 2024
f5eb964
using format() instead of + for consistency
proccaserra Feb 23, 2024
d16568c
use assertion
proccaserra Feb 23, 2024
8f80615
minor edit
proccaserra Feb 23, 2024
156c9de
simplifying test, reverting
proccaserra Feb 23, 2024
e8eebc7
adding empty line at end of file
proccaserra Feb 23, 2024
7c41650
removing Array Design REF from _LABELS_ASSAY_NODES to keep tests from…
proccaserra Feb 23, 2024
aac5dc3
implementing a guard on c.category to reduce indentation
proccaserra Feb 23, 2024
a3badef
reset old value following the change to constants.py
proccaserra Feb 23, 2024
dfad022
deleting commented old code
proccaserra Feb 23, 2024
a7f2836
reactivating test which was timing out, fixes issue #537
proccaserra Feb 23, 2024
8bebd8f
moving import statement, removing commented code
proccaserra Feb 23, 2024
1844b15
fixing docstrings
proccaserra Feb 23, 2024
0bef66d
typo in docstring, issue 542 created for a refactoring
proccaserra Feb 23, 2024
c259347
linting
proccaserra Feb 23, 2024
82a200b
linting
proccaserra Feb 23, 2024
dc650b1
adding raises error type to docstring
proccaserra Feb 23, 2024
f9fcaa5
overwrite
proccaserra Feb 23, 2024
1ee43e7
adding docstrings
proccaserra Feb 23, 2024
1aa9ac1
removing commented code
proccaserra Feb 23, 2024
044f3a0
simplifying test in if statement
proccaserra Feb 23, 2024
b0a2172
nothing
proccaserra Feb 23, 2024
dd83f75
fix to file extension check
proccaserra Feb 23, 2024
701b2ae
removing unused import, add eof line
proccaserra Feb 23, 2024
9c8f559
linting
proccaserra Feb 23, 2024
62b3e4f
more linting
proccaserra Feb 23, 2024
5b936f0
removing print statement
proccaserra Feb 23, 2024
f175d94
linting
proccaserra Feb 23, 2024
dbfa307
fixing formatting;
proccaserra Feb 23, 2024
9a5fb86
Merge branch 'issue-511' into ontology-source-check-fix
terazus Mar 1, 2024
8aae210
Merge pull request #546 from ptth222/json2isatab-path-fix
terazus Mar 1, 2024
898edbf
altering tests to reflect change to warning to error message change
proccaserra Mar 3, 2024
c87ebb9
altering tests to reflect change to warning to error message change
proccaserra Mar 3, 2024
6832959
altering tests to reflect change to warning to error message change
proccaserra Mar 3, 2024
d03ef19
altering tests to reflect change to warning to error message change
proccaserra Mar 3, 2024
d2e60e3
implementing part of PR 359 clearing isa2w4m tests locally
proccaserra Mar 3, 2024
b0ffc78
implementing part of PR 359 clearing validation against json-schema l…
proccaserra Mar 3, 2024
9cd9acd
altering tests to reflect change to warning to error message change
proccaserra Mar 3, 2024
7f963f4
removing requirement on midinitials
proccaserra Mar 3, 2024
58ae095
removing requirement on midinitials
proccaserra Mar 3, 2024
fd4f2e2
removing requirement on midinitials
proccaserra Mar 3, 2024
5e3f32b
related to PR532
proccaserra Mar 3, 2024
8887843
address fixes detailed in PR529
proccaserra Mar 3, 2024
0a2caf6
incorporates changes from PR 526
proccaserra Mar 3, 2024
ed07947
incorporates changes from PR 538
proccaserra Mar 3, 2024
7580cfd
incorporates some of the changes from PR 525
proccaserra Mar 3, 2024
6cf1ded
notebook reset
proccaserra Mar 3, 2024
b146704
implemented all PR sent by ptth222 under a new branch
proccaserra Mar 4, 2024
691c35f
Testing changes to run on Windows.
ptth222 Mar 6, 2024
0050908
Update defaults.py
ptth222 Feb 22, 2024
2275ee9
Update validate/test__core.py
ptth222 Mar 6, 2024
4bb3e83
Merge pull request #549 from ptth222/511-testing-changes
terazus Mar 7, 2024
e5f6fd2
Merge pull request #539 from ptth222/doi-regex-fix
terazus Mar 7, 2024
0f9214f
More changes
ptth222 Mar 7, 2024
b874af4
Rename i_df and investigation_df.
ptth222 Feb 1, 2024
299a93d
Missed a parameter type change
ptth222 Feb 1, 2024
33dae30
Updated tests
ptth222 Mar 7, 2024
6d30dc2
Merge pull request #550 from ptth222/511-testing-changes
terazus Mar 11, 2024
01dffc7
Merge pull request #529 from ptth222/tab-validate-idf-rename
terazus Mar 11, 2024
16ccc00
Merge pull request #548 from ptth222/ontology-source-check-fix
terazus Mar 11, 2024
e95a8de
Fairly significant changes to check_protocol_fields
ptth222 Feb 5, 2024
733b74f
Missed a small change.
ptth222 Feb 5, 2024
9040989
Changed messaging on study assays errors
ptth222 Feb 4, 2024
041562d
augmenting and reviewing list of valid isa-tab headers to be consumed…
proccaserra Mar 11, 2024
3da6e3a
fixing serialization of assays to tab and validation errors
proccaserra Mar 11, 2024
97333e7
ensuring processes have names, fix to from_assay_dict
proccaserra Mar 11, 2024
6d76612
fixing to copy/paste error in isa config expressed as json
proccaserra Mar 11, 2024
32f7397
fixing trailing white spaces in protocol type
proccaserra Mar 11, 2024
9c867cc
reviewing and fixing list of synonyms to match ISA default configurat…
proccaserra Mar 11, 2024
8ab82e2
linting, missing extra line at end of file
proccaserra Mar 11, 2024
7fc3dcc
opening file in binary mode
proccaserra Mar 11, 2024
8940e9b
opening file in binary mode
proccaserra Mar 11, 2024
467595b
docstring linting
proccaserra Mar 11, 2024
ec70991
reviewing tests in the light of the changes mades to isatools
proccaserra Mar 11, 2024
cca786f
tweaks to the jupyter notebook, validation & roundtrips
proccaserra Mar 11, 2024
05ecf01
resolving merge conflicts
proccaserra Mar 11, 2024
bc7458f
Update validate/test__core.py
ptth222 Mar 6, 2024
03f5845
Rename i_df and investigation_df.
ptth222 Feb 1, 2024
e0eebd9
Updated tests
ptth222 Mar 7, 2024
9583a92
fixing tests
proccaserra Mar 11, 2024
3692f71
altering tests to reflect change to warning to error message change
proccaserra Mar 3, 2024
194911a
implemented all PR sent by ptth222 under a new branch
proccaserra Mar 4, 2024
f02616b
reviewing tests in the light of the changes mades to isatools
proccaserra Mar 11, 2024
c9a4266
clearing unsupported syntax causing build failure on github
proccaserra Mar 11, 2024
3793ed6
fixing test error count
proccaserra Mar 11, 2024
7a6ee24
Merge pull request #531 from ptth222/check-protocol-fields-update
terazus Mar 12, 2024
7d5f19f
Merge pull request #530 from ptth222/study-assays-messaging
terazus Mar 12, 2024
e1eda82
Merge branch 'issue-511' into extended-511
proccaserra Mar 18, 2024
d7aa027
Merge pull request #551 from ISA-tools/extended-511
proccaserra Mar 18, 2024
ae433ec
Refactor isatab loader
terazus Mar 19, 2024
6f3fbfd
update signature of mapping
terazus Mar 19, 2024
b51a385
update signature of mapping
terazus Mar 19, 2024
a5ca2f1
First attempt.
ptth222 Mar 19, 2024
e78f621
Changes finalized and tested
ptth222 Mar 20, 2024
945241a
Deleted previously commented out code
ptth222 Mar 20, 2024
b59b6ae
simplified ISATabAssayLoader constructor parameters
terazus Mar 20, 2024
1fee42b
renamed lot of methods for clarification
terazus Mar 20, 2024
fce86a1
renamed __set_investigation to __create_investigation
terazus Mar 20, 2024
83cab6d
removed old code
terazus Mar 20, 2024
e3c1912
Merge branch 'issue-511' into DomRefactorTabLoader
terazus Mar 20, 2024
a6aeed9
Added better messaging
ptth222 Jan 31, 2024
682611d
Rebased and redone.
ptth222 Mar 21, 2024
874c7b5
addressing outstanding code review fix requests
proccaserra Mar 25, 2024
8aba97f
Merge pull request #527 from ptth222/load-table-checks-improvement
proccaserra Apr 12, 2024
abcb82c
Merge pull request #555 from ISA-tools/DomRefactorTabLoader
proccaserra Apr 12, 2024
a2446fa
Merge pull request #556 from ptth222/protocol-types-refactor
proccaserra Apr 19, 2024
4458ca8
clearing test failures, corrections to required fields in configurations
proccaserra May 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
database_identifier chemical_formula smiles inchi metabolite_identification mass_to_charge fragmentation modifications charge retention_time taxid species database database_version reliability uri search_engine search_engine_score smallmolecule_abundance_sub smallmolecule_abundance_stdev_sub smallmolecule_abundance_std_error_sub
0
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
database_identifier chemical_formula smiles inchi metabolite_identification mass_to_charge fragmentation modifications charge retention_time taxid species database database_version reliability uri search_engine search_engine_score smallmolecule_abundance_sub smallmolecule_abundance_stdev_sub smallmolecule_abundance_std_error_sub
0
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
database_identifier chemical_formula smiles inchi metabolite_identification mass_to_charge fragmentation modifications charge retention_time taxid species database database_version reliability uri search_engine search_engine_score smallmolecule_abundance_sub smallmolecule_abundance_stdev_sub smallmolecule_abundance_std_error_sub
0
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
database_identifier chemical_formula smiles inchi metabolite_identification mass_to_charge fragmentation modifications charge retention_time taxid species database database_version reliability uri search_engine search_engine_score smallmolecule_abundance_sub smallmolecule_abundance_stdev_sub smallmolecule_abundance_std_error_sub
0
365 changes: 365 additions & 0 deletions isa-cookbook/content/notebooks/MTBLS2746-QuickFix/s_MTBLS2746.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python 3 (ipykernel)",
"language": "python",
"name": "python3"
},
Expand All @@ -378,7 +378,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.1"
"version": "3.9.0"
}
},
"nbformat": 4,
Expand Down