-
Notifications
You must be signed in to change notification settings - Fork 43
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
Python 2 and 3 compatibility and dependencies update #25
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
This reverts commit 0bb3211.
add timeout arg to handle non responding http requests try fix for mpl_toolkit import
…r forgotten numpy import
… ignore eggs, fix utility function missing args
ignore dist/
…ection module instead)
…les_alt dir, also a few linting here and there
Yes, do it please. Nice to see someone helps developing windML.
Thanks!
Oliver Kramer
… On 10. Oct 2017, at 22:02, Achille Murangira ***@***.***> wrote:
As mentioned in #24 <#24> it would be good to freshen up some dependencies and make it usable for Python 2.7.x and Python > 3.5.
Please let me know what you think.
You can view, comment on, or merge this pull request online at:
#25 <#25>
Commit Summary
tentative fix for python3 install
2nd attempt
use more recent package versions
scikit learn install fails: try reordering required packages
Revert "scikit learn install fails: try reordering required packages"
update README with installation instructions
WIP: python 3 compatbility
__future__ top of file
urllib and friends
add todo and stringio fix for python3
nonetype for nrel data
2nd attempt nrel faulure
more python 3 compatibility [some py2 breaking changes potentially]
WIP: python 3 compatibility + remove playdoh dependency (see #1)
module import error fix
module import error (more)
lambda func typo
cast numpy shape to int tuple
clean
bugfix: cast np shapes, index slices to proper ints/int slices
invalid linetype spec
more fixes for python 3 compatibility
rm build dir
add build to ignore list
add conda env config file and update requirements
remove py3 specification in conda yaml and in package names
add travis CI file (just conda)
update travis
travis malformation
travis malformation(2)
travis build fails if miniconda isn't specified as latest
incompatible package spec (travis)
fix travis matplotlib
incompatible packages again
missing url in setup.py + fixing other python2/3 compat issues (http/file io)
remove windml from requirements
relative path in tests(travis)
2nd attempt paths in unit tests (travis)
add future to requirements for PY2, fix reading from closed file bug and use six to handle urllib for 2and3
fix integer division
python 2/3 string io compat (tentative fix)
bugfix datapreprocessing array indexing : float to integer conversion
cast to numpy before sklearn predict (fix very old api usage)
more fixes related to indexing errors (float to int cast)
forgotten numpy import
six: fix discrepancy in how py2 returns http headers , add yet another forgotten numpy import
dimension mismatch (mreg interpolation) + range py2 error
fix knn test where nb of neighbors might be > nb samples (git add .), ignore eggs, fix utility function missing args
update readme with travis status
url fix in init file
add manifest
fix deprecated sklearn imports (grid search) and update README install instructions
Merge branch 'setup-py3' of https://github.com/aschmu/windml into setup-py3
remove basemap from requiremnts (not found on pypi)
add readme in setup.py and remove ez_setup
add numpy in requires and scipy as first installed dependency
remove deprecated crossvalidation imports from sklearn (use model selection module instead)
remove deprecated U opening mode in py3 and use rU in py2'
removed useless imports and cleanup linting [WIP]
Merge branch 'setup-py3' of https://github.com/aschmu/windml into setup-py3
fix deprecated sklearn usage and python2/3 compatible syntax in examples_alt dir, also a few linting here and there
fix check availability function to be specific to a certain turbine id
fix deprecated sklearn syntax as well as more py2/py3 compatiblity fixes
modified changelog
updated dependencies in doc (to be continued)
remove use2to3
minor modifs (linting, syntax...)
fix install from master through pip
File Changes
M .gitignore <https://github.com/cigroup-ol/windml/pull/25/files#diff-0> (6)
A .travis.yml <https://github.com/cigroup-ol/windml/pull/25/files#diff-1> (35)
M CHANGELOG.rst <https://github.com/cigroup-ol/windml/pull/25/files#diff-2> (8)
A MANIFEST.in <https://github.com/cigroup-ol/windml/pull/25/files#diff-3> (1)
M README.md <https://github.com/cigroup-ol/windml/pull/25/files#diff-4> (17)
A TODO.md <https://github.com/cigroup-ol/windml/pull/25/files#diff-5> (16)
M doc/dependencies.rst <https://github.com/cigroup-ol/windml/pull/25/files#diff-6> (64)
M doc/sphinxext/example_builder.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-7> (26)
M doc/sphinxext/gen_gallery.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-8> (11)
M doc/sphinxext/numpy_ext/docscrape.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-9> (2)
M doc/sphinxext/numpy_ext/docscrape_sphinx.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-10> (2)
M doc/sphinxext/numpy_ext_old/docscrape.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-11> (2)
M doc/sphinxext/numpy_ext_old/docscrape_sphinx.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-12> (2)
A environment.yml <https://github.com/cigroup-ol/windml/pull/25/files#diff-13> (44)
M examples/missingdata/mar_damaged.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-14> (4)
M examples/missingdata/mreg_svr_interpolation.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-15> (76)
M examples/missingdata/reconstruction_prediction.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-16> (9)
M examples/prediction/forecast_horizon.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-17> (51)
M examples/prediction/knn_regression_turbine.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-18> (25)
M examples/prediction/svr_regression_turbine.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-19> (33)
M examples/unsupervised/manifold.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-20> (13)
M examples/unsupervised/sequence.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-21> (36)
M examples/visualization/park_info.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-22> (10)
M examples_alt/missingdata/mreg_svr_interpolation.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-23> (4)
M examples_alt/missingdata/reconstruction.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-24> (10)
M examples_alt/missingdata/reconstruction_prediction.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-25> (9)
M examples_alt/prediction/compare_regressors_param.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-26> (4)
M examples_alt/prediction/horizon_mse.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-27> (6)
M examples_alt/prediction/knn_regression_turbine.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-28> (31)
M examples_alt/prediction/lin_regression_turbine.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-29> (34)
M examples_alt/prediction/svr_regression_turbine.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-30> (43)
M examples_alt/prediction/svr_response_curve.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-31> (9)
M examples_alt/statistics/park_info.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-32> (36)
M examples_alt/statistics/ramps.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-33> (20)
M examples_alt/statistics/turbine_info.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-34> (41)
M examples_alt/statistics/windspeed_histogram.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-35> (2)
M examples_alt/visualization/aemo_topography.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-36> (7)
M examples_alt/visualization/clustering.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-37> (3)
M examples_alt/visualization/sequence.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-38> (39)
M examples_alt/visualization/show_coord_topo.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-39> (11)
M examples_alt/visualization/wind_embeddings.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-40> (81)
M requirements.txt <https://github.com/cigroup-ol/windml/pull/25/files#diff-41> (19)
M setup.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-42> (88)
M tests/preprocessing_test.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-43> (6)
M tests/visualization_test.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-44> (4)
M windml/__init__.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-45> (2)
M windml/datasets/aemo.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-46> (191)
M windml/datasets/nrel.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-47> (175)
M windml/mapping/power_diff_mapping.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-48> (43)
M windml/model/turbine.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-49> (15)
M windml/model/windpark.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-50> (7)
M windml/optimization/grid_search.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-51> (30)
M windml/optimization/one_plus_one_ea.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-52> (24)
M windml/preprocessing/backward_copy.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-53> (11)
M windml/preprocessing/duplicate_remover.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-54> (5)
M windml/preprocessing/forward_copy.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-55> (8)
M windml/preprocessing/linear_interpolation.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-56> (9)
M windml/preprocessing/mar_destroyer.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-57> (18)
M windml/preprocessing/marthres_destroyer.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-58> (4)
M windml/preprocessing/missing_data_finder.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-59> (3)
M windml/preprocessing/mreg_interpolation.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-60> (146)
M windml/preprocessing/nmar_destroyer.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-61> (8)
M windml/preprocessing/nrel_repair.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-62> (11)
M windml/preprocessing/override_missing.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-63> (10)
M windml/preprocessing/topologic_interpolation.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-64> (19)
M windml/util/features.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-65> (53)
M windml/util/power_features.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-66> (15)
M windml/visualization/plot_multiple_timeseries.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-67> (22)
M windml/visualization/show_coord_topo.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-68> (10)
M windml/visualization/show_coord_topo_turbine.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-69> (10)
M windml/visualization/show_coord_topo_zoom.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-70> (19)
M windml/visualization/show_flip_book.py <https://github.com/cigroup-ol/windml/pull/25/files#diff-71> (52)
Patch Links:
https://github.com/cigroup-ol/windml/pull/25.patch <https://github.com/cigroup-ol/windml/pull/25.patch>
https://github.com/cigroup-ol/windml/pull/25.diff <https://github.com/cigroup-ol/windml/pull/25.diff>
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub <#25>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AE8SbrkFrnnA02nAvHRj_hS2htE0_MnPks5sq81ZgaJpZM4P0fqh>.
|
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.
As mentioned in #24 it would be good to freshen up some dependencies and make it usable for Python 2.7.x and Python > 3.5.
Please let me know what you think.