Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix issues with Python 3 compatibility #134

Merged
merged 8 commits into from
Apr 5, 2016
Merged

Fix issues with Python 3 compatibility #134

merged 8 commits into from
Apr 5, 2016

Conversation

DietBru
Copy link
Contributor

@DietBru DietBru commented Apr 2, 2016

I tried to fix all issues with Python 3 where a float was used as an index.
All examples in the Gallery compile now with Python 3.5

@DietBru
More Python 3 fixes (especially index based ones)
cdfabc6
@DietBru
Changed np.round() -> int(np.round()) for Python 3.5
126f1f1 
With this change the Gallery can now also be build with Python 3.5.
The offender was doc/_gallery/plot_4_2_2_bertrand_hyperbolic_gd.py
@DietBru
Merge branch 'master' into upstr
bb9bb75
@DietBru
Fixed Makefile back to orginial state
b1da933
@coveralls
Copy link

Coverage Status

Coverage remained the same at 49.278% when pulling b1da933 on vollbier:upstr into cad7874 on scikit-signal:master.

@jaidevd
Copy link
Member

jaidevd commented Apr 4, 2016

@vollbier Thanks for this! There are some issues with one testcase. They need to be modified a bit for Python 3.5.
Specifically, unittest in Python 3.5 doesn't have the assertItemsEqual method, needs to be replaced with assertListEqual or assertTupleEqual.
I could do the changes if you like. Can you grant me push access to your branch where I can make the changes?

@jaidevd
Copy link
Member

jaidevd commented Apr 4, 2016

Also, the sphinx-apidoc seems to have changed some behaviour. It now keeps the generated API reference docs in a folder named doc/modules/generated instead of the _build directory. The former needs to be gitignored.

jaidevd
jaidevd reviewed Apr 4, 2016
View reviewed changes
tftb/processing/reassigned.py
@@ -81,8 +81,8 @@ def pseudo_wigner_ville(signal, timestamps=None, n_fbins=None, fwindow=None):
for jcol in range(n_fbins):
if np.abs(tfr[jcol, icol]) > threshold:
jcolhat = jcol - tf2[jcol, icol]
jcolhat = np.remainder(np.remainder(jcolhat - 1,
n_fbins) + n_fbins, n_fbins)
jcolhat =int(np.remainder(np.remainder(jcolhat - 1,
Copy link
Member

Choose a reason for hiding this comment

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

There needs to be a space between the = and int.

@DietBru
Made reassigned.py more PEP8 compliant
b0f6a13 
Besides some overlong lines, this file is according to the spyder introspection fully PEP8 compliant
@DietBru
Ignoring modules/generated generated by sphinx
01ffdc8
@coveralls
Copy link

Coverage Status

Coverage remained the same at 49.278% when pulling b0f6a13 on vollbier:upstr into cad7874 on scikit-signal:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 49.278% when pulling 01ffdc8 on vollbier:upstr into cad7874 on scikit-signal:master.

@DietBru
Copy link
Contributor Author

DietBru commented Apr 4, 2016

@jaidevd I granted you access to vollbier/pytftb and added the gitignore file.

@jaidevd
Fix gitignore
e9add28 
Remove the file doc/.gitignore and add those items to the default gitignore
@jaidevd
Change assertItemsEqual to assertSequenceEqual if Py3
6c1f022 
Py2 doesn't have the former
@coveralls
Copy link

Coverage Status

Coverage remained the same at 49.278% when pulling 6c1f022 on vollbier:upstr into cad7874 on scikit-signal:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.04%) to 49.317% when pulling 6c1f022 on vollbier:upstr into cad7874 on scikit-signal:master.

@jaidevd
Copy link
Member

jaidevd commented Apr 5, 2016

@vollbier Thanks, everything's fine now. Merging.

@jaidevd jaidevd merged commit 38178d5 into scikit-signal:master Apr 5, 2016
@jaidevd jaidevd deleted the upstr branch April 5, 2016 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@DietBru @coveralls @jaidevd