Skip to content

Commit 13ad7b1

Browse files
author
lev
committed
Merge branch 'master' of github.com:cmap/cmapPy
2 parents 5ca9900 + 0cb3d6c commit 13ad7b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+111
-185
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
__pycache__/
2+
*.pyc

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ python:
77
# requirements
88
install:
99
- pip install -r requirements.txt
10+
- python setup.py develop
1011

1112
# environments to use for tests (below)
1213
env:

‎cmapPy/clue_api_client/cell_queries.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import sys
2-
sys.path.insert(0, "../..")
31
import logging
4-
from cmapPy.clue_api_client import setup_logger
2+
import cmapPy.clue_api_client.setup_logger as setup_logger
53

64
__authors__ = "David L. Lahr"
75
__email__ = "dlahr@broadinstitute.org"

‎cmapPy/clue_api_client/clue_api_client.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import sys
2-
sys.path.insert(0, "../..")
31
import requests
42
import logging
5-
from cmapPy.clue_api_client import setup_logger
3+
import cmapPy.clue_api_client.setup_logger as setup_logger
64
import json
7-
import copy
85

96
__authors__ = "David L. Lahr"
107
__email__ = "dlahr@broadinstitute.org"

‎cmapPy/clue_api_client/gene_queries.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import sys
2-
sys.path.insert(0, "../..")
31
import logging
4-
from cmapPy.pandasGEXpress import setup_GCToo_logger as setup_logger
2+
import cmapPy.pandasGEXpress.setup_GCToo_logger as setup_logger
53

64
__authors__ = "David L. Lahr"
75
__email__ = "dlahr@broadinstitute.org"

‎cmapPy/clue_api_client/macchiato_queries.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import sys
2-
sys.path.insert(0, "../..")
31
import logging
4-
from cmapPy.clue_api_client import setup_logger
2+
import cmapPy.clue_api_client.setup_logger as setup_logger
53

64
__authors__ = "David L. Lahr"
75
__email__ = "dlahr@broadinstitute.org"

‎cmapPy/clue_api_client/mock_clue_api_client.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import sys
2-
sys.path.insert(0, "../..")
31
import logging
4-
from cmapPy.clue_api_client import setup_logger
5-
from cmapPy.clue_api_client import clue_api_client
2+
import cmapPy.clue_api_client.setup_logger as setup_logger
3+
import cmapPy.clue_api_client.clue_api_client as clue_api_client
64

75
__authors__ = "David L. Lahr"
86
__email__ = "dlahr@broadinstitute.org"

‎cmapPy/clue_api_client/pert_queries.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import sys
2-
sys.path.insert(0, "../..")
31
import logging
4-
from cmapPy.clue_api_client import setup_logger
2+
import cmapPy.clue_api_client.setup_logger as setup_logger
53

64
__authors__ = "David L. Lahr"
75
__email__ = "dlahr@broadinstitute.org"

‎cmapPy/clue_api_client/tests/test_cell_queries.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import sys
2-
sys.path.insert(0, "../../../")
31
import unittest
4-
from cmapPy.clue_api_client import setup_logger as setup_logger
2+
import cmapPy.clue_api_client.setup_logger as setup_logger
53
import logging
64
import test_clue_api_client
7-
from cmapPy.clue_api_client import cell_queries as cq
5+
import cmapPy.clue_api_client.cell_queries as cq
86

97
__authors__ = "David L. Lahr"
108
__email__ = "dlahr@broadinstitute.org"

‎cmapPy/clue_api_client/tests/test_clue_api_client.py‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
import sys
2-
sys.path.insert(0, "../../../")
31
import unittest
4-
from cmapPy.clue_api_client import setup_logger as setup_logger
2+
import cmapPy.clue_api_client.setup_logger as setup_logger
53
import logging
6-
from cmapPy.clue_api_client import clue_api_client as clue_api_client
4+
import cmapPy.clue_api_client.clue_api_client as clue_api_client
75
import os.path
86
import collections
97

10-
from six.moves import configparser
11-
128
__authors__ = "David L. Lahr"
139
__email__ = "dlahr@broadinstitute.org"
1410

0 commit comments

Comments
 (0)