Replaces datasethelpers with pkg_resources. #1902
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
- Added example data location to setup.py as package data.
- Added example/prediction/data files to MANIFEST.
- Updated tests to use pkg_resources to fetch data files.
- Updated example code to fetch data through pkg_resources.
- Used pkg_resources to load files in nupic.data code.
- Removing datasethelpers and tests.
- Updated tests to write data files into examples/prediction/data.
- Updated experiment runner to resolve paths better.
- The experiment stream source could be an absolute path or a
path relative to the "examples.prediction.data" pkg_resource. Updated its logic to identify absolute paths and convert relative paths through pkg_resources.
- Updated swarming test configuration.
- A bunch of the swarming test configurations were expecting datasethelpers to find the input file on a search path that doesn't exist anymore. I solved this by:
- moving test_data.csv from tests/swarming/nupic/swarming/data into the package_data directory in the "swarming" folder
- adding __init__.py to the swarming folder mentioned above
- updating ModelRunner to call normalizeStreamSources(), which now does the pkg_resoruces lookup
- updating all the description files to refer to "swarming/test_data.csv"
|
@scottpurdy Sorry, the --force push worked, but GitHub wouldn't let me re-open the PR. |
|
🍏 😄 Finally. |
|
👍 Looks fine. Thanks for replace support code that is natively provided by python eco-system, @rhyolight ! |
| @@ -10,3 +10,5 @@ recursive-include extensions *.hpp *.cpp | |||
| recursive-include external/common/share/swig *.* | |||
| recursive-include external/darwin64 swig *.a | |||
| recursive-include external/linux64 swig *.a | |||
|
|
|||
| recursive-include examples/prediction/data *.csv *.txt | |||
|
Ok, I'm working on it...
|
|
lol!!! |
Also cleaned up unecessary __init__.py files. Found a few places where test code was explicitly looking for data in "examples/prediction/data" and updated them to also use pkg_resources.
|
@scottpurdy Ready for your re-review. |
|
Unexpected build error in Travis: I usually see this when I haven't cleaned up leftover files from builds on other branches, so this doesn't make sense to me. It is not happening on my local build. |
|
Hoping that getting the new |
|
This same error is suddenly happening on the |
|
@rhyolight u sure about the broken master? My local build is just fine, and so seems #1907 PR |
|
@breznak Yeah it's broken for me locally, too... I'm looking into it. |
|
👍 |
|
Waiting for #1909 then I'll merge it in. |
rhyolight
added a commit
that referenced
this pull request
Mar 5, 2015
Replaces datasethelpers with pkg_resources.
chrox
added a commit
to chrox/nupic
that referenced
this pull request
Apr 25, 2015
as implemented in numenta#1902.
rhyolight
added a commit
that referenced
this pull request
May 20, 2015
Reflect using pkg_resources to locate resource files as implemented in #1902.
mihail911
pushed a commit
to mihail911/nupic
that referenced
this pull request
Aug 5, 2015
Replaces datasethelpers with pkg_resources.
mihail911
pushed a commit
to mihail911/nupic
that referenced
this pull request
Aug 5, 2015
as implemented in numenta#1902.
mihail911
pushed a commit
to mihail911/nupic
that referenced
this pull request
Aug 5, 2015
Reflect using pkg_resources to locate resource files as implemented in numenta#1902.
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.
Fixes #1899
path relative to the "examples.prediction.data" pkg_resource. Updated its logic to identify absolute paths and convert relative paths through pkg_resources.