Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

[1.4] Version handling, parser fixes, setup update, fix terminology load #198

Merged
merged 18 commits into from
Dec 14, 2017
Merged

[1.4] Version handling, parser fixes, setup update, fix terminology load #198

merged 18 commits into from
Dec 14, 2017

Conversation

mpsonntag
Copy link
Contributor

This PR is mainly cherry picking and refactoring of [1.3] PR #197.

It additionally:

  • Changes the version number to 1.4.0.
  • Fixes a terminology loading decode error when using python 3.
  • Refactors XMLReader.fromString and .fromFile to snake case.

@mpsonntag
[terminology] py3 decode http response
5e182f6
@mpsonntag
[init] update version string to 1.4.0
b506b36
@mpsonntag
[info] Add info file to provide version and format
851b9f3
@mpsonntag
[init] Use version number from info
cef4893
@mpsonntag
[odmlparser] Use format version number from info
7c55a45
@mpsonntag
[xmlparser/converter] Use format version from info
8b00c81
@mpsonntag
[xmlparser] Add odml format version check
4a968e3
@mpsonntag
[odmlparser] Add odml format version check
2a2066c
@mpsonntag
[init/setup] Update packaging information
a503f51 
Added author list, contact, classifiers, license text
and updated the provided hompage for future packaging.
@mpsonntag
[odmlparser] Save only valid odML documents
5dd1d2b
@mpsonntag
[odmlparser] Use xmlparser with ignore_errors
5227f02 
For now when xmlparser is used from odmlparser,
all unsupported or missing element errors are
warnings to allow parsing of partially invalid
odML documents.
@mpsonntag
[xmlparser] Add parser warning list
8bef0a4
@mpsonntag
[odmlparser] Add parser warning list
4c565b2
@mpsonntag
[parser] Update invalid odML format version text
c18eae5
@mpsonntag
[fileio] Define parsers only in odmlparser
c7c9d3e
@mpsonntag
[fileio] Add docstrings
b09d50e
@mpsonntag
[xmlparser] Fixing typos
0a2cc8e
@mpsonntag
[xmlparser] Refactor function name to snake case
bb2a036
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.2%) to 72.636% when pulling bb2a036 on mpsonntag:fixTerminologyLoad into 4a7cf56 on G-Node:master.

achilleas-k
achilleas-k approved these changes Dec 13, 2017
View reviewed changes
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Going to go ahead and merge directly since it's almost completely previously reviewed, cherry-picked commits.

@jgrewe jgrewe merged commit ca6ee30 into G-Node:master Dec 14, 2017
@mpsonntag mpsonntag mentioned this pull request Dec 14, 2017
Closed
@mpsonntag mpsonntag deleted the fixTerminologyLoad branch December 14, 2017 09:39
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@achilleas-k achilleas-k achilleas-k approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mpsonntag @coveralls @achilleas-k @jgrewe