Unverified Commit b2e09efc authored by Bharath Ramsundar's avatar Bharath Ramsundar Committed by GitHub
Browse files

Merge pull request #1456 from rbharath/six_soft

Make six a soft dependency
parents 767ed31a 647e45d8
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
Test rdkit_grid_featurizer module.
"""
import os
from six import integer_types
import unittest

import numpy as np
@@ -102,6 +101,7 @@ class TestHelperFunctions(unittest.TestCase):
      self.assertAlmostEqual(rgf.angle_between(v1, -v1), np.pi)

  def test_hash_ecfp(self):
    from six import integer_types
    for power in (2, 16, 64):
      for _ in range(10):
        string = random_string(10)
@@ -111,6 +111,7 @@ class TestHelperFunctions(unittest.TestCase):
        self.assertGreaterEqual(string_hash, 0)

  def test_hash_ecfp_pair(self):
    from six import integer_types
    for power in (2, 16, 64):
      for _ in range(10):
        string1 = random_string(10)
+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ Activations for models.
from __future__ import division
from __future__ import unicode_literals

import six
import tensorflow as tf
from deepchem.models.tensorgraph import model_ops
from deepchem.models.tensorgraph.model_ops import get_ndim
@@ -39,6 +38,7 @@ def get_from_module(identifier,
  ------
  ValueError: if the identifier cannot be found.
  """
  import six
  if isinstance(identifier, six.string_types):
    res = module_params.get(identifier)
    if not res:
+0 −1
Original line number Diff line number Diff line
import collections

import numpy as np
import six
import tensorflow as tf

from deepchem.data import NumpyDataset, pad_features