Merge master into develop (+fixes) #39
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix length of config file name which could enable install on conda forge * update yapf and prospector * disable useless-object-inheritance warning cannot make pylint happy both in python2 and 3 * fix python3 warnings + try to upgrade versions * try fixing version updater split setup.py into setup.py and setup.json (logic was partly written for setup.json, was trying to load setup.py as json file) * fix package_data bug * try fixing install issues * include setup.json in manifest * switch to local prospector installation guykisel mirror was using v0.8 which was breaking pylint on py2.7 * fix prospector version later versions have incorrect handling of 'quiet' flag for pylint<2 See landscapeio/prospector#266 * fix prospector verison * updated: remove obsolete setup_version_pat
+ fix to make version updater work properly with setup.json
bump version number to 1.2.2
writing setup.json back was broken when using pathlib
("must be unicode, not str")
* dependency should be pathlib2 * travis tests were still using py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PRs #37 and #38 had been done against
masterby mistake (should have beendevelop).Now merging
masterback into develop here.Additional Fixes:
Next PR will merge
developinto master