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

Metadata fbc3 group #1225

Closed
wants to merge 162 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 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
c14b306
changes in mat.py to read with the right terms
Apr 27, 2022
a9d7f18
updated pickles
Apr 27, 2022
a77f773
tidying of mat.py mostly from_mat_struct()
May 4, 2022
219360b
modified example_notes.xml to have no difference when saving/reading …
May 5, 2022
307ec41
subsystems should have group name if availabe
May 5, 2022
77a1359
black and updated pickles
May 10, 2022
f6244f2
forgot black on one file
May 10, 2022
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
125c3cd
fixed data, e_coli_new_format.json, schema_v2.json and some code chan…
May 12, 2022
febd392
consistent schema_v2.json
May 12, 2022
490762b
tidying up dict.py
May 13, 2022
719e946
json and yaml will work even without updating pickles
May 13, 2022
1c46f3d
added tests for empty metadata
May 13, 2022
9c7f3c4
some more fixes
May 15, 2022
58d3dee
some more fixes
May 15, 2022
572802f
simplify sbml.py to have list comprehension and less unneeded functions
May 15, 2022
6bc68a8
simplify sbml.py to have list comprehension and less unneeded functions
May 15, 2022
b880886
some tidying
May 15, 2022
c9c5ccf
added function to create notes from scratch
May 17, 2022
cdf1d12
Merge branch 'mat_cleanup' into metadata_fbc3_group
May 17, 2022
3474be4
update pickles and fix test_read_old_json_model()
May 17, 2022
9de684e
Most tests work
May 17, 2022
1e21826
will now ignore sonarlint
May 17, 2022
6715a91
update pickles
May 17, 2022
623d618
simplified CVList
May 18, 2022
f7330fb
some dict comprehension in CVterms
May 18, 2022
ad887b6
some simplification of cvterm.py
May 18, 2022
67fcc91
some simplification and tidying of cvterm.py
May 18, 2022
a743398
some tidying of dict.py
May 18, 2022
9782a6f
functionalize *_from_dict in dict.py
May 18, 2022
c81669c
tests should work a bit better
May 20, 2022
0f9693c
annotations is sorted
May 20, 2022
fa679b3
cvterm.py tidying
May 20, 2022
008c7d2
sbo as metadata.py property and (related) cleanup
May 21, 2022
7196eaa
got sink prefix correctly
May 21, 2022
e920cd1
cvterms.py annotation is a method to derive a dict, not a dict that i…
May 21, 2022
cb72022
some flake8 tidying
May 22, 2022
cc3e707
some tidying of dict.py
May 22, 2022
dda5798
more tidying of dict.py and json.py
May 22, 2022
a420e66
sbo is imported better than before
May 23, 2022
63f7e37
some comments and ideas
May 23, 2022
79c3712
trying to simplify dict.py
May 24, 2022
9f5db8d
reactions work with the simplified version
May 24, 2022
3b2ba28
genes work with the simplified version
May 24, 2022
947ae3f
don't need an orderd dict when making cobra reaction
May 24, 2022
157c039
minimized code duplication in dict.py
May 25, 2022
1901034
simplified dealing with notes
May 25, 2022
f3b8b05
fixed some matlab reading/writing
May 25, 2022
308a7ba
some tidying of TODO comments
May 26, 2022
08710f1
sbml uses dictionary to convert qualifiers
May 27, 2022
6bc643f
isort, black, flake8
May 29, 2022
03dedbc
isort and black on src directory again
May 29, 2022
60016bd
some error in cvterm.py
May 29, 2022
91dd1cf
hopefully isort and black will be happy
May 29, 2022
d870269
isort error again
May 29, 2022
ab6cd24
3.10 has MutableMapping in collections.abc
May 29, 2022
d02e020
fix accidental breaking of tests
May 29, 2022
ffb36b6
trying to make a new version of CVTerm that will be a UserDict. CVTer…
Jun 1, 2022
21319ba
I think the new version should work
Jun 3, 2022
afacb89
all files use new version
Jun 6, 2022
36977c3
removed old CVTerm and CVTerms
Jun 6, 2022
855ab92
added query_qualifier and query_external_resources
Jun 7, 2022
6755a2c
Merge branch 'devel' into metadata_fbc3_group
akaviaLab Jun 7, 2022
dc6a9d3
black and isort need to be manually resolved on my computer
Jun 7, 2022
0eff395
Merge remote-tracking branch 'origin/metadata_fbc3_group' into metada…
Jun 7, 2022
b4d00fe
finally fix isort
Jun 7, 2022
826a229
maybe isort will work?
Jun 7, 2022
d117b0f
isort on tests
Jun 7, 2022
52279d2
some minor fixes
Jun 7, 2022
08da33b
Merge branch 'devel' into metadata_fbc3_group
akaviaLab Jun 7, 2022
93380ba
Merge remote-tracking branch 'origin/metadata_fbc3_group' into metada…
Jun 7, 2022
625026e
minor fixes to cvterm.py
Jun 8, 2022
d6cff01
f-strings
Jun 9, 2022
c362d1a
modified e_coli_core_for_annotation.xml to have multiple creators
Jun 11, 2022
b57b5a1
unified test_io/test_notes.py and test_metadata/test_notes.py
Jun 11, 2022
3b4d1a5
folded function set_nested_terms() into the rest of the code and tidi…
Jun 11, 2022
4e5dd51
black
Jun 11, 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
20 changes: 12 additions & 8 deletions .gitignore
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 Down Expand Up @@ -114,14 +115,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
.idea/compiler.xml
.idea/jarRepositories.xml
.idea/modules.xml
.idea/*.iml
.idea/*.xml
.idea/modules
*.iml
*.ipr

# CMake
cmake-build-*/
Expand Down Expand Up @@ -303,3 +305,5 @@ gurobi.log
/documentation_builder/test*\.*
/.benchmarks
/.testmondata
/.idea/sonarlint/
/.idea/sonarlint/issuestore/
13 changes: 13 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

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

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

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

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

2 changes: 1 addition & 1 deletion documentation_builder/getting_started.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"import cobra\n",
"from cobra.io import load_model\n",
"\n",
"# \"iJO1366\" and \"salmonella\" are also valid arguments\n",
"# \"iJO1366\" and \"iYS1720\" are also valid arguments\n",
"model = load_model(\"textbook\")"
]
},
Expand Down
2 changes: 1 addition & 1 deletion documentation_builder/loopless.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -13014,7 +13014,7 @@
}
],
"source": [
"salmonella = load_model('salmonella')\n",
"salmonella = load_model('iYS1720')\n",
"nominal = salmonella.optimize()\n",
"loopless = loopless_solution(salmonella)"
]
Expand Down
Loading