8000 fix #838 by dpryan79 · Pull Request #843 · deeptools/deepTools · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix #838 #843

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

Merged
merged 4 commits into from
Sep 3, 2019
Merged

fix #838 #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abdd70d
fix #838
dpryan79 Jun 26, 2019
86847ab
fixes
dpryan79 Jun 26, 2019
e5e7fa0
Merge branch 'develop' into fix838
dpryan79 Sep 3, 2019
18084da
Update CHANGES.txt
dpryan79 Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations 8000
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
3.3.1

* Fixed compatibility with matplotlib 3
* Fixed `--plotNumbers` not working in `plotCorrelation`. This was issue #838.
* Fixed compatibility with matplotlib 3 and restrict to at least that version.
* The Y-axis labels should once again appear in both plotHeatmap and plotProfile (issue #844). This was related to the previous point.
* Testing is no longer performed with python 2.7, which will reach end of life in a couple months
* Testing is no longer performed with python 2.7, which will reach end of life in a couple months.

3.3.0

Expand Down
4 changes: 2 additions & 2 deletions deeptools/correlation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,8 +299,8 @@ def plot_correlation(self, plot_filename, plot_title='', vmax=None,
# a good contrast between the correlation numbers that are
# plotted on black.
if plot_numbers:
cmap = cmap.from_list(colormap + "clipped",
cmap(np.linspace(0, 0.9, 10)))
cmap = pltcolors.LinearSegmentedColormap.from_list(colormap + "clipped",
cmap(np.linspace(0, 0.9, 10)))

cmap.set_under((0., 0., 1.))
# Plot distance matrix.
Expand Down
5 changes: 3 additions & 2 deletions deeptools/correlation_heatmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import numpy as np
import scipy.cluster.hierarchy as sch
from matplotlib import rcParams
import matplotlib.colors as pltcolors

rcParams['pdf.fonttype'] = 42
rcParams['svg.fonttype'] = 'none'
Expand Down Expand Up @@ -50,8 +51,8 @@ def plot_correlation(corr_matrix, labels, plotFileName, vmax=None,
# a good contrast between the correlation numbers that are
# plotted on black.
if plot_numbers:
cmap = cmap.from_list(colormap + "clipped",
cmap(np.linspace(0, 0.9, 10)))
cmap = pltcolors.LinearSegmentedColormap.from_list(colormap + "clipped",
cmap(np.linspace(0, 0.9, 10)))

cmap.set_under((0., 0., 1.))
# Plot distance matrix.
Expand Down
0