Skip to content

Refactor package info handling#233

Merged
achilleas-k merged 22 commits intoG-Node:masterfrom
mpsonntag:infoChange
Feb 28, 2018
Merged

Refactor package info handling#233
achilleas-k merged 22 commits intoG-Node:masterfrom
mpsonntag:infoChange

Conversation

@mpsonntag
Copy link
Contributor

This PR

  • fixes installation issues on "clean" systems: The way package information in info.py is imported into setup.py currently breaks any local install due to dependency issues on clean systems (which do not have dependencies already installed). Therefore the package information is moved to info.json and read in by both info.py and setup.py.
  • Updates the MANIFEST by removing the obsolete desktop entry and adding the info.json file.
  • fixes Boolean value handling #224 by disallowing values that cannot be interpreted as boolean for a boolean DType.
  • Removes the unused rdflib-jsonld dependency since 'python setup.py install' breaks on first
    install if both rdflib and rdflib-jsonld are in the requirements for some non-obvious reason.
  • Adds basic tests for xml-, json- and yamlparser as a first step to increase coverage on the parser side.

@coveralls
Copy link

coveralls commented Feb 27, 2018

Coverage Status

Coverage increased (+0.4%) to 70.916% when pulling 621181b on mpsonntag:infoChange into 99b2eba on G-Node:master.

Copy link
Member

@jgrewe jgrewe left a comment

Choose a reason for hiding this comment

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

lgtm

setup.py Outdated
HOMEPAGE = curr_args[1].replace('\'', '').strip()
elif curr_args[0] == "VERSION":
VERSION = curr_args[1].replace('\'', '').strip()
with open(os.path.join("odml/info.json")) as infofile:
Copy link
Member

Choose a reason for hiding this comment

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

Typo here?
os.path.join("odml", "info.json")
or I guess you could remove the os.path.join (unless it's required for Windows)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

just sloppy, thx for the comment.

@achilleas-k achilleas-k merged commit 2830914 into G-Node:master Feb 28, 2018
@mpsonntag mpsonntag deleted the infoChange branch February 28, 2018 10:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Boolean value handling

4 participants