Merge pull request #267 from deeptools/file_format

File format
deeptools · Jul 20, 2018 · f815383 · f815383
2 parents 932e21b + 121e420
commit f815383
Show file tree

Hide file tree

Showing 76 changed files with 466,875 additions and 1,825 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -54,39 +54,39 @@ jobs:
       install:
         - conda install --yes python=2.7 flake8
       script:
-        - if [[ "$LINT" == "1" ]]; then flake8 . --exclude=.venv,.build,planemo_test_env,build --ignore=E501,F403,E402,F999,F405,E712 ; fi
+        - if [[ "$LINT" == "1" ]]; then flake8 . --exclude=.venv,.build,planemo_test_env,build --ignore=E501,F401,F403,E402,F999,F405,E712 ; fi
     - stage: test
       os: linux
       env: TRAVIS_PYTHON_VERSION=2.7
-      script: py.test hicexplorer/test/long_run/test_build_matrix_trivial_runs.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix_trivial_runs.py
     - stage: test
       os: osx
       env: TRAVIS_PYTHON_VERSION=2.7
-      script: py.test hicexplorer/test/long_run/test_build_matrix_trivial_runs.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix_trivial_runs.py
     - stage: test
       os: linux
       env: TRAVIS_PYTHON_VERSION=3.6
-      script: py.test hicexplorer/test/long_run/test_build_matrix_trivial_runs.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix_trivial_runs.py
     - stage: test
       os: osx
       env: TRAVIS_PYTHON_VERSION=3.6
-      script: py.test hicexplorer/test/long_run/test_build_matrix_trivial_runs.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix_trivial_runs.py
     - stage: test
       os: linux
       env: TRAVIS_PYTHON_VERSION=2.7
-      script: py.test hicexplorer/test/long_run/test_buildMatrix.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix.py
     - stage: test
       os: osx
       env: TRAVIS_PYTHON_VERSION=2.7
-      script: py.test hicexplorer/test/long_run/test_buildMatrix.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix.py
     - stage: test
       os: linux
       env: TRAVIS_PYTHON_VERSION=3.6
-      script: py.test hicexplorer/test/long_run/test_buildMatrix.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix.py
     - stage: test
       os: osx
       env: TRAVIS_PYTHON_VERSION=3.6
-      script: py.test hicexplorer/test/long_run/test_buildMatrix.py
+      script: py.test hicexplorer/test/long_run/test_hicBuildMatrix.py
     - stage: test
       os: linux
       env: TRAVIS_PYTHON_VERSION=2.7

diff --git a/bin/hicConvertFileFormats b/bin/hicConvertFileFormats
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from hicexplorer.hicConvertFileFormats import main
+
+if __name__ == "__main__":
+    main()