Use system pytest

halotools/empirical_models/component_model_templates/tests/test_binary_galprop_models.py

@@ -2,7 +2,7 @@
 """
 import numpy as np
 
-from astropy.tests.helper import pytest
+import pytest
 
 from ..binary_galprop_models import BinaryGalpropInterpolModel
 

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

@@ -1,7 +1,7 @@
 """
 """
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 
 from ....factories import PrebuiltHodModelFactory
 

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

@@ -1,6 +1,6 @@
 """
 """
-from astropy.tests.helper import pytest
+import pytest
 import numpy as np
 
 from ....occupation_models import OccupationComponent, Zheng07Cens, Zheng07Sats

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

@@ -1,7 +1,7 @@
 """
 """
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 
 from ....factories import PrebuiltHodModelFactory
 

halotools/empirical_models/composite_models/tests/test_preloaded_models.py

@@ -1,6 +1,6 @@
 """
 """
-from astropy.tests.helper import pytest
+import pytest
 
 from ...factories import PrebuiltHodModelFactory
 

halotools/empirical_models/factories/tests/test_hod_mock_factory.py

@@ -2,7 +2,7 @@
 """
 from __future__ import (absolute_import, division, print_function)
 
-from astropy.tests.helper import pytest
+import pytest
 from astropy.config.paths import _find_home
 import numpy as np
 from copy import deepcopy

halotools/empirical_models/factories/tests/test_hod_model_factory.py

@@ -2,7 +2,7 @@
 """
 from __future__ import absolute_import, division, print_function
 
-from astropy.tests.helper import pytest
+import pytest
 
 import numpy as np
 from copy import deepcopy

halotools/empirical_models/factories/tests/test_mock_helpers.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.table import Table
 
 from ..mock_helpers import infer_mask_from_kwargs

halotools/empirical_models/factories/tests/test_prebuilt_hod_model_factory.py

@@ -3,7 +3,7 @@
 from __future__ import (absolute_import, division, print_function)
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.config.paths import _find_home
 
 from ...factories import PrebuiltHodModelFactory

halotools/empirical_models/factories/tests/test_prebuilt_subhalo_model_factory.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import, division, print_function
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 
 from ...factories import PrebuiltSubhaloModelFactory, SubhaloModelFactory
 

halotools/empirical_models/factories/tests/test_subhalo_model_factory.py

@@ -2,7 +2,7 @@
 """
 from __future__ import (absolute_import, division, print_function)
 
-from astropy.tests.helper import pytest
+import pytest
 
 import numpy as np
 from copy import deepcopy

halotools/empirical_models/occupation_models/tests/test_cacciato09_clf.py

@@ -4,7 +4,7 @@
 import numpy as np
 from scipy.stats import kstest
 from scipy.interpolate import interp1d
-from astropy.tests.helper import pytest
+import pytest
 from scipy.integrate import cumtrapz
 
 from .. import Cacciato09Cens, Cacciato09Sats

halotools/empirical_models/occupation_models/tests/test_occupation_component.py

@@ -2,7 +2,7 @@
 """
 import numpy as np
 
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..occupation_model_template import OccupationComponent

halotools/empirical_models/occupation_models/tests/test_tinker13.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 from astropy.table import Table
-from astropy.tests.helper import pytest
+import pytest
 
 from ..tinker13_components import Tinker13Cens
 from ....custom_exceptions import HalotoolsError

halotools/empirical_models/occupation_models/tests/test_zheng07_centrals.py

@@ -3,7 +3,7 @@
 import numpy as np
 from astropy.table import Table
 
-from astropy.tests.helper import pytest
+import pytest
 import warnings
 
 from ....empirical_models import OccupationComponent, Zheng07Cens

halotools/empirical_models/occupation_models/tests/test_zheng07_satellites.py

@@ -3,7 +3,7 @@
 import numpy as np
 from copy import deepcopy
 
-from astropy.tests.helper import pytest
+import pytest
 import warnings
 
 from ....empirical_models import OccupationComponent, Zheng07Sats, Zheng07Cens

halotools/empirical_models/phase_space_models/analytic_models/satellites/nfw/conc_mass/tests/test_conc_mass.py

@@ -5,7 +5,7 @@
 import numpy as np
 from astropy.table import Table
 from astropy.utils.misc import NumpyRNGContext
-from astropy.tests.helper import pytest
+import pytest
 
 from ..dutton_maccio14 import dutton_maccio14
 from ..direct_from_halo_catalog import direct_from_halo_catalog

halotools/empirical_models/phase_space_models/analytic_models/satellites/nfw/tests/test_biased_nfw/test_biased_nfw_consistency_mockpop.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 from astropy.config.paths import _find_home
-from astropy.tests.helper import pytest
+import pytest
 
 from ...biased_nfw_phase_space import BiasedNFWPhaseSpace
 from .......factories import PrebuiltHodModelFactory, HodModelFactory

halotools/empirical_models/phase_space_models/analytic_models/satellites/nfw/tests/test_nfw_phase_space/test_nfw_phase_space_monte_carlo.py

@@ -3,7 +3,7 @@
 import numpy as np
 from astropy.table import Table
 from astropy.utils.misc import NumpyRNGContext
-from astropy.tests.helper import pytest
+import pytest
 
 from ...nfw_phase_space import NFWPhaseSpace
 

halotools/empirical_models/phase_space_models/analytic_models/satellites/nfw/tests/test_nfw_profile/test_nfw_profile.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from astropy.tests.helper import pytest
+import pytest
 
 from astropy.cosmology import WMAP9, FLRW
 

halotools/empirical_models/phase_space_models/analytic_models/tests/test_halo_boundary_functions.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from astropy.tests.helper import pytest
+import pytest
 
 from astropy.cosmology import WMAP9, Planck13
 from astropy import units as u

halotools/empirical_models/phase_space_models/subhalo_based_models/tests/test_composite_model.py

@@ -3,7 +3,7 @@
 from __future__ import division, print_function, absolute_import, unicode_literals
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from copy import deepcopy
 
 from ..subhalo_phase_space import SubhaloPhaseSpace

halotools/empirical_models/phase_space_models/subhalo_based_models/tests/test_subhalo_phase_space.py

@@ -3,7 +3,7 @@
 from __future__ import division, print_function, absolute_import, unicode_literals
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 from astropy.table import Table
 

halotools/empirical_models/phase_space_models/subhalo_based_models/tests/test_subhalo_selection_kernel.py

@@ -3,7 +3,7 @@
 from __future__ import division, print_function, absolute_import, unicode_literals
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from .. import subhalo_selection_kernel as ssk

halotools/empirical_models/sfr_models/tests/test_zu_mandelbaum16.py

@@ -1,7 +1,7 @@
 """
 """
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 
 from ..zu_mandelbaum16 import ZuMandelbaum16QuenchingCens, ZuMandelbaum16QuenchingSats
 

halotools/empirical_models/smhm_models/tests/test_redshift_defensiveness.py

@@ -1,6 +1,6 @@
 """
 """
-from astropy.tests.helper import pytest
+import pytest
 
 from ...smhm_models import Behroozi10SmHm
 

halotools/empirical_models/tests/test_model_helpers.py

@@ -1,7 +1,7 @@
 """
 """
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..model_helpers import custom_spline, create_composite_dtype

halotools/mock_observables/counts_in_cells/tests/test_counts_in_cylinders.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 from astropy.utils.misc import NumpyRNGContext
-from astropy.tests.helper import pytest
+import pytest
 
 from .pure_python_counts_in_cells import pure_python_counts_in_cylinders
 

halotools/mock_observables/group_identification/test_groups/test_fof_groups.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 from scipy.sparse import coo_matrix
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..fof_groups import FoFGroups

halotools/mock_observables/isolation_functions/tests/test_isolation_helpers.py

@@ -4,7 +4,7 @@
 
 import numpy as np
 from astropy.utils.misc import NumpyRNGContext
-from astropy.tests.helper import pytest
+import pytest
 
 from ..isolation_functions_helpers import (_get_r_max,
     _set_isolation_approx_cell_sizes, _func_signature_int_from_cond_func)

halotools/mock_observables/large_scale_density/tests/test_large_scale_density_spherical_annulus.py

@@ -2,7 +2,7 @@
 """
 from __future__ import (absolute_import, division, print_function)
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 
 from ..large_scale_density_spherical_annulus import large_scale_density_spherical_annulus
 

