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.

Sign up for GitHub

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

Jump to bottom

Metadata fbc3 #1237

Open
wants to merge 122 commits into
base: devel
Choose a base branch
from
Open

Metadata fbc3 #1237

Show file tree
Hide file tree
Changes from 98 commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
782b645
added annotation class
Hemant27031999 Jun 4, 2020
9709974
made some modifications
Hemant27031999 Jun 4, 2020
a7af772
made the complete metadata package
Hemant27031999 Jun 9, 2020
a191413
modified meta_data classes
Hemant27031999 Jun 10, 2020
4ea5b3e
modified classes to look exactly like dictionaries and lists
Hemant27031999 Jun 11, 2020
7795ea6
modified imports and incorporated SBO term in metadata
Hemant27031999 Jun 11, 2020
02345bb
made the classed to inherit from MutableSequence and MutableMapping
Hemant27031999 Jun 13, 2020
4c6c1ca
adding backward compatibility
Hemant27031999 Jun 15, 2020
ff72c55
added instance
Hemant27031999 Jun 15, 2020
989ffe4
work on annotation structure
matthiaskoenig Jun 15, 2020
a4eb840
adding json example
matthiaskoenig Jun 15, 2020
cf38e02
fixed instance2
Hemant27031999 Jun 15, 2020
7d490a4
work on cvterms
matthiaskoenig Jun 15, 2020
024c980
made backward compatible
Hemant27031999 Jun 18, 2020
ff440fb
code review metadata
matthiaskoenig Jun 18, 2020
e4ad484
cleaned the metadata class by putting code in respective classes
Hemant27031999 Jun 21, 2020
2508ac3
new annotation format supported for SBML to cobra model
Hemant27031999 Jun 23, 2020
d5fc54c
added io for json and other formats
Hemant27031999 Jun 24, 2020
c9e904b
added tests for new annotation format
Hemant27031999 Jun 25, 2020
a6e2f8a
updated history
matthiaskoenig Jun 25, 2020
23f9699
fixing broken tests
Hemant27031999 Jun 28, 2020
2f55bbf
commented a few methods
Hemant27031999 Jun 28, 2020
5aae1b0
added equal method inisde metadata classes
Hemant27031999 Jun 29, 2020
d467a14
modified directories paths
Hemant27031999 Jun 30, 2020
e4cc72b
fixed imports and tox tests
Hemant27031999 Jun 30, 2020
32a81da
solved the problem of annotation copy
Hemant27031999 Jul 1, 2020
a07ccaf
new notes format
Hemant27031999 Jul 2, 2020
f69a55c
code refactoring
matthiaskoenig Jul 2, 2020
e4ab40b
modified history, keyvaluepair and notes
Hemant27031999 Jul 4, 2020
8dc96cf
modified tests and imports
Hemant27031999 Jul 5, 2020
a3685d4
modified cvterm class
Hemant27031999 Jul 6, 2020
991123b
small fixes
matthiaskoenig Jul 9, 2020
70b33db
refactored a few names
Hemant27031999 Jul 12, 2020
0e20a91
modified notes documentation
Hemant27031999 Jul 15, 2020
eeee56a
added user defined constraint class
Hemant27031999 Jul 16, 2020
f93723b
example test cases
matthiaskoenig Jul 16, 2020
efcf064
added tests for UserDefinedConstraints
Hemant27031999 Jul 23, 2020
3039344
modified tests
Hemant27031999 Jul 23, 2020
d5dedc9
small modifications
Hemant27031999 Jul 26, 2020
f839755
moved cobra directory to src directory
Hemant27031999 Jul 26, 2020
9704a4b
solved conflicts
Hemant27031999 Jul 26, 2020
211bf48
fixed some tests
Hemant27031999 Jul 26, 2020
1dba21e
fixed conflicts and tests
Hemant27031999 Jul 26, 2020
90c156f
fixed tests
Hemant27031999 Jul 27, 2020
91177cd
added support of group to JSON
Hemant27031999 Jul 27, 2020
1fc7ab2
added support for optional ids in UserDefinedConstraint class
Hemant27031999 Jul 28, 2020
de2398d
added test for json validation function
Hemant27031999 Jul 30, 2020
54809ad
added json schema import requirement
Hemant27031999 Jul 30, 2020
c758bc5
added helper function for UserDefinedConstraint
Hemant27031999 Jul 30, 2020
5c5e2c2
added validate function for json models
Hemant27031999 Jul 30, 2020
0884f4a
added ast tree for parsing constraint expression
Hemant27031999 Aug 5, 2020
0f93cdd
modified json validation function
Hemant27031999 Aug 6, 2020
3da58be
removed python 2 support
Hemant27031999 Aug 6, 2020
8ec5ef2
modified ids in json
Hemant27031999 Aug 6, 2020
d2d8ee9
code refactoring
matthiaskoenig Aug 6, 2020
14a68f5
reformatted code to python 3
Hemant27031999 Aug 9, 2020
80fdcaa
added datetime validation for py3.6
Hemant27031999 Aug 15, 2020
06cb989
modified dict.py
Hemant27031999 Aug 15, 2020
c10f3fa
modified xfail
Hemant27031999 Aug 15, 2020
1747a7b
removed .idea files
Hemant27031999 Aug 15, 2020
14a1415
removed .idea
Hemant27031999 Aug 15, 2020
ba2990c
merged with devel
Hemant27031999 Aug 16, 2020
b04b81a
removed idea
Hemant27031999 Aug 16, 2020
6bae4c0
modified notes string passing
Hemant27031999 Aug 21, 2020
66dd463
modified notes return type
Hemant27031999 Aug 26, 2020
479c2b2
adding dependency for json validation
matthiaskoenig Aug 26, 2020
543d1f8
added .idea files
matthiaskoenig Aug 26, 2020
65e48f1
merged latest devel
matthiaskoenig Aug 26, 2020
564a51a
refactored and cleanup of history
matthiaskoenig Aug 26, 2020
a6aefc5
Intermediate refactoring, breaking changes
matthiaskoenig Aug 26, 2020
42f4838
refactored keyvaluepairs
matthiaskoenig Aug 26, 2020
b3e26cc
cleanup of datetimes
matthiaskoenig Aug 26, 2020
ca9ef48
cleanup metadata
matthiaskoenig Aug 26, 2020
093f799
cleanup dict methods
matthiaskoenig Aug 26, 2020
b5f7516
added to_dict for CVTerm and fixed models
Hemant27031999 Aug 27, 2020
c8b850a
added metadata.ipynb
Hemant27031999 Aug 27, 2020
67d3af1
fixed imports
Hemant27031999 Aug 27, 2020
b951dbd
Merge branch 'devel' into metadata_fbc3_group
Hemant27031999 Aug 27, 2020
e5b3fba
smaller fix to_dict usage
matthiaskoenig Aug 27, 2020
8b2d6dc
modified to_dict for cvterms
Hemant27031999 Aug 28, 2020
010bb44
separated UserDefinedConstraint
Hemant27031999 Aug 28, 2020
fbfb0e8
Merge branch 'devel' into metadata_fbc3_group
May 11, 2022
78ea3d8
fixed most of the merging errors - most tests work
May 11, 2022
841c264
fixed test_annotation_format.py and deleted previous version
May 11, 2022
4fa107a
fixed SBML problems with merge
May 11, 2022
75a2193
fixed field names of creators
May 12, 2022
0237fae
Merge branch 'devel' into metadata_fbc3
Jun 16, 2022
2b021b6
fixed data, e_coli_new_format.json, schema_v2.json and some code chan…
May 12, 2022
f4b6894
consistent schema_v2.json
May 12, 2022
410f758
merged devel into #988 and updated it to current code
May 12, 2022
8c2f992
removed Notes as class
Jun 18, 2022
095654d
renamed constructors as requested
Jun 19, 2022
166dc1b
isort and black
Jun 19, 2022
e2e1bb5
isort error again
Jun 19, 2022
771e43e
sorry, updating salmonella.xml broke test_delete.py
Jun 19, 2022
e9cabd5
fix gitignore
Jun 19, 2022
0d72e42
documentation
Jun 27, 2022
a2a95bb
incorporated changes from fixing mat PR
Jun 28, 2022
03f4230
keyvaluepairs.py is documented
Jun 28, 2022
5313d3a
history.py is documented
Jun 30, 2022
2bc23ae
black on reaction.py
Jul 1, 2022
44c8dc7
removed notes.py and fixed some small bugs
Jul 4, 2022
024795f
creator is NamedTuple and has simpler api
Jul 5, 2022
3058122
replaced HistoryDateTime with standard datetime.datetime class
Jul 5, 2022
e924546
fix HistoryDateTime remaining
Jul 5, 2022
7ad9288
maybe will work better on Python 3.6
Jul 5, 2022
6c54a0d
Merge remote-tracking branch 'upstream/devel' into metadata_fbc3
Jul 6, 2022
c95b8c6
minor bug in history.py
Jul 8, 2022
9d4607f
Revert "minor bug in history.py"
Jul 8, 2022
15b7c5c
trying to fix 3.6 bug
Jul 8, 2022
8248a8d
trying to fix 3.6 bug again
Jul 8, 2022
85bd021
some tidying of sbml.py
Jul 12, 2022
abcafcd
one query for CVTermList as requested
Jul 12, 2022
af5f3fa
better documentation
Jul 14, 2022
dc8d600
almost complete documentation for cvterm.py including CVTerm, CVTermL…
Jul 20, 2022
bc6be3e
some clarification and fixes of cvterm.py
Jul 21, 2022
10dd03c
reorganized metadata.py
Jul 21, 2022
7c79e1c
fixed some changes in tests and example JSON due to changes in code
Jul 21, 2022
8ad6e3d
finished documentation of metadata.py
Jul 24, 2022
f4ffb8f
moved annotation_xml to conftest.py
Jul 25, 2022
0564ffb
fix unification of CVTerms done by sbml
Jul 26, 2022
988148d
simplified custompairs.py
Jul 26, 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
19 changes: 11 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ ipython_config.py
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/*.iml
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
Expand All @@ -105,6 +106,7 @@ ipython_config.py
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
.idea/

# Gradle
.idea/**/gradle.xml
Expand All @@ -114,14 +116,15 @@ ipython_config.py
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
.idea/artifacts
akaviaLab marked this conversation as resolved.
Show resolved Hide resolved
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/*.iml
.idea/*.xml
.idea/modules
*.iml
*.ipr

# CMake
cmake-build-*/
Expand Down
13 changes: 13 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading