Merge pull request #622 from aphearin/pep8

Pep8 syntax cleanup

halotools/__init__.py

@@ -1,17 +1,8 @@
-# Licensed under a 3-clause BSD style license - see LICENSE.rst
 """
 Halotools is a specialized python package
 for building and testing models of the galaxy-halo connection,
 and analyzing catalogs of dark matter halos.
 """
-
-# ----------------------------------------------------------------------------
-# keep this content at the top.
 from ._astropy_init import *
 
-# For egg_info test builds to pass, put package imports here.
-if not _ASTROPY_SETUP_:
-    pass
-    # ----------------------------------------------------------------------------
-
 from . import custom_exceptions

halotools/conftest.py

@@ -3,6 +3,8 @@
 # no matter how it is invoked within the source tree.
 
 from astropy.tests.pytest_plugins import *
+import os
+from . import version
 
 # Uncomment the following line to treat all DeprecationWarnings as
 # exceptions
@@ -18,14 +20,9 @@
 except (NameError, KeyError):  # NameError is needed to support Astropy < 1.0
     pass
 
-# Uncomment the following lines to display the version number of the
-# package rather than the version number of Astropy in the top line when
-# running the tests.
-import os
 
 # This is to figure out the affiliated package version, rather than
 # using Astropy's
-from . import version
 
 packagename = os.path.basename(os.path.dirname(__file__))
 TESTED_VERSIONS[packagename] = version.version

halotools/empirical_models/assembias_models/heaviside_assembias.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 This module contains the `~halotools.empirical_models.HeavisideAssembias` class.
 The purpose of this class is to introduce step function-type assembly bias into
@@ -404,9 +403,9 @@ def assembias_decorator(self, func):
         def wrapper(*args, **kwargs):
 
             #################################################################################
-            ### Retrieve the arrays storing prim_haloprop and sec_haloprop
-            ### The control flow below is what permits accepting an input
-            ### table or a directly inputting prim_haloprop and sec_haloprop arrays
+            # Retrieve the arrays storing prim_haloprop and sec_haloprop
+            # The control flow below is what permits accepting an input
+            # table or a directly inputting prim_haloprop and sec_haloprop arrays
             _HAS_table = False
             if 'table' in kwargs:
                 try:
@@ -440,14 +439,14 @@ def wrapper(*args, **kwargs):
 
             #################################################################################
 
-            ### Compute the fraction of type-2 halos as a function of the input prim_haloprop
+            # Compute the fraction of type-2 halos as a function of the input prim_haloprop
             split = self.percentile_splitting_function(prim_haloprop)
 
-            ### Compute the baseline, undecorated result
+            # Compute the baseline, undecorated result
             result = func(*args, **kwargs)
 
             # We will only decorate values that are not edge cases,
-            ### so first compute the mask for non-edge cases
+            # so first compute the mask for non-edge cases
             no_edge_mask = (
                 (split > 0) & (split < 1) &
                 (result > baseline_lower_bound) & (result < baseline_upper_bound)
@@ -512,7 +511,7 @@ def wrapper(*args, **kwargs):
 
             frac_type1 = 1 - no_edge_split
             frac_type2 = 1 - frac_type1
-            perturbation[~type1_mask] *= (-frac_type1[~type1_mask]/
+            perturbation[~type1_mask] *= (-frac_type1[~type1_mask] /
                 (frac_type2[~type1_mask]))
 
             no_edge_result += perturbation

halotools/empirical_models/assembias_models/tests/test_assembias.py

@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-
+"""
+"""
 from unittest import TestCase
 
 import numpy as np

halotools/empirical_models/component_model_templates/binary_galprop_models.py

@@ -237,7 +237,7 @@ def __init__(self, galprop_abscissa, galprop_ordinates,
         except KeyError:
             pass
 
-        if self._interpol_method=='spline':
+        if self._interpol_method == 'spline':
             if 'input_spline_degree' in list(kwargs.keys()):
                 self._input_spine_degree = kwargs['input_spline_degree']
             else:
@@ -317,19 +317,19 @@ def _mean_galprop_fraction(self, **kwargs):
         self._abscissa = getattr(self, self.galprop_name+'_abscissa')
 
         model_ordinates = [self.param_dict[ordinate_key] for ordinate_key in self._ordinates_keys]
-        if self._interpol_method=='polynomial':
+        if self._interpol_method == 'polynomial':
             mean_galprop_fraction = model_helpers.polynomial_from_table(
                 self._abscissa, model_ordinates, prim_haloprop)
-        elif self._interpol_method=='spline':
+        elif self._interpol_method == 'spline':
             spline_function = model_helpers.custom_spline(
-                self._abscissa, model_ordinates,
+                    self._abscissa, model_ordinates,
                     k=self._spline_degree)
             mean_galprop_fraction = spline_function(prim_haloprop)
         else:
             raise HalotoolsError("Input interpol_method must be 'polynomial' or 'spline'.")
 
         # Enforce boundary conditions
-        mean_galprop_fraction[mean_galprop_fraction<0]=0
-        mean_galprop_fraction[mean_galprop_fraction>1]=1
+        mean_galprop_fraction[mean_galprop_fraction < 0] = 0
+        mean_galprop_fraction[mean_galprop_fraction > 1] = 1
 
         return mean_galprop_fraction

halotools/empirical_models/component_model_templates/scatter_models.py

@@ -134,10 +134,10 @@ def scatter_realization(self, seed=None, **kwargs):
 
         scatter_scale = self.mean_scatter(**kwargs)
 
-        #initialize result with zero scatter result
+        # initialize result with zero scatter result
         result = np.zeros(len(scatter_scale))
 
-        #only draw from a normal distribution for non-zero values of scatter
+        # only draw from a normal distribution for non-zero values of scatter
         mask = (scatter_scale > 0.0)
         with NumpyRNGContext(seed):
             result[mask] = np.random.normal(loc=0, scale=scatter_scale[mask])
@@ -163,7 +163,7 @@ def _update_interpol(self):
     def _initialize_param_dict(self):
         """ Private method used to initialize ``self.param_dict``.
         """
-        self.param_dict={}
+        self.param_dict = {}
         for ipar, val in enumerate(self.ordinates):
             key = self._get_param_key(ipar)
             self.param_dict[key] = val

halotools/empirical_models/component_model_templates/tests/test_binary_galprop_models.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+"""
+"""
 import numpy as np
 
 from astropy.tests.helper import pytest

halotools/empirical_models/component_model_templates/tests/test_prim_galprop_model.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+"""
+"""
 import numpy as np
 from astropy.table import Table
 from unittest import TestCase

halotools/empirical_models/component_model_templates/tests/test_scatter_models.py

@@ -12,7 +12,7 @@
 
 from ....sim_manager import FakeSim
 
-__all__=['test_nonzero_scatter', 'test_zero_scatter']
+__all__ = ['test_nonzero_scatter', 'test_zero_scatter']
 
 
 def test_nonzero_scatter():
@@ -24,7 +24,7 @@ def test_nonzero_scatter():
 
     scatter = scatter_model.scatter_realization(table=halo_table)
 
-    assert len(scatter)==len(halo_table)
+    assert len(scatter) == len(halo_table)
 
 
 def test_zero_scatter():
@@ -36,8 +36,8 @@ def test_zero_scatter():
 
     scatter = scatter_model.scatter_realization(table=halo_table)
 
-    assert len(scatter)==len(halo_table)
-    assert np.all(scatter==0.0)
+    assert len(scatter) == len(halo_table)
+    assert np.all(scatter == 0.0)
 
 
 def test_LogNormalScatterModel_initialization():

halotools/empirical_models/composite_models/hod_models/hearin15.py

@@ -1,11 +1,7 @@
-# -*- coding: utf-8 -*-
 """
-
 Module containing some commonly used composite HOD models.
-
 """
-from __future__ import (
-    division, print_function, absolute_import, unicode_literals)
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from ... import factories
 from ...occupation_models import leauthaud11_components
@@ -96,7 +92,7 @@ def hearin15_model_dictionary(central_assembias_strength=1,
 
     """
     ##############################
-    ### Build the occupation model
+    # Build the occupation model
     if central_assembias_strength == 0:
         centrals_occupation = leauthaud11_components.Leauthaud11Cens(**kwargs)
     else:
@@ -109,7 +105,7 @@ def hearin15_model_dictionary(central_assembias_strength=1,
     centrals_profile = TrivialPhaseSpace(**kwargs)
 
     ##############################
-    ### Build the occupation model
+    # Build the occupation model
 
     if satellite_assembias_strength == 0:
         satellites_occupation = leauthaud11_components.Leauthaud11Sats(**kwargs)

halotools/empirical_models/composite_models/hod_models/leauthaud11.py

@@ -1,11 +1,7 @@
-# -*- coding: utf-8 -*-
 """
-
 Module containing the HOD-style composite model based on Leauthaud et al. (2011).
-
 """
-from __future__ import (
-    division, print_function, absolute_import, unicode_literals)
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from ... import model_defaults
 from ...occupation_models import leauthaud11_components
@@ -83,15 +79,15 @@ def leauthaud11_model_dictionary(threshold=model_defaults.default_stellar_mass_t
     >>> model_instance.populate_mock(halocat)
 
     """
-    ### Build model for centrals
+    # Build model for centrals
     # Build the occupation model
     centrals_occupation = leauthaud11_components.Leauthaud11Cens(threshold=threshold, **kwargs)
     centrals_occupation._suppress_repeated_param_warning = True
     # Build the profile model
 
     centrals_profile = TrivialPhaseSpace(**kwargs)
 
-    ### Build model for satellites
+    # Build model for satellites
     # Build the occupation model
     satellites_occupation = leauthaud11_components.Leauthaud11Sats(threshold=threshold, **kwargs)
     # Build the profile model

halotools/empirical_models/composite_models/hod_models/tests/test_tinker13.py

@@ -1,13 +1,13 @@
-#!/usr/bin/env python
-
+"""
+"""
 from unittest import TestCase
 from astropy.tests.helper import pytest
 
 from ....factories import PrebuiltHodModelFactory
 
 from .....sim_manager import FakeSim
 
-### Determine whether the machine is mine
+# Determine whether the machine is mine
 # This will be used to select tests whose
 # returned values depend on the configuration
 # of my personal cache directory files

halotools/empirical_models/composite_models/hod_models/tinker13.py

@@ -1,11 +1,7 @@
-# -*- coding: utf-8 -*-
 """
-
 Module containing some commonly used composite HOD models.
-
 """
-from __future__ import (
-    division, print_function, absolute_import, unicode_literals)
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from ... import model_defaults
 from ...occupation_models import tinker13_components

halotools/empirical_models/composite_models/hod_models/zheng07.py

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 """
 Module containing the HOD-style composite model
 published in Zheng et al. (2007), arXiv:0703457.
 """
-from __future__ import (
-    division, print_function, absolute_import, unicode_literals)
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from ... import model_defaults
 from ...occupation_models import zheng07_components

halotools/empirical_models/composite_models/sfr_models/smhm_binary_sfr.py

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 """
 Module containing a pre-built subhalo-based model
 that has a binary quenching feature.
 """
-from __future__ import (
-    division, print_function, absolute_import)
+from __future__ import division, print_function, absolute_import
 
 from ... import model_defaults
 from ...smhm_models import Behroozi10SmHm

halotools/empirical_models/composite_models/smhm_models/behroozi10.py

@@ -1,10 +1,8 @@
-# -*- coding: utf-8 -*-
 """
 Module containing the subhalo-based composite model
 based on the Behroozi et al. (2010) stellar-to-halo-mass relation.
 """
-from __future__ import (
-    division, print_function, absolute_import, unicode_literals)
+from __future__ import division, print_function, absolute_import, unicode_literals
 
 from ...smhm_models import Behroozi10SmHm
 

halotools/empirical_models/composite_models/tests/test_preloaded_models.py

@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+"""
+"""
 
 from unittest import TestCase
 from astropy.tests.helper import pytest
@@ -8,7 +9,7 @@
 from ....sim_manager import CachedHaloCatalog, FakeSim
 from ....custom_exceptions import HalotoolsError
 
-### Determine whether the machine is mine
+# Determine whether the machine is mine
 # This will be used to select tests whose
 # returned values depend on the configuration
 # of my personal cache directory files