halotools/mock_observables/large_scale_density/tests/test_large_scale_density_spherical_volume.py

@@ -2,7 +2,7 @@
 """
 from __future__ import (absolute_import, division, print_function)
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 
 from ..large_scale_density_spherical_volume import large_scale_density_spherical_volume
 

halotools/mock_observables/pair_counters/test_pair_counters/test_marked_npairs_3d.py

@@ -3,7 +3,7 @@
 from __future__ import (absolute_import, division, print_function, unicode_literals)
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 from astropy.config.paths import _find_home
 

halotools/mock_observables/pair_counters/test_pair_counters/test_marked_npairs_xy_z.py

@@ -3,7 +3,7 @@
 from __future__ import (absolute_import, division, print_function, unicode_literals)
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 from astropy.config.paths import _find_home
 

halotools/mock_observables/pair_counters/test_pair_counters/test_mesh_helpers.py

@@ -2,7 +2,7 @@
 """
 from __future__ import absolute_import, division, print_function
 
-from astropy.tests.helper import pytest
+import pytest
 
 from ..mesh_helpers import _set_approximate_cell_sizes, _enforce_maximum_search_length
 

halotools/mock_observables/pair_counters/test_pair_counters/test_npairs_3d.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 from astropy.config.paths import _find_home
 

halotools/mock_observables/pair_counters/test_pair_counters/test_npairs_jackknife_3d.py

@@ -8,7 +8,7 @@
 from ..npairs_jackknife_3d import npairs_jackknife_3d
 # load comparison simple pair counters
 
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 slow = pytest.mark.slow

halotools/mock_observables/pair_counters/test_pair_counters/test_npairs_projected.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..npairs_projected import npairs_projected

halotools/mock_observables/pair_counters/test_pair_counters/test_npairs_s_mu.py

@@ -11,7 +11,7 @@
 # load comparison simple pair counters
 from ..pairs import s_mu_npairs as pure_python_brute_force_npairs_s_mu
 
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 slow = pytest.mark.slow

halotools/mock_observables/pair_counters/test_pair_counters/test_npairs_xy_z.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..npairs_xy_z import npairs_xy_z

halotools/mock_observables/pair_counters/test_pair_counters/test_pairwise_distance_3d.py

@@ -5,7 +5,7 @@
 import numpy as np
 
 from astropy.utils.misc import NumpyRNGContext
-from astropy.tests.helper import pytest
+import pytest
 
 from .pure_python_distance_matrix import pure_python_distance_matrix_3d, pure_python_distance_matrix_xy_z
 

halotools/mock_observables/pair_counters/test_pair_counters/test_rectangular_mesh.py

@@ -4,7 +4,7 @@
 
 import itertools
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..rectangular_mesh import RectangularDoubleMesh, sample1_cell_size

halotools/mock_observables/pairwise_velocities/tests/test_los_pvd_vs_rp.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import, division, print_function
 
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..los_pvd_vs_rp import los_pvd_vs_rp

halotools/mock_observables/pairwise_velocities/tests/test_mean_los_velocity_vs_rp.py

@@ -2,7 +2,7 @@
 """
 from __future__ import absolute_import, division, print_function
 import numpy as np
-from astropy.tests.helper import pytest
+import pytest
 from astropy.utils.misc import NumpyRNGContext
 
 from ..mean_los_velocity_vs_rp import mean_los_velocity_vs_rp