Skip to content

Develop #911

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 28 commits into from
Jan 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ecce499
copy changes from bgruening
dpryan79 May 29, 2019
2252b23
this file should not be here since years (#845)
bgruening Jul 15, 2019
831cdc0
Add Arabidopsis TAIR10 (A_thaliana_Jun_2009) (#853)
aloraine Jul 26, 2019
67c16a0
Fix python version in Azure tests (#860)
jan-janssen Aug 12, 2019
effc969
fixed typo (#864)
bounlu Aug 26, 2019
6a1a7e3
Update test images, skip testing if the wrong matplotlib version is u…
dpryan79 Sep 3, 2019
4843731
fix #838 (#843)
dpryan79 Sep 3, 2019
832a22a
Close #868 #867 and #851 (#869)
dpryan79 Sep 3, 2019
2560d13
Fix #866 (#871)
dpryan79 Sep 9, 2019
f0baf64
Release 3.3.1 (#873)
dpryan79 Sep 10, 2019
07a821b
Actionable active actions acting actively (#874)
dpryan79 Sep 18, 2019
37229d7
fix #889 (#891)
dpryan79 Dec 2, 2019
15bf16c
Fix888 (#892)
dpryan79 Dec 2, 2019
d84222a
fix #887 (#893)
dpryan79 Dec 3, 2019
6178b0f
update change log
dpryan79 Dec 3, 2019
e0f53d0
Seaborn colormaps (#894)
dpryan79 Dec 3, 2019
1793dd1
added clusterUsingSamples to heatmap
Dec 20, 2019
95e8e50
Added a couple of assertions to cehck the range of samples' indices
Dec 23, 2019
d68cb1e
Merge pull request #900 from deeptools/clusterUsingSamples
LeilyR Dec 23, 2019
ad00f93
Using --xRange and --yRange fails in galaxy due to the single quote. …
cgirardot Jan 16, 2020
1b3b367
Documentation fixes, closes #886 (#905)
dpryan79 Jan 17, 2020
3115f1b
Fix #902 (#906)
dpryan79 Jan 17, 2020
e8856ce
[WIP] added a silhouette calculation (#876)
lldelisle Jan 21, 2020
ff79682
mention silhouette score
dpryan79 Jan 21, 2020
386a76a
update help location
dpryan79 Jan 22, 2020
4949d80
see if this fixes things (#909)
dpryan79 Jan 22, 2020
82f85c9
merge in master so this can get released
dpryan79 Jan 23, 2020
4ab0ea9
Merge branch 'master' into develop
dpryan79 Jan 23, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 13 additions & 52 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,33 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Setup conda
run: |
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
hash -r
conda config --set always_yes yes --set changeps1 no
- name: create env
run: |
export PATH=$HOME/miniconda/bin:$PATH
conda create -n foo -q --yes -c conda-forge -c bioconda python=3.7 numpy scipy matplotlib==3.1.1 nose flake8 plotly pysam pyBigWig py2bit deeptoolsintervals
- name: install deeptools
run: |
export PATH=$HOME/miniconda/bin:$PATH
source activate foo
python -m pip install . --no-deps --ignore-installed -vvv
- uses: "dpryan79/github-actions/@master"
- name: PEP8
run: |
export PATH=$HOME/miniconda/bin:$PATH
source activate foo
flake8 . --exclude=.venv,.build,build --ignore=E501,F403,E402,F999,F405,E722,W504,W605
- name: Test deepTools
run: |
export PATH=$HOME/miniconda/bin:$PATH
source activate foo
nosetests --with-doctest -sv deeptools
- name: make an artifact
run: |
source activate foo
rm -f dist/*
python setup.py sdist
- uses: actions/upload-artifact@master
with:
name: "Dist files"
path: "dist"
build-osx:
name: Test on OSX
runs-on: macOS-latest
steps:
- uses: actions/checkout@v1
- name: Setup conda
run: |
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
hash -r
conda config --set always_yes yes --set changeps1 no
- name: create env
run: |
export PATH=$HOME/miniconda/bin:$PATH
conda create -n foo -q --yes -c conda-forge -c bioconda python=3.7 numpy scipy matplotlib==3.1.1 nose flake8 plotly pysam pyBigWig py2bit deeptoolsintervals
- name: install deeptools
run: |
export PATH=$HOME/miniconda/bin:$PATH
source activate foo
python -m pip install . --no-deps --ignore-installed -vvv
- uses: "dpryan79/github-actions/@master"
- name: Test deepTools
run: |
export PATH=$HOME/miniconda/bin:$PATH

source activate foo
nosetests --with-doctest -sv deeptools
planemo:
Expand All @@ -67,24 +44,8 @@ jobs:
chunk: [1, 2, 3]
steps:
- uses: actions/checkout@v1
- name: Setup conda
run: |
curl https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
hash -r
conda config --set always_yes yes --set changeps1 no
- name: create env
run: |
export PATH=$HOME/miniconda/bin:$PATH
conda create -n foo -q --yes -c conda-forge -c bioconda python=3.7 numpy scipy matplotlib==3.1.1 nose flake8 plotly pysam pyBigWig py2bit deeptoolsintervals planemo samtools
- name: install deeptools
run: |
export PATH=$HOME/miniconda/bin:$PATH
source activate foo
python -m pip install . --no-deps --ignore-installed -vvv
- uses: "dpryan79/github-actions/@master"
- name: planemo
run: |
export PATH=$HOME/miniconda/bin:$PATH
source activate foo
./.planemo.sh ${{ matrix.chunk }}
1 change: 1 addition & 0 deletions .planemo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ else
galaxy/wrapper/plotProfiler.xml"
fi

planemo lint ${wrappers}
planemo test --no_dependency_resolution --galaxy_branch release_18.05 --install_galaxy ${wrappers} 2>&1 | grep -v -e "^galaxy" | grep -v -e "^requests"
test ${PIPESTATUS[0]} -eq 0
10 changes: 10 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
3.3.2

* Fixed --yAxisLabel in plotProfile (issue #889)
* Fixed a small X-axis tick offset issue. This caused the location of tick marks in profile plots to be shifted to the left by 0.5 to 1 bin. This was generally not notable, only really appearing when very few bins (e.g., 4) were used. The issue was mostly that the end tick would appear after the end of the plot, since its coordinate was the end of the bin. (issue #888)
* multiBamSummary and multiBigwigSummary no longer exclude small bins at the end of genomic chunks. multiBamSummary now has a `--genomicChunkSize` option in case users need to control the size of the genome used for multiprocessing for consistency. (issue #887)
* Added 4 new colormaps, which were copied from the seaborn project (issue #879). These are: rocket, mako, vlag, and icefire.
* Fixed an issue in the Galaxy wrapper of plotCorrelation where the X and Y.
* Fixed an issue with the `--Offset` option, where a single negative value wouldn't include only a single position, but rather that base through the end of the read. (stems from issue #902)
* Clustered output from plotHeatmap and plotProfile now allow computing the silhouette score of each row. This is printed in the returned BED file as the last column.

3.3.1

* Fixed `--plotNumbers` not working in `plotCorrelation`. This was issue #838.
Expand Down
Loading